Merge branch 'main' into j-s/judge-confirms-defense-choices

.envrc

@@ -19,4 +19,6 @@ fi
 
 # Podman compatibility
 # NOTE: Exits direnv if user is using docker.
-source_env_if_exists .env.podman
+source_env_if_exists .envrc.podman
+
+source_env_if_exists .envrc.kube

.envrc.kube

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+for c in kubectx kubectl aws; do
+  if ! command -v "$c" >/dev/null; then
+    echo "$c not installed"
+    return
+  fi
+done
+
+set-kubectx() {
+  : "${AWS_PROFILE:=}"
+  if kubectx | grep -q "${AWS_PROFILE##islandis-}"; then
+    return
+  fi
+  echo "Setting kube context..." >&2
+  AWS_ACCOUNT_ID="$(aws sts get-caller-identity | jq -r '.Account')"
+  kubectx "$(kubectx | grep "${AWS_ACCOUNT_ID}")"
+  CLUSTER="$(kubectl config current-context | sed 's/.*\///')"
+  export CLUSTER
+}
+
+set-kubectx

.env.podman → .envrc.podman

@@ -6,15 +6,15 @@ set -euo pipefail
 if [[ -n "${DOCKER_HOST:-}" ]] ||
   command -v docker >/dev/null &&
   ! (docker --version | grep -i podman); then
-  exit 0
+  return 0
 fi
 
 echo "🐳 Using podman"
 
 SOCKET_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
 if [[ -S /run/podman/podman.sock ]]; then
   SOCKET_DIR="/run/podman"
-  exit 0
+  return 0
 fi
 
 export DOCKER_HOST=unix://$SOCKET_DIR/podman/podman.sock

.gitignore

@@ -29,8 +29,7 @@ TODO
 *.todo
 .env
 .env.*
-!.env.podman
-.envrc.*
+.envrc.private
 .nvmrc
 .node-version
 # IDE - VSCode

apps/application-system/api/src/app/app.module.ts

@@ -60,6 +60,7 @@ import { FriggClientConfig } from '@island.is/clients/mms/frigg'
 import { smsModuleConfig } from '@island.is/nova-sms'
 import { emailModuleConfig } from '@island.is/email-service'
 import { sharedModuleConfig } from '@island.is/application/template-api-modules'
+import { UserNotificationClientConfig } from '@island.is/clients/user-notification'
 
 @Module({
   imports: [
@@ -119,6 +120,7 @@ import { sharedModuleConfig } from '@island.is/application/template-api-modules'
         smsModuleConfig,
         emailModuleConfig,
         sharedModuleConfig,
+        UserNotificationClientConfig,
       ],
     }),
   ],

apps/judicial-system/backend/migrations/20241015105921-update-notification.js

@@ -0,0 +1,70 @@
+'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',
+        'DEFENDER_ASSIGNED',
+        'ADVOCATE_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',
+        'SERVICE_SUCCESSFUL', // New value
+        'SERVICE_FAILED', // New value
+        'DEFENDANT_SELECTED_DEFENDER', // New value
+      ],
+      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',
+    })
+  },
+}

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

@@ -289,19 +289,19 @@ const canPrisonAdminUserAccessCase = (
     ) {
       return false
     }
-  }
 
-  // Check defendant verdict appeal deadline access
-  const canAppealVerdict = true
-  const verdictInfo = (theCase.defendants || []).map<
-    [boolean, Date | undefined]
-  >((defendant) => [canAppealVerdict, defendant.verdictViewDate])
+    // Check defendant verdict appeal deadline access
+    const canAppealVerdict = true
+    const verdictInfo = (theCase.defendants || []).map<
+      [boolean, Date | undefined]
+    >((defendant) => [canAppealVerdict, defendant.verdictViewDate])
 
-  const [_, indictmentVerdictAppealDeadlineExpired] =
-    getIndictmentVerdictAppealDeadlineStatus(verdictInfo)
+    const [_, indictmentVerdictAppealDeadlineExpired] =
+      getIndictmentVerdictAppealDeadlineStatus(verdictInfo)
 
-  if (!indictmentVerdictAppealDeadlineExpired) {
-    return false
+    if (!indictmentVerdictAppealDeadlineExpired) {
+      return false
+    }
   }
 
   return true

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

@@ -145,4 +145,28 @@ export abstract class BaseNotificationService {
       ),
     }
   }
+
+  protected hasSentNotification(
+    type: NotificationType,
+    notifications?: Notification[],
+  ) {
+    return notifications?.some((notification) => notification.type === type)
+  }
+
+  protected hasReceivedNotification(
+    type?: NotificationType | NotificationType[],
+    address?: string,
+    notifications?: Notification[],
+  ) {
+    const types = type ? [type].flat() : Object.values(NotificationType)
+
+    return notifications?.some((notification) => {
+      return (
+        types.includes(notification.type) &&
+        notification.recipients.some(
+          (recipient) => recipient.address === address && recipient.success,
+        )
+      )
+    })
+  }
 }

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

@@ -0,0 +1,18 @@
+import { IsEnum, IsNotEmpty } from 'class-validator'
+
+import { ApiProperty } from '@nestjs/swagger'
+
+import { NotificationType } from '@island.is/judicial-system/types'
+
+import { Subpoena } from '../../subpoena'
+
+export class SubpoenaNotificationDto {
+  @IsNotEmpty()
+  @IsEnum(NotificationType)
+  @ApiProperty({ enum: NotificationType })
+  readonly type!: NotificationType
+
+  @IsNotEmpty()
+  @ApiProperty({ type: Subpoena })
+  readonly subpoena!: Subpoena
+}

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

