fix(j-s): Subpoena Notifications

apps/judicial-system/api/src/app/modules/file/file.controller.ts

@@ -177,60 +177,60 @@ export class FileController {
     )
   }
 
-  @Get('serviceCertificate/:defendantId/:subpoenaId')
+  @Get(['subpoena/:defendantId', 'subpoena/:defendantId/:subpoenaId'])
   @Header('Content-Type', 'application/pdf')
-  getServiceCertificatePdf(
+  getSubpoenaPdf(
     @Param('id') id: string,
     @Param('defendantId') defendantId: string,
     @CurrentHttpUser() user: User,
     @Req() req: Request,
     @Res() res: Response,
     @Param('subpoenaId') subpoenaId?: string,
+    @Query('arraignmentDate') arraignmentDate?: string,
+    @Query('location') location?: string,
+    @Query('subpoenaType') subpoenaType?: SubpoenaType,
   ): Promise<Response> {
     this.logger.debug(
-      `Getting service certificate for defendant ${defendantId} of case ${id} as a pdf document`,
+      `Getting subpoena ${
+        subpoenaId ?? 'draft'
+      } for defendant ${defendantId} of case ${id} as a pdf document`,
     )
 
+    const subpoenaIdInjection = subpoenaId ? `/${subpoenaId}` : ''
+    const queryInjection = arraignmentDate
+      ? `?arraignmentDate=${arraignmentDate}&location=${location}&subpoenaType=${subpoenaType}`
+      : ''
+
     return this.fileService.tryGetFile(
       user.id,
-      AuditedAction.GET_SERVICE_CERTIFICATE_PDF,
+      AuditedAction.GET_SUBPOENA_PDF,
       id,
-      `defendant/${defendantId}/subpoena/${subpoenaId}/serviceCertificate`,
+      `defendant/${defendantId}/subpoena${subpoenaIdInjection}${queryInjection}`,
       req,
       res,
       'pdf',
     )
   }
 
-  @Get('subpoena/:defendantId')
+  @Get('serviceCertificate/:defendantId/:subpoenaId')
   @Header('Content-Type', 'application/pdf')
-  getSubpoenaPdf(
+  getServiceCertificatePdf(
     @Param('id') id: string,
     @Param('defendantId') defendantId: string,
+    @Param('subpoenaId') subpoenaId: string,
     @CurrentHttpUser() user: User,
     @Req() req: Request,
     @Res() res: Response,
-    @Param('subpoenaId') subpoenaId?: string,
-    @Query('arraignmentDate') arraignmentDate?: string,
-    @Query('location') location?: string,
-    @Query('subpoenaType') subpoenaType?: SubpoenaType,
   ): Promise<Response> {
     this.logger.debug(
-      `Getting subpoena ${
-        subpoenaId ?? 'draft'
-      } for defendant ${defendantId} of case ${id} as a pdf document`,
+      `Getting service certificate for subpoena ${subpoenaId} of defendant ${defendantId} and case ${id} as a pdf document`,
     )
 
-    const subpoenaIdInjection = subpoenaId ? `/${subpoenaId}` : ''
-    const queryInjection = arraignmentDate
-      ? `?arraignmentDate=${arraignmentDate}&location=${location}&subpoenaType=${subpoenaType}`
-      : ''
-
     return this.fileService.tryGetFile(
       user.id,
-      AuditedAction.GET_SUBPOENA_PDF,
+      AuditedAction.GET_SERVICE_CERTIFICATE_PDF,
       id,
-      `defendant/${defendantId}/subpoena${subpoenaIdInjection}${queryInjection}`,
+      `defendant/${defendantId}/subpoena/${subpoenaId}/serviceCertificate`,
       req,
       res,
       'pdf',

apps/judicial-system/backend/src/app/formatters/subpoenaPdf.ts

@@ -1,5 +1,5 @@
 import PDFDocument from 'pdfkit'
-import { MessageDescriptor } from 'react-intl'
+import { MessageDescriptor } from '@formatjs/intl'
 
 import { FormatMessage } from '@island.is/cms-translations'
 

apps/judicial-system/backend/src/app/messages/courtUpload.ts

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl'
+import { defineMessages } from '@formatjs/intl'
 
 export const courtUpload = defineMessages({
   request: {

apps/judicial-system/backend/src/app/messages/pdfCore.ts

@@ -1,5 +1,4 @@
-import { defineMessage } from 'react-intl'
-import { defineMessages } from '@formatjs/intl'
+import { defineMessage, defineMessages } from '@formatjs/intl'
 
 export const core = {
   and: defineMessage({

apps/judicial-system/backend/src/app/modules/case/case.service.ts

@@ -33,6 +33,7 @@ import {
   CaseFileCategory,
   CaseFileState,
   CaseIndictmentRulingDecision,
+  CaseNotificationType,
   CaseOrigin,
   CaseState,
   CaseTransition,
@@ -43,7 +44,6 @@ import {
   isIndictmentCase,
   isRequestCase,
   isTrafficViolationCase,
-  NotificationType,
   StringType,
   UserRole,
 } from '@island.is/judicial-system/types'
@@ -629,7 +629,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.READY_FOR_COURT },
+        body: { type: CaseNotificationType.READY_FOR_COURT },
       },
     ])
   }
@@ -643,7 +643,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.RECEIVED_BY_COURT },
+        body: { type: CaseNotificationType.RECEIVED_BY_COURT },
       },
     ]
 
@@ -805,7 +805,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.RULING },
+        body: { type: CaseNotificationType.RULING },
       },
     ]
 
@@ -876,7 +876,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.RULING },
+        body: { type: CaseNotificationType.RULING },
       },
     ]
 
@@ -900,7 +900,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.MODIFIED },
+        body: { type: CaseNotificationType.MODIFIED },
       },
     ]
 
@@ -921,7 +921,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.REVOKED },
+        body: { type: CaseNotificationType.REVOKED },
       },
     ]
   }
@@ -987,7 +987,7 @@ export class CaseService {
       type: MessageType.NOTIFICATION,
       user,
       caseId: theCase.id,
-      body: { type: NotificationType.APPEAL_TO_COURT_OF_APPEALS },
+      body: { type: CaseNotificationType.APPEAL_TO_COURT_OF_APPEALS },
     })
 
     return this.messageService.sendMessagesToQueue(messages)
@@ -1002,7 +1002,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_RECEIVED_BY_COURT },
+        body: { type: CaseNotificationType.APPEAL_RECEIVED_BY_COURT },
       },
     ])
   }
@@ -1031,7 +1031,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_COMPLETED },
+        body: { type: CaseNotificationType.APPEAL_COMPLETED },
       },
       {
         type: MessageType.DELIVERY_TO_COURT_OF_APPEALS_CONCLUSION,
@@ -1063,7 +1063,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_STATEMENT },
+        body: { type: CaseNotificationType.APPEAL_STATEMENT },
       },
     ])
   }
@@ -1077,7 +1077,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_WITHDRAWN },
+        body: { type: CaseNotificationType.APPEAL_WITHDRAWN },
       },
     ])
   }
@@ -1091,7 +1091,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.INDICTMENT_DENIED },
+        body: { type: CaseNotificationType.INDICTMENT_DENIED },
       },
     ])
   }
@@ -1105,7 +1105,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.INDICTMENT_RETURNED },
+        body: { type: CaseNotificationType.INDICTMENT_RETURNED },
       },
     ])
   }
@@ -1168,7 +1168,7 @@ export class CaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.COURT_DATE },
+        body: { type: CaseNotificationType.COURT_DATE },
       },
     ])
   }

apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts

@@ -20,10 +20,10 @@ import {
   CaseAppealState,
   CaseFileCategory,
   CaseFileState,
+  CaseNotificationType,
   CaseState,
   DateType,
   EventType,
-  NotificationType,
   StringType,
   UserRole,
 } from '@island.is/judicial-system/types'
@@ -358,7 +358,7 @@ export class LimitedAccessCaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_TO_COURT_OF_APPEALS },
+        body: { type: CaseNotificationType.APPEAL_TO_COURT_OF_APPEALS },
       })
     }
 
@@ -367,7 +367,7 @@ export class LimitedAccessCaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_WITHDRAWN },
+        body: { type: CaseNotificationType.APPEAL_WITHDRAWN },
       })
     }
 
@@ -382,7 +382,7 @@ export class LimitedAccessCaseService {
         type: MessageType.NOTIFICATION,
         user,
         caseId: theCase.id,
-        body: { type: NotificationType.APPEAL_STATEMENT },
+        body: { type: CaseNotificationType.APPEAL_STATEMENT },
       })
     }
 

apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmation.spec.ts

@@ -4,8 +4,8 @@ import { uuid } from 'uuidv4'
 import { MessageService, MessageType } from '@island.is/judicial-system/message'
 import {
   CaseFileState,
+  CaseNotificationType,
   CaseOrigin,
-  NotificationType,
   User,
 } from '@island.is/judicial-system/types'
 
@@ -136,7 +136,7 @@ describe('CaseController - Get ruling signature confirmation', () => {
           type: MessageType.NOTIFICATION,
           user,
           caseId,
-          body: { type: NotificationType.RULING },
+          body: { type: CaseNotificationType.RULING },
         },
       ])
       expect(then.result).toEqual({ documentSigned: true })
@@ -172,7 +172,7 @@ describe('CaseController - Get ruling signature confirmation', () => {
           type: MessageType.NOTIFICATION,
           user,
           caseId,
-          body: { type: NotificationType.RULING },
+          body: { type: CaseNotificationType.RULING },
         },
         { type: MessageType.DELIVERY_TO_POLICE_SIGNED_RULING, user, caseId },
       ])
@@ -204,7 +204,7 @@ describe('CaseController - Get ruling signature confirmation', () => {
           type: MessageType.NOTIFICATION,
           user,
           caseId,
-          body: { type: NotificationType.RULING },
+          body: { type: CaseNotificationType.RULING },
         },
         { type: MessageType.DELIVERY_TO_POLICE_SIGNED_RULING, user, caseId },
       ])