feat(j-s): Judge confirms defender and civil claimant defense choices

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

@@ -61,4 +61,9 @@ export class UpdateCivilClaimantInput {
   @IsOptional()
   @Field(() => Boolean, { nullable: true })
   readonly caseFilesSharedWithSpokesperson?: boolean
+
+  @Allow()
+  @IsOptional()
+  @Field(() => Boolean, { nullable: true })
+  readonly isSpokespersonConfirmed?: boolean
 }

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

@@ -94,4 +94,14 @@ export class UpdateDefendantInput {
   @IsOptional()
   @Field(() => SubpoenaType, { nullable: true })
   readonly subpoenaType?: SubpoenaType
+
+  @Allow()
+  @IsOptional()
+  @Field(() => Boolean, { nullable: true })
+  readonly isDefenderChoiceConfirmed?: boolean
+
+  @Allow()
+  @IsOptional()
+  @Field(() => Boolean, { nullable: true })
+  readonly caseFilesSharedWithDefender?: boolean
 }

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

@@ -43,4 +43,7 @@ export class CivilClaimant {
 
   @Field(() => Boolean, { nullable: true })
   readonly caseFilesSharedWithSpokesperson?: boolean
+
+  @Field(() => Boolean, { nullable: true })
+  readonly isSpokespersonConfirmed?: boolean
 }

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

@@ -89,4 +89,10 @@ export class Defendant {
 
   @Field(() => [Subpoena], { nullable: true })
   readonly subpoenas?: Subpoena[]
+
+  @Field(() => Boolean, { nullable: true })
+  readonly isDefenderChoiceConfirmed?: boolean
+
+  @Field(() => Boolean, { nullable: true })
+  readonly caseFilesSharedWithDefender?: boolean
 }

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

@@ -0,0 +1,46 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.addColumn(
+          'defendant',
+          'is_defender_choice_confirmed',
+          {
+            type: Sequelize.BOOLEAN,
+            allowNull: true,
+          },
+          { transaction: t },
+        ),
+        queryInterface.addColumn(
+          'defendant',
+          'case_files_shared_with_defender',
+          {
+            type: Sequelize.BOOLEAN,
+            allowNull: true,
+          },
+          { transaction: t },
+        ),
+      ]),
+    )
+  },
+  down: (queryInterface) => {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.removeColumn(
+          'defendant',
+          'is_defender_choice_confirmed',
+          {
+            transaction: t,
+          },
+        ),
+        queryInterface.removeColumn(
+          'defendant',
+          'case_files_shared_with_defender',
+          {
+            transaction: t,
+          },
+        ),
+      ]),
+    )
+  },
+}

apps/judicial-system/backend/migrations/20241018105400-update-civil-claimant.js

@@ -0,0 +1,26 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.addColumn(
+        'civil_claimant',
+        'is_spokesperson_confirmed',
+        {
+          type: Sequelize.BOOLEAN,
+          allowNull: true,
+        },
+        { transaction: t },
+      ),
+    )
+  },
+  down: (queryInterface) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.removeColumn(
+        'civil_claimant',
+        'is_spokesperson_confirmed',
+        {
+          transaction: t,
+        },
+      ),
+    )
+  },
+}

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

@@ -386,13 +386,18 @@ const canDefenceUserAccessIndictmentCase = (
   }
 
   // Check case defender assignment