@@ -46,8 +46,12 @@ export class InstitutionNotificationService extends BaseNotificationService {
   }
 
   private async sendIndictmentsWaitingForConfirmationNotification(
-    prosecutorsOfficeId: string,
+    prosecutorsOfficeId?: string,
   ): Promise<unknown> {
+    if (!prosecutorsOfficeId) {
+      return
+    }
+
     const count =
       await this.internalCaseService.countIndictmentsWaitingForConfirmation(
         prosecutorsOfficeId,
@@ -87,7 +91,7 @@ export class InstitutionNotificationService extends BaseNotificationService {
 
   async sendNotification(
     type: NotificationType,
-    prosecutorsOfficeId: string,
+    prosecutorsOfficeId?: string,
   ): Promise<DeliverResponse> {
     try {
       switch (type) {

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

@@ -20,11 +20,12 @@ import {
 import { Case, CaseHasExistedGuard, CurrentCase } from '../case'
 import { CaseNotificationDto } from './dto/caseNotification.dto'
 import { InstitutionNotificationDto } from './dto/institutionNotification.dto'
-import { NotificationDto } from './dto/notification.dto'
+import { SubpoenaNotificationDto } from './dto/subpoenaNotification.dto'
 import { DeliverResponse } from './models/deliver.response'
 import { InstitutionNotificationService } from './institutionNotification.service'
 import { InternalNotificationService } from './internalNotification.service'
 import { NotificationDispatchService } from './notificationDispatch.service'
+import { SubpoenaNotificationService } from './subpoenaNotification.service'
 
 @UseGuards(TokenGuard)
 @Controller('api/internal')
@@ -34,6 +35,7 @@ export class InternalNotificationController {
     private readonly internalNotificationService: InternalNotificationService,
     private readonly notificationDispatchService: NotificationDispatchService,
     private readonly institutionNotificationService: InstitutionNotificationService,
+    private readonly subpoenaNotificationService: SubpoenaNotificationService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
   ) {}
 
@@ -75,13 +77,29 @@ export class InternalNotificationController {
     )
   }
 
+  @Post(messageEndpoint[MessageType.SUBPOENA_NOTIFICATION])
+  @ApiCreatedResponse({
+    type: DeliverResponse,
+    description: 'Sends a new notification',
+  })
+  sendSubpoenaNotification(
+    @Body() notificationDto: SubpoenaNotificationDto,
+  ): Promise<DeliverResponse> {
+    this.logger.debug(`Sending ${notificationDto.type} notification`)
+
+    return this.subpoenaNotificationService.sendNotification(
+      notificationDto.type,
+      notificationDto.subpoena,
+    )
+  }
+
   @Post(messageEndpoint[MessageType.NOTIFICATION_DISPATCH])
   @ApiCreatedResponse({
     type: DeliverResponse,
     description: 'Dispatches notifications',
   })
   dispatchNotification(
-    @Body() notificationDto: NotificationDto,
+    @Body() notificationDto: InstitutionNotificationDto,
   ): Promise<DeliverResponse> {
     this.logger.debug(`Dispatching ${notificationDto.type} notification`)
 

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

@@ -118,30 +118,6 @@ export class InternalNotificationService extends BaseNotificationService {
     )
   }
 
-  private hasSentNotification(
-    type: NotificationType,
-    notifications?: Notification[],
-  ) {
-    return notifications?.some((notification) => notification.type === type)
-  }
-
-  private hasReceivedNotification(
-    type?: NotificationType | NotificationType[],
-    address?: string,
-    notifications?: Notification[],
-  ) {
-    const types = type ? [type].flat() : Object.values(NotificationType)
-
-    return notifications?.some((notification) => {
-      return (
-        types.includes(notification.type) &&
-        notification.recipients.some(
-          (recipient) => recipient.address === address && recipient.success,
-        )
-      )
-    })
-  }
-
   private async shouldSendNotificationToPrison(
     theCase: Case,
   ): Promise<boolean> {

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

@@ -13,6 +13,7 @@ import {
   DefendantModule,
   EventModule,
   InstitutionModule,
+  SubpoenaModule,
   UserModule,
 } from '../index'
 import { Notification } from './models/notification.model'
@@ -22,6 +23,7 @@ import { InternalNotificationService } from './internalNotification.service'
 import { NotificationController } from './notification.controller'
 import { NotificationService } from './notification.service'
 import { NotificationDispatchService } from './notificationDispatch.service'
+import { SubpoenaNotificationService } from './subpoenaNotification.service'
 
 @Module({
   imports: [
@@ -31,6 +33,7 @@ import { NotificationDispatchService } from './notificationDispatch.service'
     MessageModule,
     InstitutionModule,
     UserModule,
+    forwardRef(() => SubpoenaModule),
     forwardRef(() => CaseModule),
     forwardRef(() => CourtModule),
     forwardRef(() => EventModule),
@@ -43,6 +46,7 @@ import { NotificationDispatchService } from './notificationDispatch.service'
     InternalNotificationService,
     NotificationDispatchService,
     InstitutionNotificationService,
+    SubpoenaNotificationService,
   ],
 })
 export class NotificationModule {}