[FIX] updated cron jobs (#419)

* updated cron jobs * added back template blocks * added back template blocks
bcgov · Jan 13, 2025 · f94f47c · f94f47c
1 parent 188de49
commit f94f47c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/backend/src/jobs/end_recommitment.ts b/backend/src/jobs/end_recommitment.ts
@@ -54,17 +54,17 @@ import { datePST } from '../common/helpers';
       );
 
       logger.log('Supervisor TEST emails:', 'Recommitment');
-      logger.log(`TxId: ${data.supervisor.txId}`, 'Recommitment');
+      logger.log(`TxId: ${data?.supervisor?.txId}`, 'Recommitment');
 
       data.supervisor?.messages?.forEach((supervisor) => {
-        logger.log(`Supervisor: ${supervisor.to}`, 'Recommitment');
+        logger.log(`Supervisor: ${supervisor?.to}`, 'Recommitment');
       });
 
       logger.log('Member TEST emails:', 'Recommitment');
-      logger.log(`TxId: ${data.member.txId}`, 'Recommitment');
+      logger.log(`TxId: ${data?.member?.txId}`, 'Recommitment');
 
       data.member?.messages?.forEach((member) => {
-        logger.log(`Member: ${member.to}`, 'Recommitment');
+        logger.log(`Member: ${member?.to}`, 'Recommitment');
       });
 
       logger.log('Recommitment job completed', 'Recommitment');

diff --git a/backend/src/views/blocks/parq.njk b/backend/src/views/blocks/parq.njk
@@ -0,0 +1,4 @@
+<p><span>If you plan to recommit to BCWS:</span></p>
+<p>You can now directly fill in your PAR-Q+ response as part of the recommitment process in your dashboard. <span>Your PAR-Q+ responses will NOT be recorded; you must download your response once completed and email it to your Fire Centre.</span> If you have any concerns about your health conditions that may affect your deployment in the upcoming year, please inform your CORE coordinator.</p>
+
+<p>To complete the PAR-Q+, <span>you must have a witness signature.</span> Please make sure you have found someone to be your witness before starting recommitment.</p>
diff --git a/backend/src/views/blocks/resources.njk b/backend/src/views/blocks/resources.njk
@@ -0,0 +1,10 @@
+
+
+<p>For more information, please visit: </p>
+<ul>
+<li><a href="https://intranet.gov.bc.ca/emcr/employees-workplace/hr/core-team">BCWS CORE Team</a></li>
+<li><a href="https://intranet.gov.bc.ca/bcws/core-team">EMCR CORE Team</a></li>
+<li><a href="https://bcdevex.atlassian.net/wiki/spaces/EA/pages/1638694919/Supervisor+User+Manual">Supervisor Manual</a></li>
+</ul>
+
+
diff --git a/openshift/cron-end-recommitment.yml b/openshift/cron-end-recommitment.yml
@@ -30,9 +30,9 @@ objects:
       name: ${APP_NAME}-cronjob-end-recommitment
     spec:
       schedule: ${END_RECOMMITMENT_SCHEDULE}
-      concurrencyPolicy: Replace
+      concurrencyPolicy: 'Replace'
       startingDeadlineSeconds: 10
-      successfulJobsHistoryLimit: 3
+      successfulJobsHistoryLimit: 1
       failedJobsHistoryLimit: 1
       jobTemplate:
         spec:
@@ -41,15 +41,14 @@ objects:
               labels:
                 parent: 'cronjobpi'
             spec:
-              activeDeadlineSeconds: 450
               restartPolicy: OnFailure
               containers:
               - name: ${APP_NAME}-cron-end-recommitment
                 restartPolicy: OnFailure
                 image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:${IMAGE_TAG}
                 resources:
                   limits:
-                    cpu: 20m
+                    cpu: 40m
                     memory: 256Mi
                   requests:
                     cpu: 10m

diff --git a/openshift/cron-notifications.yml b/openshift/cron-notifications.yml
@@ -30,13 +30,12 @@ objects:
       name: ${APP_NAME}-cronjob-notifications
     spec:
       schedule: ${NOTIFICATION_SCHEDULE}
-      concurrencyPolicy: Replace
+      concurrencyPolicy: 'Replace'
       startingDeadlineSeconds: 10
-      successfulJobsHistoryLimit: 3
+      successfulJobsHistoryLimit: 1
       failedJobsHistoryLimit: 1
       jobTemplate:
         spec:
-          activeDeadlineSeconds: 450
           template:
             metadata:
               labels:
@@ -47,10 +46,10 @@ objects:
               containers:
               - name: ${APP_NAME}-cron-notifications
                 restartPolicy: OnFailure
-                image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:${IMAGE_TAG}
+                image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:dev
                 resources:
                   limits:
-                    cpu: 20m
+                    cpu: 30m
                     memory: 256Mi
                   requests:
                     cpu: 10m

diff --git a/openshift/cron-start-recommitment.yml b/openshift/cron-start-recommitment.yml
@@ -30,7 +30,7 @@ objects:
       name: ${APP_NAME}-cronjob-start-recommitment
     spec:
       schedule: ${START_RECOMMITMENT_SCHEDULE}
-      concurrencyPolicy: Replace
+      concurrencyPolicy: 'Replace'
       startingDeadlineSeconds: 10
       successfulJobsHistoryLimit: 3
       failedJobsHistoryLimit: 1
@@ -46,10 +46,10 @@ objects:
               containers:
               - name: ${APP_NAME}-cron-start-recommitment
                 restartPolicy: OnFailure
-                image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:${IMAGE_TAG}
+                image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${APP_NAME}-server:dev
                 resources:
                   limits:
-                    cpu: 20m
+                    cpu: 40m
                     memory: 256Mi
                   requests:
                     cpu: 10m