Merge branch 'main' into endorsement-system/owner-name-nationalid

apps/download-service/src/app/app.module.ts

@@ -51,7 +51,6 @@ import {
   WorkMachinesClientConfig,
   WorkMachinesClientModule,
 } from '@island.is/clients/work-machines'
-import { HealthPaymentsOverviewController } from './modules/health/payment-overview-documents.controller'
 import {
   RightsPortalClientConfig,
   RightsPortalClientModule,
@@ -70,7 +69,6 @@ import {
     RegulationDocumentsController,
     WorkMachinesController,
     OccupationalLicensesController,
-    HealthPaymentsOverviewController,
   ],
   imports: [
     AuditModule.forRoot(environment.audit),

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

@@ -355,6 +355,17 @@ export class BackendService extends DataSource<{ req: Request }> {
     )
   }
 
+  limitedAccessUpdateDefendant(
+    caseId: string,
+    defendantId: string,
+    updateDefendant: unknown,
+  ): Promise<Defendant> {
+    return this.patch(
+      `case/${caseId}/limitedAccess/defendant/${defendantId}`,
+      updateDefendant,
+    )
+  }
+
   deleteDefendant(
     caseId: string,
     defendantId: string,

apps/judicial-system/api/src/app/modules/defendant/defendant.module.ts

@@ -2,8 +2,13 @@ import { Module } from '@nestjs/common'
 
 import { CivilClaimantResolver } from './civilClaimant.resolver'
 import { DefendantResolver } from './defendant.resolver'
+import { LimitedAccessDefendantResolver } from './limitedAccessDefendant.resolver'
 
 @Module({
-  providers: [DefendantResolver, CivilClaimantResolver],
+  providers: [
+    DefendantResolver,
+    CivilClaimantResolver,
+    LimitedAccessDefendantResolver,
+  ],
 })
 export class DefendantModule {}

apps/judicial-system/api/src/app/modules/defendant/dto/updateDefendant.input.ts

@@ -6,6 +6,7 @@ import {
   DefendantPlea,
   DefenderChoice,
   Gender,
+  PunishmentType,
   ServiceRequirement,
   SubpoenaType,
 } from '@island.is/judicial-system/types'
@@ -114,4 +115,9 @@ export class UpdateDefendantInput {
   @IsOptional()
   @Field(() => Boolean, { nullable: true })
   readonly isSentToPrisonAdmin?: boolean
+
+  @Allow()
+  @IsOptional()
+  @Field(() => PunishmentType, { nullable: true })
+  readonly punishmentType?: PunishmentType
 }

apps/judicial-system/api/src/app/modules/defendant/limitedAccessDefendant.resolver.ts

@@ -0,0 +1,54 @@
+import { Inject, UseGuards } from '@nestjs/common'
+import { Args, Context, Mutation, Resolver } from '@nestjs/graphql'
+
+import type { Logger } from '@island.is/logging'
+import { LOGGER_PROVIDER } from '@island.is/logging'
+
+import {
+  AuditedAction,
+  AuditTrailService,
+} from '@island.is/judicial-system/audit-trail'
+import {
+  CurrentGraphQlUser,
+  JwtGraphQlAuthGuard,
+} from '@island.is/judicial-system/auth'
+import type { User } from '@island.is/judicial-system/types'
+
+import { BackendService } from '../backend'
+import { UpdateDefendantInput } from './dto/updateDefendant.input'
+import { Defendant } from './models/defendant.model'
+
+@UseGuards(JwtGraphQlAuthGuard)
+@Resolver()
+export class LimitedAccessDefendantResolver {
+  constructor(
+    private readonly auditTrailService: AuditTrailService,
+    @Inject(LOGGER_PROVIDER)
+    private readonly logger: Logger,
+  ) {}
+
+  @Mutation(() => Defendant, { nullable: true })
+  limitedAccessUpdateDefendant(
+    @Args('input', { type: () => UpdateDefendantInput })
+    input: UpdateDefendantInput,
+    @CurrentGraphQlUser() user: User,
+    @Context('dataSources')
+    { backendService }: { backendService: BackendService },
+  ): Promise<Defendant> {
+    const { caseId, defendantId, ...updateDefendant } = input
+    this.logger.debug(
+      `Updating limitedAccess defendant ${defendantId} for case ${caseId}`,
+    )
+
+    return this.auditTrailService.audit(
+      user.id,
+      AuditedAction.UPDATE_DEFENDANT,
+      backendService.limitedAccessUpdateDefendant(
+        caseId,
+        defendantId,
+        updateDefendant,
+      ),
+      defendantId,
+    )
+  }
+}

apps/judicial-system/api/src/app/modules/defendant/models/defendant.model.ts

@@ -4,6 +4,7 @@ import {
   DefendantPlea,
   DefenderChoice,
   Gender,
+  PunishmentType,
   ServiceRequirement,
   SubpoenaType,
 } from '@island.is/judicial-system/types'
@@ -15,6 +16,7 @@ registerEnumType(DefendantPlea, { name: 'DefendantPlea' })
 registerEnumType(ServiceRequirement, { name: 'ServiceRequirement' })
 registerEnumType(DefenderChoice, { name: 'DefenderChoice' })
 registerEnumType(SubpoenaType, { name: 'SubpoenaType' })
+registerEnumType(PunishmentType, { name: 'PunishmentType' })
 
 @ObjectType()
 export class Defendant {
@@ -107,4 +109,7 @@ export class Defendant {
 
   @Field(() => String, { nullable: true })
   readonly sentToPrisonAdminDate?: string
+
+  @Field(() => PunishmentType, { nullable: true })
+  readonly punishmentType?: PunishmentType
 }

apps/judicial-system/backend/migrations/20241211095654-update-defendant.js

@@ -0,0 +1,26 @@
+'use strict'
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.addColumn(
+          'defendant',
+          'punishment_type',
+          {
+            type: Sequelize.STRING,
+            allowNull: true,
+          },
+          { transaction: t },
+        ),
+      ]),
+    )
+  },
+  async down(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.removeColumn('defendant', 'punishment_type', {
+        transaction: t,
+      }),
+    )
+  },
+}

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

