chore(j-s): Notifications to advocates in civil claims cases (#16264)

* fix(j-s): Civil claimant view for courts * feat(j-s): Judge can add and remove advocates * Update civilClaimant.controller.ts * Fixed key on Box * Change DEFENDER_ASSIGNED to ADVOCATE_ASSIGNED * Checkpoint * Checkpoint * Update string * Add tests * Rename defender -- advocate * Rename defender -- advocate * Fix typo: hmtl -- html * Refactor tests * Add promise handling to email sending * Rename parameters * Fix tests * Reorder imports * Fix texts * Fix texts * Fix texts * Fix tests * Use correct types * Use correct types --------- Co-authored-by: unakb <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Oct 11, 2024 · db83d3f · db83d3f
1 parent 4309e6f
commit db83d3f
Show file tree

Hide file tree

Showing 17 changed files with 353 additions and 124 deletions.
diff --git a/apps/judicial-system/backend/migrations/20241003213354-update-notification.js b/apps/judicial-system/backend/migrations/20241003213354-update-notification.js
@@ -0,0 +1,66 @@
+'use strict'
+const replaceEnum = require('sequelize-replace-enum-postgres').default
+
+module.exports = {
+  up: (queryInterface) => {
+    // replaceEnum does not support transactions
+    return replaceEnum({
+      queryInterface,
+      tableName: 'notification',
+      columnName: 'type',
+      newValues: [
+        'HEADS_UP',
+        'READY_FOR_COURT',
+        'RECEIVED_BY_COURT',
+        'COURT_DATE',
+        'RULING',
+        'MODIFIED',
+        'REVOKED',
+        'ADVOCATE_ASSIGNED', // Changed value
+        'DEFENDANTS_NOT_UPDATED_AT_COURT',
+        'APPEAL_TO_COURT_OF_APPEALS',
+        'APPEAL_RECEIVED_BY_COURT',
+        'APPEAL_STATEMENT',
+        'APPEAL_COMPLETED',
+        'APPEAL_JUDGES_ASSIGNED',
+        'APPEAL_CASE_FILES_UPDATED',
+        'APPEAL_WITHDRAWN',
+        'INDICTMENT_DENIED',
+        'INDICTMENT_RETURNED',
+        'INDICTMENTS_WAITING_FOR_CONFIRMATION',
+      ],
+      enumName: 'enum_notification_type',
+    })
+  },
+
+  down: (queryInterface) => {
+    // replaceEnum does not support transactions
+    return replaceEnum({
+      queryInterface,
+      tableName: 'notification',
+      columnName: 'type',
+      newValues: [
+        'HEADS_UP',
+        'READY_FOR_COURT',
+        'RECEIVED_BY_COURT',
+        'COURT_DATE',
+        'RULING',
+        'MODIFIED',
+        'REVOKED',
+        'DEFENDER_ASSIGNED',
+        'DEFENDANTS_NOT_UPDATED_AT_COURT',
+        'APPEAL_TO_COURT_OF_APPEALS',
+        'APPEAL_RECEIVED_BY_COURT',
+        'APPEAL_STATEMENT',
+        'APPEAL_COMPLETED',
+        'APPEAL_JUDGES_ASSIGNED',
+        'APPEAL_CASE_FILES_UPDATED',
+        'APPEAL_WITHDRAWN',
+        'INDICTMENT_DENIED',
+        'INDICTMENT_RETURNED',
+        'INDICTMENTS_WAITING_FOR_CONFIRMATION',
+      ],
+      enumName: 'enum_notification_type',
+    })
+  },
+}
diff --git a/apps/judicial-system/backend/src/app/formatters/formatters.ts b/apps/judicial-system/backend/src/app/formatters/formatters.ts
@@ -14,7 +14,11 @@ import {
   laws,
   readableIndictmentSubtypes,
 } from '@island.is/judicial-system/formatters'
-import type { Gender, UserRole } from '@island.is/judicial-system/types'
+import {
+  AdvocateType,
+  Gender,
+  UserRole,
+} from '@island.is/judicial-system/types'
 import {
   CaseCustodyRestrictions,
   CaseLegalProvisions,
@@ -664,23 +668,45 @@ export const formatCustodyRestrictions = (
   })
 }
 