-  if (Defendant.isDefenderOfDefendant(user.nationalId, theCase.defendants)) {
+  if (
+    Defendant.isConfirmedDefenderOfDefendant(
+      user.nationalId,
+      theCase.defendants,
+    )
+  ) {
     return true
   }
 
   // Check case spokesperson assignment
   if (
-    CivilClaimant.isSpokespersonOfCivilClaimant(
+    CivilClaimant.isConfirmedSpokespersonOfCivilClaimant(
       user.nationalId,
       theCase.civilClaimants,
     ) &&

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

@@ -289,12 +289,17 @@ export const defenderGeneratedPdfRule: RolesRule = {
     }
 
     // Allow if the user is a defender of a defendant of the case
-    if (Defendant.isDefenderOfDefendant(user.nationalId, theCase.defendants)) {
+    if (
+      Defendant.isConfirmedDefenderOfDefendantWithCaseFileAccess(
+        user.nationalId,
+        theCase.defendants,
+      )
+    ) {
       return true
     }
 
     if (
-      CivilClaimant.isSpokespersonOfCivilClaimantWithCaseFileAccess(
+      CivilClaimant.isConfirmedSpokespersonOfCivilClaimantWithCaseFileAccess(
         user.nationalId,
         theCase.civilClaimants,
       )

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

@@ -21,6 +21,7 @@ import type { User } from '@island.is/judicial-system/types'
 import {
   CaseState,
   CaseType,
+  isDistrictCourtUser,
   NotificationType,
 } from '@island.is/judicial-system/types'
 
@@ -200,7 +201,16 @@ export class DefendantService {
     caseId: string,
     defendantNationalId: string,
     update: UpdateDefendantDto,
+    user?: User,
   ): Promise<Defendant> {
+    const isDefenderChoiceConfirmed = Boolean(
+      user &&
+        isDistrictCourtUser(user) &&
+        update.isDefenderChoiceConfirmed === true,
+    )
+
+    update = { ...update, isDefenderChoiceConfirmed: isDefenderChoiceConfirmed }
+
     const [numberOfAffectedRows, defendants] = await this.defendantModel.update(
       update,
       {

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

@@ -59,4 +59,14 @@ export class CreateDefendantDto {
   @IsEnum(DefenderChoice)
   @ApiPropertyOptional({ enum: DefenderChoice })
   readonly defenderChoice?: DefenderChoice
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly isDefenderChoiceConfirmed?: boolean
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly caseFilesSharedWithDefender?: boolean
 }

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

@@ -52,4 +52,9 @@ export class UpdateCivilClaimantDto {
   @IsBoolean()
   @ApiPropertyOptional({ type: Boolean })
   readonly caseFilesSharedWithSpokesperson?: boolean
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly isSpokespersonConfirmed?: boolean
 }

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

@@ -108,4 +108,14 @@ export class UpdateDefendantDto {
   @IsString()
   @ApiPropertyOptional({ type: String })
   readonly requestedDefenderName?: string
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly isDefenderChoiceConfirmed?: boolean
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly caseFilesSharedWithDefender?: boolean
 }

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

@@ -20,28 +20,30 @@ import { Case } from '../../case/models/case.model'
   timestamps: false,
 })
 export class CivilClaimant extends Model {
-  static isSpokespersonOfCivilClaimant(
+  static isConfirmedSpokespersonOfCivilClaimant(
     spokespersonNationalId: string,
     civilClaimants?: CivilClaimant[],
   ) {
     return civilClaimants?.some(
       (civilClaimant) =>
         civilClaimant.hasSpokesperson &&
         civilClaimant.spokespersonNationalId &&
+        civilClaimant.isSpokespersonConfirmed &&
         normalizeAndFormatNationalId(spokespersonNationalId).includes(
           civilClaimant.spokespersonNationalId,
         ),
     )
   }
 
-  static isSpokespersonOfCivilClaimantWithCaseFileAccess(
+  static isConfirmedSpokespersonOfCivilClaimantWithCaseFileAccess(
     spokespersonNationalId: string,
     civilClaimants?: CivilClaimant[],
   ) {
     return civilClaimants?.some(
       (civilClaimant) =>
         civilClaimant.hasSpokesperson &&
         civilClaimant.spokespersonNationalId &&
+        civilClaimant.isSpokespersonConfirmed &&
         normalizeAndFormatNationalId(spokespersonNationalId).includes(
           civilClaimant.spokespersonNationalId,
         ) &&
@@ -141,4 +143,11 @@ export class CivilClaimant extends Model {
   })
   @ApiPropertyOptional({ type: Boolean })
   caseFilesSharedWithSpokesperson?: boolean
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: true,
+  })
+  @ApiPropertyOptional({ type: Boolean })
+  isSpokespersonConfirmed?: boolean
 }

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

@@ -29,7 +29,7 @@ import { Subpoena } from '../../subpoena/models/subpoena.model'
   timestamps: true,
 })
 export class Defendant extends Model {
-  static isDefenderOfDefendant(
+  static isConfirmedDefenderOfDefendant(
     defenderNationalId: string,
     defendants?: Defendant[],
   ) {
@@ -38,7 +38,23 @@ export class Defendant extends Model {
         defendant.defenderNationalId &&
         normalizeAndFormatNationalId(defenderNationalId).includes(
           defendant.defenderNationalId,
-        ),
+        ) &&
+        defendant.isDefenderChoiceConfirmed,
+    )
+  }
+
+  static isConfirmedDefenderOfDefendantWithCaseFileAccess(
+    defenderNationalId: string,
+    defendants?: Defendant[],
+  ) {
+    return defendants?.some(
+      (defendant) =>
+        defendant.defenderNationalId &&
+        normalizeAndFormatNationalId(defenderNationalId).includes(
+          defendant.defenderNationalId,
+        ) &&
+        defendant.isDefenderChoiceConfirmed &&
+        defendant.caseFilesSharedWithDefender,
     )
   }
 
@@ -167,4 +183,12 @@ export class Defendant extends Model {
   @Column({ type: DataType.STRING, allowNull: true })
   @ApiPropertyOptional({ type: String })
   requestedDefenderName?: string
+
+  @Column({ type: DataType.BOOLEAN, allowNull: true })
+  @ApiPropertyOptional({ type: Boolean })
+  isDefenderChoiceConfirmed?: boolean
+
+  @Column({ type: DataType.BOOLEAN, allowNull: true })
+  @ApiPropertyOptional({ type: Boolean })
+  caseFilesSharedWithDefender?: boolean
 }

apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts

@@ -64,14 +64,19 @@ const canDefenceUserViewCaseFileOfIndictmentCase = (
   defendants?: Defendant[],
   civilClaimants?: CivilClaimant[],
 ) => {
-  if (Defendant.isDefenderOfDefendant(nationalId, defendants)) {
+  if (
+    Defendant.isConfirmedDefenderOfDefendantWithCaseFileAccess(
+      nationalId,
+      defendants,
+    )
+  ) {
     return defenderCaseFileCategoriesForIndictmentCases.includes(
       caseFileCategory,
     )
   }
 
   if (
-    CivilClaimant.isSpokespersonOfCivilClaimantWithCaseFileAccess(
+    CivilClaimant.isConfirmedSpokespersonOfCivilClaimantWithCaseFileAccess(
       nationalId,
       civilClaimants,
     )

apps/judicial-system/backend/src/app/modules/subpoena/dto/updateSubpoena.dto.ts

@@ -1,4 +1,4 @@
-import { IsEnum, IsOptional, IsString } from 'class-validator'
+import { IsBoolean, IsEnum, IsOptional, IsString } from 'class-validator'
 
 import { ApiPropertyOptional } from '@nestjs/swagger'
 
@@ -64,4 +64,14 @@ export class UpdateSubpoenaDto {
   @IsString()
   @ApiPropertyOptional({ type: String })
   readonly requestedDefenderName?: string
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly isDefenderChoiceConfirmed?: boolean
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean })
+  readonly caseFilesSharedWithDefender?: boolean
 }