@@ -856,4 +856,19 @@ export const notifications = {
       description: 'Texti í pósti til aðila máls þegar ný gögn eru send',
     },
   }),
+  courtOfficialAssignedEmail: defineMessages({
+    subject: {
+      id: 'judicial.system.backend:notifications.court_official_assigned_email.subject',
+      defaultMessage: 'Úthlutun máls {courtCaseNumber}',
+      description:
+        'Fyrirsögn í pósti til dómara og dómritara þegar máli er úthlutað á þau',
+    },
+    body: {
+      id: 'judicial.system.backend:notifications.court_official_assigned_email.body',
+      defaultMessage:
+        'Héraðsdómur hefur skráð þig sem {role, select, DISTRICT_COURT_JUDGE {dómara} DISTRICT_COURT_REGISTRAR {dómritara} other {óþekkt}} í máli {courtCaseNumber}. Hægt er að nálgast gögn málsins á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}',
+      description:
+        'Texti í pósti til dómara og dómritara þegar máli er úthlutað á þau',
+    },
+  }),
 }

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

@@ -687,6 +687,34 @@ export class CaseService {
     ])
   }
 
+  private addMessagesForDistrictCourtJudgeAssignedToQueue(
+    theCase: Case,
+    user: TUser,
+  ): Promise<void> {
+    return this.messageService.sendMessagesToQueue([
+      {
+        type: MessageType.NOTIFICATION,
+        user,
+        caseId: theCase.id,
+        body: { type: CaseNotificationType.DISTRICT_COURT_JUDGE_ASSIGNED },
+      },
+    ])
+  }
+
+  private addMessagesForDistrictCourtRegistrarAssignedToQueue(
+    theCase: Case,
+    user: TUser,
+  ): Promise<void> {
+    return this.messageService.sendMessagesToQueue([
+      {
+        type: MessageType.NOTIFICATION,
+        user,
+        caseId: theCase.id,
+        body: { type: CaseNotificationType.DISTRICT_COURT_REGISTRAR_ASSIGNED },
+      },
+    ])
+  }
+
   private addMessagesForReceivedCaseToQueue(
     theCase: Case,
     user: TUser,
@@ -1403,6 +1431,30 @@ export class CaseService {
       }
     }
 
