Add subpoena type to case table

island-is · Jun 10, 2024 · d78dc83 · d78dc83
1 parent 0c9cbae
commit d78dc83
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 0 deletions.
diff --git a/apps/judicial-system/api/src/app/modules/case/dto/updateCase.input.ts b/apps/judicial-system/api/src/app/modules/case/dto/updateCase.input.ts
@@ -28,6 +28,7 @@ import {
   IndictmentDecision,
   RequestSharedWithDefender,
   SessionArrangements,
+  SubpoenaType,
   UserRole,
 } from '@island.is/judicial-system/types'
 
@@ -495,4 +496,9 @@ export class UpdateCaseInput {
   @IsOptional()
   @Field(() => IndictmentDecision, { nullable: true })
   readonly indictmentDecision?: IndictmentDecision
+
+  @Allow()
+  @IsOptional()
+  @Field(() => SubpoenaType, { nullable: true })
+  readonly subpoenaType?: SubpoenaType
 }
diff --git a/apps/judicial-system/api/src/app/modules/case/models/case.model.ts b/apps/judicial-system/api/src/app/modules/case/models/case.model.ts
@@ -22,6 +22,7 @@ import {
   IndictmentDecision,
   RequestSharedWithDefender,
   SessionArrangements,
+  SubpoenaType,
   UserRole,
 } from '@island.is/judicial-system/types'
 
@@ -53,6 +54,7 @@ registerEnumType(IndictmentCaseReviewDecision, {
   name: 'IndictmentCaseReviewDecision',
 })
 registerEnumType(IndictmentDecision, { name: 'IndictmentDecision' })
+registerEnumType(SubpoenaType, { name: 'SubpoenaType' })
 
 @ObjectType()
 class DateLog {
@@ -439,4 +441,7 @@ export class Case {
 
   @Field(() => IndictmentDecision, { nullable: true })
   readonly indictmentDecision?: IndictmentDecision
+
+  @Field(() => SubpoenaType, { nullable: true })
+  readonly subpoenaType?: SubpoenaType
 }
diff --git a/apps/judicial-system/backend/migrations/20240610131959-update-case.js b/apps/judicial-system/backend/migrations/20240610131959-update-case.js
@@ -0,0 +1,25 @@
+'use strict'
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.addColumn(
+        'case',
+        'subpoena_type',
+        {
+          type: Sequelize.STRING,
+          allowNull: true,
+        },
+        { transaction: t },
+      ),
+    )
+  },
+
+  async down(queryInterface) {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.removeColumn('case', 'subpoena_type', {
+        transaction: t,
+      }),
+    )
+  },
+}
diff --git a/apps/judicial-system/backend/src/app/modules/case/dto/updateCase.dto.ts b/apps/judicial-system/backend/src/app/modules/case/dto/updateCase.dto.ts
@@ -31,6 +31,7 @@ import {
   IndictmentDecision,
   RequestSharedWithDefender,
   SessionArrangements,
+  SubpoenaType,
   UserRole,
 } from '@island.is/judicial-system/types'
 
@@ -502,4 +503,9 @@ export class UpdateCaseDto {
   @IsEnum(IndictmentDecision)
   @ApiPropertyOptional({ enum: IndictmentDecision })
   readonly indictmentDecision?: IndictmentDecision
+
+  @IsOptional()
+  @IsEnum(SubpoenaType)
+  @ApiPropertyOptional({ enum: SubpoenaType })
+  readonly subpoenaType?: SubpoenaType
 }
diff --git a/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts b/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts
@@ -92,6 +92,7 @@ const districtCourtFields: (keyof UpdateCaseDto)[] = [
   'postponedIndefinitelyExplanation',
   'indictmentRulingDecision',
   'indictmentDecision',
+  'subpoenaType',
 ]
 
 const courtOfAppealsFields: (keyof UpdateCaseDto)[] = [

diff --git a/apps/judicial-system/backend/src/app/modules/case/models/case.model.ts b/apps/judicial-system/backend/src/app/modules/case/models/case.model.ts
@@ -33,6 +33,7 @@ import {
   IndictmentDecision,
   RequestSharedWithDefender,
   SessionArrangements,
+  SubpoenaType,
   UserRole,
 } from '@island.is/judicial-system/types'
 
@@ -1033,4 +1034,15 @@ export class Case extends Model {
   @Column({ type: DataType.STRING, allowNull: true })
   @ApiPropertyOptional({ type: String })
   indictmentHash?: string
+
+  /**********
+   * The type of subpoena in indictment cases
+   **********/
+  @Column({
+    type: DataType.ENUM,
+    allowNull: true,
+    values: Object.values(SubpoenaType),
+  })
+  @ApiPropertyOptional({ enum: SubpoenaType })
+  subpoenaType?: SubpoenaType
 }
diff --git a/apps/judicial-system/web/src/components/FormProvider/case.graphql b/apps/judicial-system/web/src/components/FormProvider/case.graphql
@@ -264,5 +264,6 @@ query Case($input: CaseQueryInput!) {
     indictmentVerdictViewedByAll
     indictmentVerdictAppealDeadline
     indictmentDecision
+    subpoenaType
   }
 }
diff --git a/apps/judicial-system/web/src/utils/hooks/useCase/updateCase.graphql b/apps/judicial-system/web/src/utils/hooks/useCase/updateCase.graphql
@@ -220,5 +220,6 @@ mutation UpdateCase($input: UpdateCaseInput!) {
     indictmentDeniedExplanation
     indictmentReturnedExplanation
     indictmentDecision
+    subpoenaType
   }
 }
diff --git a/libs/judicial-system/types/src/index.ts b/libs/judicial-system/types/src/index.ts
@@ -73,6 +73,7 @@ export {
   isRequestCaseState,
   isIndictmentCaseTransition,
   isRequestCaseTransition,
+  SubpoenaType,
 } from './lib/case'
 export type {
   CrimeScene,

diff --git a/libs/judicial-system/types/src/lib/case.ts b/libs/judicial-system/types/src/lib/case.ts
@@ -224,6 +224,11 @@ export enum IndictmentDecision {
   REDISTRIBUTING = 'REDISTRIBUTING',
 }
 
+export enum SubpoenaType {
+  ABSENCE = 'ABSENCE',
+  ARREST = 'ARREST',
+}
+
 export enum CaseAppealRulingDecision {
   ACCEPTING = 'ACCEPTING',
   REPEAL = 'REPEAL',