-export const formatDefenderAssignedEmailNotification = (
+export const formatAdvocateAssignedEmailNotification = (
   formatMessage: FormatMessage,
   theCase: Case,
+  advocateType: AdvocateType,
   overviewUrl?: string,
 ): SubjectAndBody => {
-  const subject = formatMessage(notifications.defenderAssignedEmail.subject, {
-    court: capitalize(theCase.court?.name ?? ''),
-  })
-
-  const body = formatMessage(notifications.defenderAssignedEmail.body, {
-    defenderHasAccessToRVG: Boolean(overviewUrl),
-    courtCaseNumber: capitalize(theCase.courtCaseNumber ?? ''),
-    court: theCase.court?.name ?? '',
-    courtName: theCase.court?.name.replace('dómur', 'dómi') ?? '',
-    linkStart: `<a href="${overviewUrl}">`,
-    linkEnd: '</a>',
-  })
+  const subject =
+    advocateType === AdvocateType.DEFENDER
+      ? formatMessage(
+          notifications.advocateAssignedEmail.subjectAccessToCaseFiles,
+          {
+            court: capitalize(theCase.court?.name ?? ''),
+          },
+        )
+      : formatMessage(notifications.advocateAssignedEmail.subjectAccess, {
+          courtCaseNumber: theCase.courtCaseNumber,
+        })
+
+  const body =
+    advocateType === AdvocateType.DEFENDER
+      ? formatMessage(
+          notifications.advocateAssignedEmail.bodyAccessToCaseFiles,
+          {
+            defenderHasAccessToRVG: Boolean(overviewUrl),
+            courtCaseNumber: capitalize(theCase.courtCaseNumber ?? ''),
+            court: theCase.court?.name ?? '',
+            courtName: theCase.court?.name.replace('dómur', 'dómi') ?? '',
+            linkStart: `<a href="${overviewUrl}">`,
+            linkEnd: '</a>',
+          },
+        )
+      : formatMessage(notifications.advocateAssignedEmail.bodyAccess, {
+          defenderHasAccessToRVG: Boolean(overviewUrl),
+          court: theCase.court?.name,
+          advocateType,
+          courtCaseNumber: capitalize(theCase.courtCaseNumber ?? ''),
+          linkStart: `<a href="${overviewUrl}">`,
+          linkEnd: '</a>',
+        })
 
   return { body, subject }
 }

diff --git a/apps/judicial-system/backend/src/app/formatters/index.ts b/apps/judicial-system/backend/src/app/formatters/index.ts
@@ -21,7 +21,7 @@ export {
   formatProsecutorReceivedByCourtSmsNotification,
   formatDefenderCourtDateLinkEmailNotification,
   formatDefenderResubmittedToCourtEmailNotification,
-  formatDefenderAssignedEmailNotification,
+  formatAdvocateAssignedEmailNotification,
   formatCourtIndictmentReadyForCourtEmailNotification,
   formatDefenderRoute,
   formatDefenderReadyForCourtEmailNotification,

diff --git a/apps/judicial-system/backend/src/app/messages/notifications.ts b/apps/judicial-system/backend/src/app/messages/notifications.ts
@@ -607,19 +607,31 @@ export const notifications = {
         'Notaður sem texti í tölvupósti til verjanda vegna breytingar á lengd gæslu/einangrunar/vistunar þar sem úrskurðað var í einangrun.',
     },
   }),