+    if (
+      isIndictment &&
+      [CaseState.SUBMITTED, CaseState.RECEIVED].includes(updatedCase.state)
+    ) {
+      const isJudgeChanged =
+        updatedCase.judge?.nationalId !== theCase.judge?.nationalId
+      const isRegistrarChanged =
+        updatedCase.registrar?.nationalId !== theCase.registrar?.nationalId
+
+      if (isJudgeChanged) {
+        await this.addMessagesForDistrictCourtJudgeAssignedToQueue(
+          updatedCase,
+          user,
+        )
+      }
+
+      if (isRegistrarChanged) {
+        await this.addMessagesForDistrictCourtRegistrarAssignedToQueue(
+          updatedCase,
+          user,
+        )
+      }
+    }
+
     if (
       isIndictment &&
       ![

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

@@ -234,6 +234,7 @@ export const include: Includeable[] = [
         CaseFileCategory.PROSECUTOR_CASE_FILE,
         CaseFileCategory.DEFENDANT_CASE_FILE,
         CaseFileCategory.CIVIL_CLAIM,
+        CaseFileCategory.SENT_TO_PRISON_ADMIN_FILE,
       ],
     },
     separate: true,

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

@@ -13,6 +13,7 @@ import { CivilClaimantService } from './civilClaimant.service'
 import { DefendantController } from './defendant.controller'
 import { DefendantService } from './defendant.service'
 import { InternalDefendantController } from './internalDefendant.controller'
+import { LimitedAccessDefendantController } from './limitedAccessDefendant.controller'
 
 @Module({
   imports: [
@@ -25,6 +26,7 @@ import { InternalDefendantController } from './internalDefendant.controller'
     DefendantController,
     InternalDefendantController,
     CivilClaimantController,
+    LimitedAccessDefendantController,
   ],
   providers: [DefendantService, CivilClaimantService],
   exports: [DefendantService, CivilClaimantService],

apps/judicial-system/backend/src/app/modules/defendant/dto/updateDefendant.dto.ts

@@ -15,6 +15,7 @@ import {
   DefendantPlea,
   DefenderChoice,
   Gender,
+  PunishmentType,
   ServiceRequirement,
   SubpoenaType,
 } from '@island.is/judicial-system/types'
@@ -149,4 +150,9 @@ export class UpdateDefendantDto {
   @IsBoolean()
   @ApiPropertyOptional({ type: Boolean })
   readonly isSentToPrisonAdmin?: boolean
+
+  @IsOptional()
+  @IsEnum(PunishmentType)
+  @ApiPropertyOptional({ enum: PunishmentType })
+  readonly punishmentType?: PunishmentType
 }

apps/judicial-system/backend/src/app/modules/defendant/guards/rolesRules.ts

@@ -0,0 +1,13 @@
+import { RolesRule, RulesType } from '@island.is/judicial-system/auth'
+import { UserRole } from '@island.is/judicial-system/types'
+
+import { UpdateDefendantDto } from '../dto/updateDefendant.dto'
+
+const limitedAccessFields: (keyof UpdateDefendantDto)[] = ['punishmentType']
+
+// Allows prison staff to update a specific set of fields for defendant
+export const prisonSystemStaffUpdateRule: RolesRule = {
+  role: UserRole.PRISON_SYSTEM_STAFF,
+  type: RulesType.FIELD,
+  dtoFields: limitedAccessFields,
+}