feat(j-s): Civil Demands (#16010)

* Adds civil demands to traffic violation indictments * Handles case strings in the backend only * Renames the case file interceptor * Adds civil demands to indictment pdf --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Sep 16, 2024 · 7572adf · 7572adf
1 parent c2ab2f5
commit 7572adf
Show file tree

Hide file tree

Showing 37 changed files with 477 additions and 293 deletions.
diff --git a/apps/judicial-system/api/src/app/modules/backend/backend.service.ts b/apps/judicial-system/api/src/app/modules/backend/backend.service.ts
@@ -6,12 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'
 import { type ConfigType } from '@island.is/nest/config'
 import { ProblemError } from '@island.is/nest/problem'
 
-import {
-  CommentType,
-  DateType,
-  type User,
-  UserRole,
-} from '@island.is/judicial-system/types'
+import { DateType, type User, UserRole } from '@island.is/judicial-system/types'
 
 import {
   Case,
@@ -144,7 +139,6 @@ export class BackendService extends DataSource<{ req: Request }> {
   private caseTransformer<Case>(data: unknown): Case {
     const theCase = data as Case & {
       dateLogs?: { dateType: DateType; date: string }[]
-      explanatoryComments?: { commentType: CommentType; comment: string }[]
     }
 
     return {
@@ -155,11 +149,6 @@ export class BackendService extends DataSource<{ req: Request }> {
       courtDate: theCase.dateLogs?.find(
         (dateLog) => dateLog.dateType === DateType.COURT_DATE,
       ),
-      postponedIndefinitelyExplanation: theCase.explanatoryComments?.find(
-        (comment) =>
-          comment.commentType ===
-          CommentType.POSTPONED_INDEFINITELY_EXPLANATION,
-      )?.comment,
     }
   }
 

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
@@ -506,4 +506,9 @@ export class UpdateCaseInput {
   @IsOptional()
   @Field(() => ID, { nullable: true })
   readonly mergeCaseId?: string
+
+  @Allow()
+  @IsOptional()
+  @Field(() => String, { nullable: true })
+  readonly civilDemands?: string
 }
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
@@ -453,4 +453,7 @@ export class Case {
 
   @Field(() => [Case], { nullable: true })
   readonly mergedCases?: Case[]
+
+  @Field(() => String, { nullable: true })
+  readonly civilDemands?: string
 }
diff --git a/apps/judicial-system/backend/migrations/20240909194458-rename-explanatory-comment.js b/apps/judicial-system/backend/migrations/20240909194458-rename-explanatory-comment.js
@@ -0,0 +1,50 @@
+'use strict'
+
+module.exports = {
+  async up(queryInterface) {
+    return queryInterface.sequelize.transaction(async (transaction) =>
+      queryInterface
+        .renameTable('explanatory_comment', 'case_string', {
+          transaction,
+        })
+        .then(() =>
+          Promise.all([
+            queryInterface.renameColumn(
+              'case_string',
+              'comment_type',
+              'string_type',
+              { transaction },
+            ),
+            queryInterface.renameColumn('case_string', 'comment', 'value', {
+              transaction,
+            }),
+          ]),
+        ),
+    )
+  },
+
+  async down(queryInterface) {
+    return queryInterface.sequelize.transaction(async (transaction) =>
+      queryInterface
+        .renameTable('case_string', 'explanatory_comment', {
+          transaction,
+        })
+        .then(() =>
+          Promise.all([
+            queryInterface.renameColumn(
+              'explanatory_comment',
+              'string_type',
+              'comment_type',
+              { transaction },
+            ),
+            queryInterface.renameColumn(
+              'explanatory_comment',
+              'value',
+              'comment',
+              { transaction },
+            ),
+          ]),
+        ),
+    )
+  },
+}
diff --git a/apps/judicial-system/backend/src/app/formatters/indictmentPdf.ts b/apps/judicial-system/backend/src/app/formatters/indictmentPdf.ts
@@ -8,6 +8,7 @@ import { formatDate, lowercase } from '@island.is/judicial-system/formatters'
 import { nowFactory } from '../factories'
 import { indictment } from '../messages'
 import { Case } from '../modules/case'
+import { CaseString } from '../modules/case/models/caseString.model'
 import {
   addEmptyLines,
   addGiganticHeading,
@@ -69,18 +70,15 @@ export const createIndictment = async (
 
   doc.on('data', (chunk) => sinc.push(chunk))
 
-  const title = formatMessage(indictment.title)
-  const heading = formatMessage(indictment.heading)
-
-  setTitle(doc, title)
+  setTitle(doc, formatMessage(indictment.title))
 
   if (confirmation) {
     addIndictmentConfirmation(doc, confirmation)
   }
 
   addEmptyLines(doc, 6, doc.page.margins.left)
 
-  addGiganticHeading(doc, heading, 'Times-Roman')
+  addGiganticHeading(doc, formatMessage(indictment.heading), 'Times-Roman')
   addNormalPlusText(doc, ' ')
   setLineCap(2)
   addNormalPlusText(doc, theCase.indictmentIntroduction ?? '')
@@ -103,6 +101,15 @@ export const createIndictment = async (
 
   addEmptyLines(doc, 2)
   addNormalPlusJustifiedText(doc, theCase.demands ?? '')
+
+  const civilDemands = CaseString.civilDemands(theCase.caseStrings)
+
+  if (civilDemands) {
+    addEmptyLines(doc, 2)
+    addNormalPlusText(doc, formatMessage(indictment.civilDemandsHeading))
+    addNormalPlusJustifiedText(doc, civilDemands)
+  }
+
   addEmptyLines(doc, 2)
   addNormalPlusCenteredText(
     doc,

diff --git a/apps/judicial-system/backend/src/app/messages/pdfIndictment.ts b/apps/judicial-system/backend/src/app/messages/pdfIndictment.ts
@@ -17,4 +17,9 @@ export const indictment = defineMessages({
     defaultMessage: 'ÁKÆRA',
     description: 'Notaður sem heading á ákæru PDF',
   },
+  civilDemandsHeading: {
+    id: 'judicial.system.backend:pdf.indictment.civil_demands_heading',
+    defaultMessage: 'Einkaréttarkrafa:',
+    description: 'Notaður sem titill á einkaréttarkröfu í ákæru PDF',
+  },
 })
diff --git a/apps/judicial-system/backend/src/app/modules/case/case.controller.ts b/apps/judicial-system/backend/src/app/modules/case/case.controller.ts
@@ -99,6 +99,10 @@ import {
   prosecutorUpdateRule,
   publicProsecutorStaffUpdateRule,
 } from './guards/rolesRules'
+import {
+  CaseInterceptor,
+  CasesInterceptor,
+} from './interceptors/case.interceptor'
 import { CaseListInterceptor } from './interceptors/caseList.interceptor'
 import { CompletedAppealAccessedInterceptor } from './interceptors/completedAppealAccessed.interceptor'
 import { Case } from './models/case.model'
@@ -140,6 +144,7 @@ export class CaseController {
 
   @UseGuards(JwtAuthGuard, RolesGuard)
   @RolesRules(prosecutorRule, prosecutorRepresentativeRule)
+  @UseInterceptors(CaseInterceptor)
   @Post('case')
   @ApiCreatedResponse({ type: Case, description: 'Creates a new case' })
   async create(
@@ -167,6 +172,7 @@ export class CaseController {
     courtOfAppealsAssistantUpdateRule,
     publicProsecutorStaffUpdateRule,
   )
+  @UseInterceptors(CaseInterceptor)
   @Patch('case/:caseId')
   @ApiOkResponse({ type: Case, description: 'Updates an existing case' })
   async update(
@@ -284,6 +290,7 @@ export class CaseController {
     courtOfAppealsRegistrarTransitionRule,
     courtOfAppealsAssistantTransitionRule,
   )
+  @UseInterceptors(CaseInterceptor)
   @Patch('case/:caseId/state')
   @ApiOkResponse({
     type: Case,
@@ -438,13 +445,13 @@ export class CaseController {
     prisonSystemStaffRule,
     defenderRule,
   )
+  @UseInterceptors(CaseListInterceptor)
   @Get('cases')
   @ApiOkResponse({
     type: Case,
     isArray: true,
     description: 'Gets all existing cases',
   })
-  @UseInterceptors(CaseListInterceptor)
   getAll(@CurrentHttpUser() user: User): Promise<Case[]> {
     this.logger.debug('Getting all cases')
 
@@ -463,9 +470,9 @@ export class CaseController {
     courtOfAppealsRegistrarRule,
     courtOfAppealsAssistantRule,
   )
+  @UseInterceptors(CompletedAppealAccessedInterceptor, CaseInterceptor)
   @Get('case/:caseId')
   @ApiOkResponse({ type: Case, description: 'Gets an existing case' })
-  @UseInterceptors(CompletedAppealAccessedInterceptor)
   getById(@Param('caseId') caseId: string, @CurrentCase() theCase: Case): Case {
     this.logger.debug(`Getting case ${caseId} by id`)
 
@@ -478,6 +485,7 @@ export class CaseController {
     districtCourtRegistrarRule,
     districtCourtAssistantRule,
   )
+  @UseInterceptors(CasesInterceptor)
   @Get('case/:caseId/connectedCases')
   @ApiOkResponse({ type: [Case], description: 'Gets all connected cases' })
   async getConnectedCases(
@@ -872,6 +880,7 @@ export class CaseController {
     CaseReadGuard,
   )
   @RolesRules(prosecutorRule)
+  @UseInterceptors(CaseInterceptor)
   @Post('case/:caseId/extend')
   @ApiCreatedResponse({
     type: Case,
@@ -901,6 +910,7 @@ export class CaseController {
     districtCourtRegistrarRule,
     districtCourtAssistantRule,
   )
+  @UseInterceptors(CaseInterceptor)
   @Post('case/:caseId/court')
   @ApiCreatedResponse({
     type: Case,

diff --git a/apps/judicial-system/backend/src/app/modules/case/case.module.ts b/apps/judicial-system/backend/src/app/modules/case/case.module.ts
@@ -19,8 +19,8 @@ import {
 } from '../index'
 import { Case } from './models/case.model'
 import { CaseArchive } from './models/caseArchive.model'
+import { CaseString } from './models/caseString.model'
 import { DateLog } from './models/dateLog.model'
-import { ExplanatoryComment } from './models/explanatoryComment.model'
 import { CaseController } from './case.controller'
 import { CaseService } from './case.service'
 import { InternalCaseController } from './internalCase.controller'
@@ -43,12 +43,7 @@ import { PdfService } from './pdf.service'
     forwardRef(() => EventModule),
     forwardRef(() => PoliceModule),
     forwardRef(() => EventLogModule),
-    SequelizeModule.forFeature([
-      Case,
-      CaseArchive,
-      DateLog,
-      ExplanatoryComment,
-    ]),
+    SequelizeModule.forFeature([Case, CaseArchive, DateLog, CaseString]),
   ],
   providers: [
     CaseService,