-  defenderAssignedEmail: defineMessages({
-    subject: {
-      id: 'judicial.system.backend:notifications.defender_assigned_email.subject',
+  advocateAssignedEmail: defineMessages({
+    subjectAccessToCaseFiles: {
+      id: 'judicial.system.backend:notifications.defender_assigned_email.subject_access_to_case_files',
       defaultMessage: '{court} - aðgangur að málsgögnum',
       description:
         'Fyrirsögn í pósti til verjanda þegar hann er skráður á mál.',
     },
-    body: {
-      id: 'judicial.system.backend:notifications.defender_assigned_email.body_v3',
+    subjectAccess: {
+      id: 'judicial.system.backend:notifications.defender_assigned_email.subject_access',
+      defaultMessage: 'Skráning í máli {courtCaseNumber}',
+      description:
+        'Fyrirsögn í pósti til verjanda þegar hann er skráður á mál.',
+    },
+    bodyAccessToCaseFiles: {
+      id: 'judicial.system.backend:notifications.defender_assigned_email.body_access_to_case_files',
       defaultMessage:
         '{court} hefur skráð þig verjanda í máli {courtCaseNumber}.<br /><br />{defenderHasAccessToRVG, select, true {Gögn málsins eru aðgengileg á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}} other {Þú getur nálgast gögn málsins hjá {courtName} ef þau hafa ekki þegar verið afhent}}.',
       description: 'Texti í pósti til verjanda þegar hann er skráður á mál.',
     },
+    bodyAccess: {
+      id: 'judicial.system.backend:notifications.defender_assigned_email.body_access',
+      defaultMessage:
+        '{court} hefur skráð þig {advocateType, select, LAWYER {lögmann einkaréttarkröfuhafa} LEGAL_RIGHTS_PROTECTOR {réttargæslumann einkaréttarkröfuhafa} other {verjanda}} í máli {courtCaseNumber}.<br /><br />{defenderHasAccessToRVG, select, true {Sjá nánar á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}} other {Þú getur nálgast málið hjá {courtName}.}}.',
+      description: 'Texti í pósti til verjanda þegar hann er skráður á mál.',
+    },
   }),
   defendantsNotUpdatedAtCourt: defineMessages({
     subject: {

diff --git a/apps/judicial-system/backend/src/app/modules/notification/guards/rolesRules.ts b/apps/judicial-system/backend/src/app/modules/notification/guards/rolesRules.ts
@@ -28,7 +28,7 @@ export const districtCourtJudgeNotificationRule: RolesRule = {
   dtoField: 'type',
   dtoFieldValues: [
     NotificationType.COURT_DATE,
-    NotificationType.DEFENDER_ASSIGNED,
+    NotificationType.ADVOCATE_ASSIGNED,
   ],
 }
 
@@ -39,7 +39,7 @@ export const districtCourtRegistrarNotificationRule: RolesRule = {
   dtoField: 'type',
   dtoFieldValues: [
     NotificationType.COURT_DATE,
-    NotificationType.DEFENDER_ASSIGNED,
+    NotificationType.ADVOCATE_ASSIGNED,
   ],
 }
 
@@ -50,7 +50,7 @@ export const districtCourtAssistantNotificationRule: RolesRule = {
   dtoField: 'type',
   dtoFieldValues: [
     NotificationType.COURT_DATE,
-    NotificationType.DEFENDER_ASSIGNED,
+    NotificationType.ADVOCATE_ASSIGNED,
   ],
 }
 

diff --git a/apps/judicial-system/backend/src/app/modules/notification/internalNotification.service.ts b/apps/judicial-system/backend/src/app/modules/notification/internalNotification.service.ts
@@ -30,6 +30,7 @@ import {
   lowercase,
 } from '@island.is/judicial-system/formatters'
 import {
+  AdvocateType,
   CaseAppealRulingDecision,
   CaseCustodyRestrictions,
   CaseDecision,
@@ -50,13 +51,13 @@ import {
 } from '@island.is/judicial-system/types'
 
 import {
+  formatAdvocateAssignedEmailNotification,
   formatCourtHeadsUpSmsNotification,
   formatCourtIndictmentReadyForCourtEmailNotification,
   formatCourtOfAppealJudgeAssignedEmailNotification,
   formatCourtReadyForCourtSmsNotification,
   formatCourtResubmittedToCourtSmsNotification,
   formatCourtRevokedSmsNotification,
-  formatDefenderAssignedEmailNotification,
   formatDefenderCourtDateEmailNotification,
   formatDefenderCourtDateLinkEmailNotification,
   formatDefenderReadyForCourtEmailNotification,
@@ -1518,18 +1519,18 @@ export class InternalNotificationService extends BaseNotificationService {
   }
   //#endregion
 
-  //#region DEFENDER_ASSIGNED notifications */
-  private shouldSendDefenderAssignedNotification(
+  //#region ADVOCATE_ASSIGNED notifications */
+  private shouldSendAdvocateAssignedNotification(
     theCase: Case,
-    defenderEmail?: string,
+    advocateEmail?: string,
   ): boolean {
-    if (!defenderEmail) {
+    if (!advocateEmail) {
       return false
     }
     if (isIndictmentCase(theCase.type)) {
       const hasSentNotificationBefore = this.hasReceivedNotification(
-        NotificationType.DEFENDER_ASSIGNED,
-        defenderEmail,
+        NotificationType.ADVOCATE_ASSIGNED,
+        advocateEmail,
         theCase.notifications,
       )
 
@@ -1550,7 +1551,7 @@ export class InternalNotificationService extends BaseNotificationService {
         [
           NotificationType.READY_FOR_COURT,
           NotificationType.COURT_DATE,
-          NotificationType.DEFENDER_ASSIGNED,
+          NotificationType.ADVOCATE_ASSIGNED,
         ],
         theCase.defenderEmail,
         theCase.notifications,
@@ -1564,30 +1565,32 @@ export class InternalNotificationService extends BaseNotificationService {
     return true
   }
 
-  private sendDefenderAssignedNotification(
+  private sendAdvocateAssignedNotification(
     theCase: Case,
-    defenderNationalId?: string,
-    defenderName?: string,
-    defenderEmail?: string,
+    advocateType: AdvocateType,
+    advocateNationalId?: string,
+    advocateName?: string,
+    advocateEmail?: string,
   ): Promise<Recipient> {
-    const { subject, body } = formatDefenderAssignedEmailNotification(
+    const { subject, body } = formatAdvocateAssignedEmailNotification(
       this.formatMessage,
       theCase,
-      defenderNationalId &&
+      advocateType,
+      advocateNationalId &&
         formatDefenderRoute(this.config.clientUrl, theCase.type, theCase.id),
     )
 
     return this.sendEmail(
       subject,
       body,
-      defenderName,
-      defenderEmail,
+      advocateName,
+      advocateEmail,
       undefined,
-      Boolean(defenderNationalId) === false,
+      Boolean(advocateNationalId) === false,
     )
   }
 
-  private async sendDefenderAssignedNotifications(
+  private async sendAdvocateAssignedNotifications(
     theCase: Case,
   ): Promise<DeliverResponse> {
     const promises: Promise<Recipient>[] = []
@@ -1597,27 +1600,61 @@ export class InternalNotificationService extends BaseNotificationService {
         theCase.defendants ?? [],
         (d: Defendant) => d.defenderEmail,
       )
+
       for (const defendant of uniqDefendants) {
         const { defenderEmail, defenderNationalId, defenderName } = defendant
 
-        const shouldSend = this.shouldSendDefenderAssignedNotification(
+        const shouldSend = this.shouldSendAdvocateAssignedNotification(
           theCase,
           defenderEmail,
         )
 
         if (shouldSend === true) {
           promises.push(
-            this.sendDefenderAssignedNotification(
+            this.sendAdvocateAssignedNotification(
               theCase,
+              AdvocateType.DEFENDER,
               defenderNationalId,
               defenderName,
               defenderEmail,
             ),
           )
         }
       }
+
+      if (theCase.civilClaimants) {
+        for (const civilClaimant of theCase.civilClaimants) {
+          const {
+            spokespersonEmail,
+            spokespersonIsLawyer,
+            spokespersonName,
+            spokespersonNationalId,
+            hasSpokesperson,
+          } = civilClaimant
+
+          const shouldSend =
+            this.shouldSendAdvocateAssignedNotification(
+              theCase,
+              spokespersonEmail,
+            ) && hasSpokesperson
+
+          if (shouldSend === true) {
+            promises.push(
+              this.sendAdvocateAssignedNotification(
+                theCase,
+                spokespersonIsLawyer
+                  ? AdvocateType.LAWYER
+                  : AdvocateType.LEGAL_RIGHTS_PROTECTOR,
+                spokespersonNationalId,
+                spokespersonName,
+                spokespersonEmail,
+              ),
+            )
+          }
+        }
+      }
     } else if (DateLog.arraignmentDate(theCase.dateLogs)?.date) {
-      const shouldSend = this.shouldSendDefenderAssignedNotification(
+      const shouldSend = this.shouldSendAdvocateAssignedNotification(
         theCase,
         theCase.defenderEmail,
       )
@@ -1636,7 +1673,7 @@ export class InternalNotificationService extends BaseNotificationService {
 
     return this.recordNotification(
       theCase.id,
-      NotificationType.DEFENDER_ASSIGNED,
+      NotificationType.ADVOCATE_ASSIGNED,
       recipients,
     )
   }
@@ -2528,8 +2565,8 @@ export class InternalNotificationService extends BaseNotificationService {
           return this.sendModifiedNotifications(theCase, user)
         case NotificationType.REVOKED:
           return this.sendRevokedNotifications(theCase)
-        case NotificationType.DEFENDER_ASSIGNED:
-          return this.sendDefenderAssignedNotifications(theCase)
+        case NotificationType.ADVOCATE_ASSIGNED:
+          return this.sendAdvocateAssignedNotifications(theCase)
         case NotificationType.DEFENDANTS_NOT_UPDATED_AT_COURT:
           return this.sendDefendantsNotUpdatedAtCourtNotifications(theCase)
         case NotificationType.APPEAL_TO_COURT_OF_APPEALS: