feat(j-s): Send to prison admin (#16831)

* Add a send to fmst button that routes to a page * Remove unused code * Add UI * Create event log when indictment is sent to FMSt * Create event log when indictment is sent to FMSt * Create event log when indictment is sent to FMSt * Refactor * Refactor * Refactor * Updates FMST queries * Refactor * Refactor * Refactor * Refactor * Add DefendantEventLog table * Refactor * Send sentToPrisonAdminDate to client * Show sent to prison admin date on info cards * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Frontend: Upload file to prison admin * Frontend: Upload file to prison admin * Add SentToPrisonAdmin tag in cases list for PP * Merge * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Refactor * Remove caseId from defendant event log table * Remove caseId from defendant event log table * Revert * Remove unused code * Refactor * Removes unused event type * Removes the defendant event log from the api * Moves defendant event log to defendant model * Fixes backend case retrieval * Updates unit test * Sets the sent to prison admin date to undefined it the defendant has not been sent to prison admin * Fixes linting issues * Updates unit tests * Updates unit tests * Updates unit tests * Updates unit tests --------- Co-authored-by: Guðjón Guðjónsson <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Nov 25, 2024 · 78bdd5b · 78bdd5b
1 parent e0596d3
commit 78bdd5b
Show file tree

Hide file tree

Showing 54 changed files with 855 additions and 265 deletions.
diff --git a/apps/judicial-system/api/src/app/modules/defendant/dto/updateDefendant.input.ts b/apps/judicial-system/api/src/app/modules/defendant/dto/updateDefendant.input.ts
@@ -109,4 +109,9 @@ export class UpdateDefendantInput {
   @IsOptional()
   @Field(() => Boolean, { nullable: true })
   readonly caseFilesSharedWithDefender?: boolean
+
+  @Allow()
+  @IsOptional()
+  @Field(() => Boolean, { nullable: true })
+  readonly isSentToPrisonAdmin?: boolean
 }
diff --git a/apps/judicial-system/api/src/app/modules/defendant/models/defendant.model.ts b/apps/judicial-system/api/src/app/modules/defendant/models/defendant.model.ts
@@ -101,4 +101,10 @@ export class Defendant {
 
   @Field(() => Boolean, { nullable: true })
   readonly caseFilesSharedWithDefender?: boolean
+
+  @Field(() => Boolean, { nullable: true })
+  readonly isSentToPrisonAdmin?: boolean
+
+  @Field(() => String, { nullable: true })
+  readonly sentToPrisonAdminDate?: string
 }
diff --git a/apps/judicial-system/backend/migrations/20241112125245-update-defendant.js b/apps/judicial-system/backend/migrations/20241112125245-update-defendant.js
@@ -0,0 +1,25 @@
+'use strict'
+
+module.exports = {
+  up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((transaction) =>
+      queryInterface.addColumn(
+        'defendant',
+        'is_sent_to_prison_admin',
+        {
+          type: Sequelize.BOOLEAN,
+          allowNull: true,
+        },
+        { transaction },
+      ),
+    )
+  },
+
+  down(queryInterface) {
+    return queryInterface.sequelize.transaction((transaction) =>
+      queryInterface.removeColumn('defendant', 'is_sent_to_prison_admin', {
+        transaction,
+      }),
+    )
+  },
+}
diff --git a/apps/judicial-system/backend/migrations/20241114123528-create-defendant-event-log.js b/apps/judicial-system/backend/migrations/20241114123528-create-defendant-event-log.js
@@ -0,0 +1,56 @@
+'use strict'
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.createTable(
+        'defendant_event_log',
+        {
+          id: {
+            type: Sequelize.UUID,
+            primaryKey: true,
+            allowNull: false,
+            defaultValue: Sequelize.UUIDV4,
+          },
+          created: {
+            type: 'TIMESTAMP WITH TIME ZONE',
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+            allowNull: false,
+          },
+          modified: {
+            type: 'TIMESTAMP WITH TIME ZONE',
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+            allowNull: false,
+          },
+          case_id: {
+            type: Sequelize.UUID,
+            references: {
+              model: 'case',
+              key: 'id',
+            },
+            allowNull: false,
+          },
+          defendant_id: {
+            type: Sequelize.UUID,
+            references: {
+              model: 'defendant',
+              key: 'id',
+            },
+            allowNull: false,
+          },
+          event_type: {
+            type: Sequelize.STRING,
+            allowNull: false,
+          },
+        },
+        { transaction: t },
+      ),
+    )
+  },
+
+  down: (queryInterface) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.dropTable('defendant_event_log', { transaction: t }),
+    )
+  },
+}
diff --git a/apps/judicial-system/backend/src/app/formatters/formatters.ts b/apps/judicial-system/backend/src/app/formatters/formatters.ts
@@ -5,7 +5,6 @@ import {
   DEFENDER_ROUTE,
 } from '@island.is/judicial-system/consts'
 import {
-  capitalize,
   enumerate,
   formatCaseType,
   formatDate,
@@ -14,11 +13,7 @@ import {
   laws,
   readableIndictmentSubtypes,
 } from '@island.is/judicial-system/formatters'
-import {
-  AdvocateType,
-  Gender,
-  UserRole,
-} from '@island.is/judicial-system/types'
+import { Gender, UserRole } from '@island.is/judicial-system/types'
 import {
   CaseCustodyRestrictions,
   CaseLegalProvisions,

diff --git a/apps/judicial-system/backend/src/app/modules/case/case.service.ts b/apps/judicial-system/backend/src/app/modules/case/case.service.ts
@@ -40,6 +40,7 @@ import {
   CaseType,
   DateType,
   dateTypes,
+  defendantEventTypes,
   EventType,
   eventTypes,
   isCompletedCase,
@@ -59,7 +60,12 @@ import {
 } from '../../formatters'
 import { AwsS3Service } from '../aws-s3'
 import { CourtService } from '../court'
-import { CivilClaimant, Defendant, DefendantService } from '../defendant'
+import {
+  CivilClaimant,
+  Defendant,
+  DefendantEventLog,
+  DefendantService,
+} from '../defendant'
 import { EventService } from '../event'
 import { EventLog, EventLogService } from '../event-log'
 import { CaseFile, FileService } from '../file'
@@ -285,6 +291,14 @@ export const include: Includeable[] = [
         order: [['created', 'DESC']],
         separate: true,
       },
+      {
+        model: DefendantEventLog,
+        as: 'eventLogs',
+        required: false,
+        where: { eventType: defendantEventTypes },
+        order: [['created', 'DESC']],
+        separate: true,
+      },
     ],
     separate: true,
   },

diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts b/apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts
@@ -6,7 +6,6 @@ import {
   CaseState,
   CaseType,
   EventType,
-  getIndictmentVerdictAppealDeadlineStatus,
   IndictmentCaseReviewDecision,
   isCourtOfAppealsUser,
   isDefenceUser,
@@ -290,16 +289,10 @@ 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])
-
-    const [_, indictmentVerdictAppealDeadlineExpired] =
-      getIndictmentVerdictAppealDeadlineStatus(verdictInfo)
-
-    if (!indictmentVerdictAppealDeadlineExpired) {
+    // Check if a defendant has been sent to the prison admin
+    if (
+      !theCase.defendants?.some((defendant) => defendant.isSentToPrisonAdmin)
+    ) {
       return false
     }
   }

diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts b/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
@@ -25,7 +25,6 @@ import {
   RequestSharedWithDefender,
   restrictionCases,
   UserRole,
-  VERDICT_APPEAL_WINDOW_DAYS,
 } from '@island.is/judicial-system/types'
 
 const getProsecutionUserCasesQueryFilter = (user: User): WhereOptions => {
@@ -215,12 +214,10 @@ const getPrisonAdminUserCasesQueryFilter = (): WhereOptions => {
         indictment_ruling_decision: CaseIndictmentRulingDecision.RULING,
         indictment_review_decision: IndictmentCaseReviewDecision.ACCEPT,
         id: {
-          [Op.notIn]: Sequelize.literal(`
+          [Op.in]: Sequelize.literal(`
             (SELECT case_id
               FROM defendant
-              WHERE (verdict_appeal_date IS NOT NULL
-                OR verdict_view_date IS NULL
-                OR verdict_view_date > NOW() - INTERVAL '${VERDICT_APPEAL_WINDOW_DAYS} days'))
+              WHERE is_sent_to_prison_admin = true)
           `),
         },
       },

diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts b/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
@@ -21,7 +21,6 @@ import {
   RequestSharedWithDefender,
   restrictionCases,
   UserRole,
-  VERDICT_APPEAL_WINDOW_DAYS,
 } from '@island.is/judicial-system/types'
 
 import { getCasesQueryFilter } from '../cases.filter'
@@ -392,12 +391,10 @@ describe('getCasesQueryFilter', () => {
           indictment_ruling_decision: CaseIndictmentRulingDecision.RULING,
           indictment_review_decision: IndictmentCaseReviewDecision.ACCEPT,
           id: {
-            [Op.notIn]: Sequelize.literal(`
+            [Op.in]: Sequelize.literal(`
             (SELECT case_id
               FROM defendant
-              WHERE (verdict_appeal_date IS NOT NULL
-                OR verdict_view_date IS NULL
-                OR verdict_view_date > NOW() - INTERVAL '${VERDICT_APPEAL_WINDOW_DAYS} days'))
+              WHERE is_sent_to_prison_admin = true)
           `),
           },
         },

diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/test/prisonAdminUserFilter.spec.ts b/apps/judicial-system/backend/src/app/modules/case/filters/test/prisonAdminUserFilter.spec.ts
@@ -191,14 +191,29 @@ describe.each(prisonSystemRoles)('prison admin user %s', (role) => {
               describe.each(accessibleIndictmentCaseReviewDecisions)(
                 'accessible indictment case review decision %s',
                 (indictmentReviewDecision) => {
-                  const theCase = {
-                    type,
-                    state,
-                    indictmentRulingDecision,
-                    indictmentReviewDecision,
-                  } as Case
+                  describe('no defendant has been sent to the prison admin', () => {
+                    const theCase = {
+                      type,
+                      state,
+                      indictmentRulingDecision,
+                      indictmentReviewDecision,
+                      defendants: [{}],
+                    } as Case
+
+                    verifyNoAccess(theCase, user)
+                  })
+
+                  describe('a defendant has been sent to the prison admin', () => {
+                    const theCase = {
+                      type,
+                      state,
+                      indictmentRulingDecision,
+                      indictmentReviewDecision,
+                      defendants: [{ isSentToPrisonAdmin: true }],
+                    } as Case
 
-                  verifyReadAccess(theCase, user)
+                    verifyReadAccess(theCase, user)
+                  })
                 },
               )
             },

diff --git a/apps/judicial-system/backend/src/app/modules/case/interceptors/case.interceptor.ts b/apps/judicial-system/backend/src/app/modules/case/interceptors/case.interceptor.ts
@@ -7,12 +7,23 @@ import {
   NestInterceptor,
 } from '@nestjs/common'
 
+import { Defendant, DefendantEventLog } from '../../defendant'
 import { Case } from '../models/case.model'
 import { CaseString } from '../models/caseString.model'
 
+export const transformDefendants = (defendants?: Defendant[]) => {
+  return defendants?.map((defendant) => ({
+    ...defendant.toJSON(),
+    sentToPrisonAdminDate: defendant.isSentToPrisonAdmin
+      ? DefendantEventLog.sentToPrisonAdminDate(defendant.eventLogs)?.created
+      : undefined,
+  }))
+}
+
 const transformCase = (theCase: Case) => {
   return {
     ...theCase.toJSON(),
+    defendants: transformDefendants(theCase.defendants),
     postponedIndefinitelyExplanation:
       CaseString.postponedIndefinitelyExplanation(theCase.caseStrings),
     civilDemands: CaseString.civilDemands(theCase.caseStrings),

diff --git a/apps/judicial-system/backend/src/app/modules/case/interceptors/caseList.interceptor.ts b/apps/judicial-system/backend/src/app/modules/case/interceptors/caseList.interceptor.ts
@@ -12,6 +12,7 @@ import { IndictmentDecision } from '@island.is/judicial-system/types'
 import { Case } from '../models/case.model'
 import { CaseString } from '../models/caseString.model'
 import { DateLog } from '../models/dateLog.model'
+import { transformDefendants } from './case.interceptor'
 
 @Injectable()
 export class CaseListInterceptor implements NestInterceptor {
@@ -29,7 +30,7 @@ export class CaseListInterceptor implements NestInterceptor {
             policeCaseNumbers: theCase.policeCaseNumbers,
             state: theCase.state,
             type: theCase.type,
-            defendants: theCase.defendants,
+            defendants: transformDefendants(theCase.defendants),
             courtCaseNumber: theCase.courtCaseNumber,
             decision: theCase.decision,
             validToDate: theCase.validToDate,

diff --git a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts
@@ -23,6 +23,7 @@ import {
   CaseNotificationType,
   CaseState,
   dateTypes,
+  defendantEventTypes,
   eventTypes,
   stringTypes,
   UserRole,
@@ -34,6 +35,7 @@ import {
   CivilClaimant,
   CivilClaimantService,
   Defendant,
+  DefendantEventLog,
   DefendantService,
 } from '../defendant'
 import { EventLog } from '../event-log'
@@ -182,6 +184,14 @@ export const include: Includeable[] = [
         order: [['created', 'DESC']],
         separate: true,
       },
+      {
+        model: DefendantEventLog,
+        as: 'eventLogs',
+        required: false,
+        where: { eventType: defendantEventTypes },
+        order: [['created', 'DESC']],
+        separate: true,
+      },
     ],
     separate: true,
   },

diff --git a/apps/judicial-system/backend/src/app/modules/defendant/defendant.module.ts b/apps/judicial-system/backend/src/app/modules/defendant/defendant.module.ts
@@ -7,6 +7,7 @@ import { CaseModule } from '../case/case.module'
 import { CourtModule } from '../court/court.module'
 import { CivilClaimant } from './models/civilClaimant.model'
 import { Defendant } from './models/defendant.model'
+import { DefendantEventLog } from './models/defendantEventLog.model'
 import { CivilClaimantController } from './civilClaimant.controller'
 import { CivilClaimantService } from './civilClaimant.service'
 import { DefendantController } from './defendant.controller'
@@ -18,7 +19,7 @@ import { InternalDefendantController } from './internalDefendant.controller'
     MessageModule,
     forwardRef(() => CourtModule),
     forwardRef(() => CaseModule),
-    SequelizeModule.forFeature([Defendant, CivilClaimant]),
+    SequelizeModule.forFeature([Defendant, CivilClaimant, DefendantEventLog]),
   ],
   controllers: [
     DefendantController,