Merge branch 'feat/umsokn-um-framhaldsskola' of https://github.com/is…

…land-is/island.is into feat/umsokn-um-framhaldsskola

.github/CODEOWNERS

@@ -132,6 +132,7 @@ codemagic.yaml
 /apps/services/regulations-admin-backend/                                                                 @island-is/hugsmidjan
 /apps/services/user-profile/                                                                              @island-is/hugsmidjan @island-is/juni @island-is/aranja
 /apps/web/components/Grant/                                                                               @island-is/hugsmidjan
+/apps/web/components/GrantCardsList/                                                                      @island-is/hugsmidjan
 /apps/web/screens/Grants/                                                                                 @island-is/hugsmidjan
 /apps/web/screens/Regulations/                                                                            @island-is/hugsmidjan
 /apps/web/components/Regulations/                                                                         @island-is/hugsmidjan

apps/download-service/src/app/modules/finance-documents/document.controller.ts

@@ -9,13 +9,13 @@ import { ApiScope } from '@island.is/auth/scopes'
 import { FinanceClientService } from '@island.is/clients/finance'
 import { AuditService } from '@island.is/nest/audit'
 import {
-  Body,
   Controller,
   Header,
   Param,
   Post,
   Res,
   UseGuards,
+  Query,
 } from '@nestjs/common'
 import { ApiOkResponse } from '@nestjs/swagger'
 import { Response } from 'express'
@@ -39,19 +39,20 @@ export class FinanceDocumentController {
     @CurrentUser() user: User,
     @Res() res: Response,
     @Param('pdfId') pdfId: string,
-    @Body('annualDoc') annualDoc?: string,
+    @Query('action') action?: string,
   ) {
-    const documentResponse = annualDoc
-      ? await this.financeService.getAnnualStatusDocument(
-          user.nationalId,
-          pdfId,
-          user,
-        )
-      : await this.financeService.getFinanceDocument(
-          user.nationalId,
-          pdfId,
-          user,
-        )
+    const documentResponse =
+      action === 'annualDoc'
+        ? await this.financeService.getAnnualStatusDocument(
+            user.nationalId,
+            pdfId,
+            user,
+          )
+        : await this.financeService.getFinanceDocument(
+            user.nationalId,
+            pdfId,
+            user,
+          )
 
     const documentBase64 = documentResponse?.docment?.document
 

apps/judicial-system/backend/infra/judicial-system-backend.ts

@@ -74,6 +74,8 @@ export const serviceSetup = (): ServiceBuilder<'judicial-system-backend'> =>
       PRISON_ADMIN_EMAIL: '/k8s/judicial-system/PRISON_ADMIN_EMAIL',
       PRISON_ADMIN_INDICTMENT_EMAILS:
         '/k8s/judicial-system/PRISON_ADMIN_INDICTMENT_EMAILS',
+      PUBLIC_PROSECUTOR_CRIMINAL_RECORDS_EMAIL:
+        '/k8s/judicial-system/PUBLIC_PROSECUTOR_CRIMINAL_RECORDS_EMAIL',
       AUTH_JWT_SECRET: '/k8s/judicial-system/AUTH_JWT_SECRET',
       ADMIN_USERS: '/k8s/judicial-system/ADMIN_USERS',
       BACKEND_ACCESS_TOKEN: '/k8s/judicial-system/BACKEND_ACCESS_TOKEN',

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

@@ -781,6 +781,11 @@ export const notifications = {
       defaultMessage: 'Landsréttur',
       description: 'Nafn á Landsrétti í tölvupóstum',
     },
+    publicProsecutorCriminalRecords: {
+      id: 'judicial.system.backend:notifications.email_names.public_prosecutor_criminal_records',
+      defaultMessage: 'Ritari sakaskrár',
+      description: 'Nafn á ritara sakaskrá í tölvupóstum',
+    },
   }),
   COAJudgeAssigned: defineMessages({
     subject: {
@@ -837,9 +842,9 @@ export const notifications = {
       description: 'Fyrirsögn í pósti til dómstóls þegar ákæra er afturkölluð',
     },
     body: {
-      id: 'judicial.system.backend:notifications.court_revoked_indictment_email.body',
+      id: 'judicial.system.backend:notifications.court_revoked_indictment_email.body_v1',
       defaultMessage:
-        '{prosecutorsOffice} hefur afturkallað ákæru {courtCaseNumber, select, NONE {í máli sem ekki hefur enn fengið málsnúmer} other {í máli {courtCaseNumber}}}.',
+        '{prosecutorsOffice} hefur afturkallað ákæru í máli {caseNumber}.',
       description: 'Texti í pósti til dómstóls þegar ákæra er afturkölluð',
     },
   }),

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

@@ -867,6 +867,17 @@ export class CaseService {
         type: MessageType.DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE,
         user,
         caseId: theCase.id,
+        // Upon case cancellation, we send the same notification type to:
+        // (1) relevant court emails
+        // (2) court system (via robot).
+        //
+        // When a case is revoked without a court case number, we send email (1).
+        // The court must then add the case number in the system, triggering notification (2) for full cancellation.
+        //
+        // The court system requires a case number before posting data via robot, so it must be added despite the cancellation.
+        // Notifications (1) and (2) must match, thus we use the flag below to ensure the same message is sent.
+        // Without the flag, email (2) would get notification including the court case number.
+        // For more context: https://github.com/island-is/island.is/pull/17385/files#r1904268032
         body: { withCourtCaseNumber: false },
       })
     }

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

@@ -672,23 +672,24 @@ export class InternalCaseService {
   ): Promise<DeliverResponse> {
     await this.refreshFormatMessage()
 
+    const courtCaseNumber = withCourtCaseNumber && theCase.courtCaseNumber
+    const caseNumber = courtCaseNumber || theCase.policeCaseNumbers.join(', ')
+
     return this.courtService
       .updateIndictmentCaseWithCancellationNotice(
         user,
         theCase.id,
         theCase.court?.name,
         theCase.courtCaseNumber,
         this.formatMessage(notifications.courtRevokedIndictmentEmail.subject, {
-          courtCaseNumber:
-            (withCourtCaseNumber && theCase.courtCaseNumber) || 'NONE',
+          courtCaseNumber: courtCaseNumber || 'NONE',
         }),
         stripHtmlTags(
           `${this.formatMessage(
             notifications.courtRevokedIndictmentEmail.body,
             {
               prosecutorsOffice: theCase.creatingProsecutor?.institution?.name,
-              courtCaseNumber:
-                (withCourtCaseNumber && theCase.courtCaseNumber) || 'NONE',
+              caseNumber,
             },
           )} ${this.formatMessage(notifications.emailTail)}`,
         ),

apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourt.spec.ts

@@ -25,13 +25,18 @@ describe('InternalCaseController - Deliver indictment cancellation notice to cou
   const courtName = uuid()
   const courtCaseNumber = uuid()
   const prosecutorsOffice = uuid()
+  const policeCase1 = '007-2022-01'
+  const policeCase2 = '007-2022-02'
+
+  const policeCaseNumbers = [policeCase1, policeCase2]
 
   const theCase = {
     id: caseId,
     type: CaseType.INDICTMENT,
     creatingProsecutor: { institution: { name: prosecutorsOffice } },
     court: { name: courtName },
     courtCaseNumber,
+    policeCaseNumbers,
   } as Case
 
   let mockCourtService: CourtService
@@ -88,7 +93,7 @@ describe('InternalCaseController - Deliver indictment cancellation notice to cou
     })
   })
 
-  describe('deliver cancellation notice without court case number', () => {
+  describe('deliver cancellation notice with police case numbers', () => {
     let then: Then
 
     beforeAll(async () => {
@@ -104,7 +109,7 @@ describe('InternalCaseController - Deliver indictment cancellation notice to cou
         courtName,
         courtCaseNumber,
         'Ákæra afturkölluð',
-        `${prosecutorsOffice} hefur afturkallað ákæru í máli sem ekki hefur enn fengið málsnúmer. Hægt er að nálgast yfirlitssíðu málsins á rettarvorslugatt.island.is.`,
+        `${prosecutorsOffice} hefur afturkallað ákæru í máli ${policeCase1}, ${policeCase2}. Hægt er að nálgast yfirlitssíðu málsins á rettarvorslugatt.island.is.`,
       )
 
       expect(then.result).toEqual({ delivered: true })

apps/judicial-system/backend/src/app/modules/notification/notification.config.ts

@@ -18,6 +18,10 @@ export const notificationModuleConfig = defineConfig({
         'PRISON_ADMIN_INDICTMENT_EMAILS',
         '',
       ),
+      publicProsecutorCriminalRecordsEmail: env.required(
+        'PUBLIC_PROSECUTOR_CRIMINAL_RECORDS_EMAIL',
+        '',
+      ),
       courtsEmails: env.requiredJSON('COURTS_EMAILS', {}) as {
         [key: string]: string
       },

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

@@ -3,12 +3,12 @@ import {
   Injectable,
   InternalServerErrorException,
 } from '@nestjs/common'
-import { ConfigType } from '@nestjs/config'
 
 import { type Logger, LOGGER_PROVIDER } from '@island.is/logging'
 
 import { MessageService, MessageType } from '@island.is/judicial-system/message'
 import {
+  CaseFileCategory,
   EventNotificationType,
   IndictmentCaseNotificationType,
   InstitutionNotificationType,
@@ -71,15 +71,28 @@ export class NotificationDispatchService {
   private async dispatchIndictmentSentToPublicProsecutorNotifications(
     theCase: Case,
   ): Promise<void> {
-    return this.messageService.sendMessagesToQueue([
+    const messages = [
       {
         type: MessageType.INDICTMENT_CASE_NOTIFICATION,
         caseId: theCase.id,
         body: {
           type: IndictmentCaseNotificationType.INDICTMENT_VERDICT_INFO,
         },
       },
-    ])
+    ]
+    const hasCriminalRecordFiles = theCase.caseFiles?.some(
+      (file) => file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
+    )
+    if (hasCriminalRecordFiles) {
+      messages.push({
+        type: MessageType.INDICTMENT_CASE_NOTIFICATION,
+        caseId: theCase.id,
+        body: {
+          type: IndictmentCaseNotificationType.CRIMINAL_RECORD_FILES_UPLOADED,
+        },
+      })
+    }
+    return this.messageService.sendMessagesToQueue(messages)
   }
 
   async dispatchEventNotification(

apps/judicial-system/backend/src/app/modules/notification/services/caseNotification/caseNotification.service.ts

@@ -1443,24 +1443,25 @@ export class CaseNotificationService extends BaseNotificationService {
     recipientName?: string,
     recipientEmail?: string,
   ): Promise<Recipient> {
+    const { courtCaseNumber } = theCase
     const subject = this.formatMessage(
       notifications.courtRevokedIndictmentEmail.subject,
       {
-        courtCaseNumber: theCase.courtCaseNumber ?? 'NONE',
+        courtCaseNumber: courtCaseNumber || 'NONE',
       },
     )
     const body = this.formatMessage(
       notifications.courtRevokedIndictmentEmail.body,
       {
         prosecutorsOffice: theCase.creatingProsecutor?.institution?.name,
-        courtCaseNumber: theCase.courtCaseNumber ?? 'NONE',
+        caseNumber: courtCaseNumber || theCase.policeCaseNumbers.join(', '),
       },
     )
 
     return this.sendEmail(subject, body, recipientName, recipientEmail)
   }
 
-  private async sendRevodeNotificationsForIndictmentCase(
+  private async sendRevokeNotificationsForIndictmentCase(
     theCase: Case,
   ): Promise<DeliverResponse> {
     const promises: Promise<Recipient>[] = []
@@ -1538,7 +1539,7 @@ export class CaseNotificationService extends BaseNotificationService {
     if (isRequestCase(theCase.type)) {
       return this.sendRevokedNotificationsForRequestCase(theCase)
     } else {
-      return this.sendRevodeNotificationsForIndictmentCase(theCase)
+      return this.sendRevokeNotificationsForIndictmentCase(theCase)
     }
   }
   //#endregion

apps/judicial-system/backend/src/app/modules/notification/services/indictmentCaseNotification/indictmentCaseNotification.service.ts

@@ -10,12 +10,13 @@ import { EmailService } from '@island.is/email-service'
 import { type Logger, LOGGER_PROVIDER } from '@island.is/logging'
 import { type ConfigType } from '@island.is/nest/config'
 
+import { ROUTE_HANDLER_ROUTE } from '@island.is/judicial-system/consts'
 import {
   CaseIndictmentRulingDecision,
   IndictmentCaseNotificationType,
-  IndictmentDecision,
 } from '@island.is/judicial-system/types'
 
+import { notifications } from '../../../../messages'
 import { Case } from '../../../case'
 import { EventService } from '../../../event'
 import { BaseNotificationService } from '../../baseNotification.service'
@@ -124,13 +125,51 @@ export class IndictmentCaseNotificationService extends BaseNotificationService {
     )
   }
 
+  private async sendCriminalRecordFilesUploadedNotification(
+    theCase: Case,
+  ): Promise<DeliverResponse> {
+    const formattedSubject = this.formatMessage(
+      strings.criminalRecordFilesUploadedEmail.subject,
+      {
+        courtCaseNumber: theCase.courtCaseNumber,
+      },
+    )
+
+    const formattedBody = this.formatMessage(
+      strings.criminalRecordFilesUploadedEmail.body,
+      {
+        courtCaseNumber: theCase.courtCaseNumber,
+        courtName: theCase.court?.name.replace('dómur', 'dómi'),
+        linkStart: `<a href="${this.config.clientUrl}${ROUTE_HANDLER_ROUTE}/${theCase.id}">`,
+        linkEnd: '</a>',
+      },
+    )
+
+    return this.sendEmails(
+      theCase,
+      IndictmentCaseNotificationType.CRIMINAL_RECORD_FILES_UPLOADED,
+      formattedSubject,
+      formattedBody,
+      [
+        {
+          name: this.formatMessage(
+            notifications.emailNames.publicProsecutorCriminalRecords,
+          ),
+          email: this.config.email.publicProsecutorCriminalRecordsEmail,
+        },
+      ],
+    )
+  }
+
   private sendNotification(
     notificationType: IndictmentCaseNotificationType,
     theCase: Case,
   ): Promise<DeliverResponse> {
     switch (notificationType) {
       case IndictmentCaseNotificationType.INDICTMENT_VERDICT_INFO:
         return this.sendVerdictInfoNotification(theCase)
+      case IndictmentCaseNotificationType.CRIMINAL_RECORD_FILES_UPLOADED:
+        return this.sendCriminalRecordFilesUploadedNotification(theCase)
 
       default:
         throw new InternalServerErrorException(

apps/judicial-system/backend/src/app/modules/notification/services/indictmentCaseNotification/indictmentCaseNotification.strings.ts

@@ -16,4 +16,19 @@ export const strings = {
         'Notað sem body í tilkynningu um stöðu birtingar dóms í lokinni ákæru',
     },
   }),
+  criminalRecordFilesUploadedEmail: defineMessages({
+    subject: {
+      id: 'judicial.system.backend:notifications.criminal_record_files_uploaded_email.subject',
+      defaultMessage: 'Tilkynning til sakaskrár í máli {courtCaseNumber}',
+      description:
+        'Fyrirsögn í pósti til ritara sakaskrá þegar skjal fyrir tilkynningu til skakaskrár er hlaðið upp',
+    },
+    body: {
+      id: 'judicial.system.backend:notifications.criminal_record_files_uploaded_email.body',
+      defaultMessage:
+        'Máli {courtCaseNumber} hjá {courtName} hefur verið lokið. Skjöl málsins eru aðgengileg á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}',
+      description:
+        'Texti í pósti til ritara sakaskrá þegar skjal fyrir tilkynningu til skakaskrár er hlaðið upp',
+    },
+  }),
 }