chore: enable screening assignment email

bcgov · Sep 23, 2024 · b618df8 · b618df8
1 parent 92b19ce
commit b618df8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/app/backend/lib/emails/templates/assessmentAssigneeChange.ts b/app/backend/lib/emails/templates/assessmentAssigneeChange.ts
@@ -84,14 +84,14 @@ const assessmentAssigneeChange: EmailTemplateProvider = async (
             };
           });
           return {
-            assignors: ccbcAssignorUserList[assignor],
+            assignors: ccbcAssignorUserList?.[assignor] || 'A CCBC Analyst',
             alerts,
           };
         }
       );
       // Get the list of assignors for the email
       const assignorList = Object.keys(assignmentsByAssignor).map(
-        (key) => ccbcAssignorUserList[key]
+        (key) => ccbcAssignorUserList?.[key] || 'A CCBC Analyst'
       );
 
       return {

diff --git a/app/components/AnalystDashboard/AssessmentAssignmentTable.tsx b/app/components/AnalystDashboard/AssessmentAssignmentTable.tsx
@@ -467,6 +467,10 @@ const AssessmentAssignmentTable: React.FC<Props> = ({ query }) => {
                 application.allAssessments.edges,
                 'screening'
               ),
+              screeningNotification: findNotification(
+                application.assessmentNotifications.edges,
+                'assignment_screening'
+              ),
               financialRiskAssessment: findAssessment(
                 application.allAssessments.edges,
                 'financialRisk'
@@ -509,6 +513,7 @@ const AssessmentAssignmentTable: React.FC<Props> = ({ query }) => {
 
       const assessmentChanged =
         jsonData?.assignedTo &&
+        jsonData.assignedTo !== 'Unassigned' &&
         jsonData.assignedTo !== notification?.jsonData?.to;
 
       if (new Date(updatedAt) >= lastNotificationSentAt && assessmentChanged) {
@@ -537,10 +542,12 @@ const AssessmentAssignmentTable: React.FC<Props> = ({ query }) => {
         'pm',
         'projectManagement'
       );
+      const screeningAssignment = createAssignment(application, 'screening');
 
       if (techAssignment) assignmentsList.push(techAssignment);
       if (financialAssignment) assignmentsList.push(financialAssignment);
       if (pmAssignment) assignmentsList.push(pmAssignment);
+      if (screeningAssignment) assignmentsList.push(screeningAssignment);
 
       return assignmentsList;
     }, []);

diff --git a/app/tests/backend/lib/emails/templates/assessmentAssigneeChange.test.ts b/app/tests/backend/lib/emails/templates/assessmentAssigneeChange.test.ts
@@ -50,7 +50,7 @@ describe('assessmentAssigneeChange template', () => {
       },
       {
         applicationId: 2,
-        assessmentType: 'technical',
+        assessmentType: 'screening',
         assignedTo: 'Tester 2',
         assigneeEmail: 'tester2@mail.com',
         ccbcNumber: 'CCBC-000002',
@@ -106,8 +106,8 @@ describe('assessmentAssigneeChange template', () => {
           {
             ccbcNumber: 'CCBC-000002',
             applicationId: 2,
-            type: 'Technical assessment',
-            url: 'http://mock_host.ca/analyst/application/2/assessments/technical',
+            type: 'Eligibility Screening',
+            url: 'http://mock_host.ca/analyst/application/2/assessments/screening',
           },
         ],
         assignors: 'Assignor 2',