chore(j-s): Remove feature flag for combo indictments

apps/judicial-system/api/infra/judicial-system-api.ts

@@ -47,8 +47,8 @@ export const serviceSetup = (services: {
       },
       HIDDEN_FEATURES: {
         dev: '',
-        staging: 'MULTIPLE_INDICTMENT_SUBTYPES',
-        prod: 'MULTIPLE_INDICTMENT_SUBTYPES',
+        staging: '',
+        prod: '',
       },
     })
     .secrets({

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

@@ -16,7 +16,7 @@ module.exports = {
       ]),
     )
   },
-  async down(queryInterface, Sequelize) {
+  async down(queryInterface) {
     return queryInterface.sequelize.transaction((t) =>
       queryInterface.removeColumn('defendant', 'punishment_type', {
         transaction: t,

apps/judicial-system/backend/src/app/formatters/confirmedPdf.ts

@@ -12,14 +12,12 @@ import {
 import { PDFKitCoatOfArms } from './PDFKitCoatOfArms'
 
 type ConfirmableCaseFileCategories =
-  | CaseFileCategory.INDICTMENT
   | CaseFileCategory.RULING
   | CaseFileCategory.COURT_RECORD
 
 // Colors
 const lightGray = rgb(0.9804, 0.9804, 0.9804)
 const darkGray = rgb(0.7961, 0.7961, 0.7961)
-const gold = rgb(0.6784, 0.6392, 0.451)
 const white = rgb(1, 1, 1)
 
 // Spacing
@@ -29,175 +27,6 @@ const coatOfArmsWidth = calculatePt(105)
 const confirmedByHeight = calculatePt(50)
 const titleX = coatOfArmsX + coatOfArmsWidth + calculatePt(8)
 
-const createIndictmentConfirmation = async (
-  confirmation: Confirmation,
-  pdfDoc: PDFDocument,
-) => {
-  const pages = pdfDoc.getPages()
-  const doc = pages[0]
-
-  const shadowHeight = calculatePt(90)
-  const { width, height } = doc.getSize()
-  const titleHeight = calculatePt(32)
-  const titleWidth = width - coatOfArmsWidth - 2 * coatOfArmsX
-  const confirmedByWidth = calculatePt(258)
-  const institutionWidth = confirmedByWidth + calculatePt(48)
-
-  // Draw the shadow
-  doc.drawRectangle({
-    x: pageMargin,
-    y: height - shadowHeight - pageMargin,
-    width: doc.getWidth() - 2 * pageMargin - calculatePt(16),
-    height: shadowHeight,
-    color: lightGray,
-  })
-
-  // Draw the box around the coat of arms
-  doc.drawRectangle({
-    x: coatOfArmsX,
-    y: height - shadowHeight - pageMargin + calculatePt(8),
-    width: coatOfArmsWidth,
-    height: shadowHeight,
-    color: rgb(1, 1, 1),
-    borderColor: darkGray,
-    borderWidth: 1,
-  })
-
-  PDFKitCoatOfArms(doc, height)
-
-  doc.drawRectangle({
-    x: coatOfArmsX + coatOfArmsWidth,
-    y: height - pageMargin - titleHeight + calculatePt(8),
-    width: titleWidth,
-    height: titleHeight,
-    color: lightGray,
-    borderColor: darkGray,
-    borderWidth: 1,
-  })
-
-  const timesRomanFont = await pdfDoc.embedFont(StandardFonts.TimesRoman)
-  const timesRomanBoldFont = await pdfDoc.embedFont(
-    StandardFonts.TimesRomanBold,
-  )
-  doc.drawText('Réttarvörslugátt', {
-    x: titleX,
-    y: height - pageMargin - titleHeight + calculatePt(20),
-    size: calculatePt(smallFontSize),
-    font: timesRomanBoldFont,
-  })
-
-  doc.drawText('Skjal samþykkt rafrænt', {
-    x: 158,
-    y: height - pageMargin - titleHeight + calculatePt(20),
-    size: calculatePt(smallFontSize),
-    font: timesRomanFont,
-  })
-
-  doc.drawSvgPath(
-    'M0.763563 11.8047H7.57201C7.85402 11.8047 8.08264 11.5761 8.08264 11.2941V5.50692C8.08264 5.22492 7.85402 4.99629 7.57201 4.99629H7.06138V3.46439C7.06138 1.86887 5.76331 0.570801 4.16779 0.570801C2.57226 0.570801 1.2742 1.86887 1.2742 3.46439V4.99629H0.763563C0.481557 4.99629 0.25293 5.22492 0.25293 5.50692V11.2941C0.25293 11.5761 0.481557 11.8047 0.763563 11.8047ZM5.61394 8.03817L4.16714 9.48496C4.06743 9.58467 3.93674 9.63455 3.80609 9.63455C3.67543 9.63455 3.54471 9.58467 3.44504 9.48496L2.72164 8.76157C2.52222 8.56215 2.52222 8.23888 2.72164 8.03943C2.92102 7.84001 3.24436 7.84001 3.44378 8.03943L3.80612 8.40174L4.89187 7.31603C5.09125 7.11661 5.41458 7.11661 5.614 7.31603C5.81339 7.51549 5.81339 7.83875 5.61394 8.03817ZM2.29546 3.46439C2.29546 2.43199 3.13539 1.59207 4.16779 1.59207C5.20019 1.59207 6.04011 2.43199 6.04011 3.46439V4.99629H2.29546V3.46439Z',
-    {
-      color: gold,
-      x: width - 38,
-      y: height - pageMargin - titleHeight + calculatePt(33),
-    },
-  )
-
-  // Draw the "Confirmed by" box
-  doc.drawRectangle({
-    x: coatOfArmsX + coatOfArmsWidth,
-    y: height - pageMargin - titleHeight - confirmedByHeight,
-    width: confirmedByWidth,
-    height: shadowHeight - titleHeight,
-    color: white,
-    borderColor: darkGray,
-    borderWidth: 1,
-  })
-
-  doc.drawText('Staðfestingaraðili', {
-    x: titleX,
-    y: height - pageMargin - titleHeight - calculatePt(15),
-    size: calculatePt(smallFontSize),
-    font: timesRomanBoldFont,
-  })
-
-  if (confirmation?.actor) {
-    timesRomanFont.widthOfTextAtSize(
-      `${confirmation.actor}${
-        confirmation.title ? `, ${lowercase(confirmation.title)}` : ''
-      }`,
-      calculatePt(smallFontSize),
-    )
-    drawTextWithEllipsisPDFKit(
-      doc,
-      `${confirmation.actor}${
-        confirmation.title ? `, ${lowercase(confirmation.title)}` : ''
-      }`,
-      { type: timesRomanFont, size: calculatePt(smallFontSize) },
-      titleX,
-      height - pageMargin - titleHeight - calculatePt(29),
-      confirmedByWidth - 16,
-    )
-  }
-
-  // Draw the "Institution" box
-  doc.drawRectangle({
-    x: coatOfArmsX + coatOfArmsWidth + confirmedByWidth,
-    y: height - pageMargin - titleHeight - confirmedByHeight,
-    width: institutionWidth,
-    height: shadowHeight - titleHeight,
-    color: white,
-    borderColor: darkGray,
-    borderWidth: 1,
-  })
-
-  doc.drawText('Embætti', {
-    x: titleX + confirmedByWidth,
-    y: height - pageMargin - titleHeight - calculatePt(15),
-    size: calculatePt(smallFontSize),
-    font: timesRomanBoldFont,
-  })
-
-  if (confirmation?.institution) {
-    doc.drawText(confirmation.institution, {
-      x: titleX + confirmedByWidth,
-      y: height - pageMargin - titleHeight - calculatePt(29),
-      font: timesRomanFont,
-      size: calculatePt(smallFontSize),
-    })
-  }
-
-  // Draw the "Indictment date" box
-  doc.drawRectangle({
-    x: width - 90,
-    y: height - pageMargin - titleHeight - confirmedByHeight,
-    width: 70,
-    height: shadowHeight - titleHeight,
-    color: white,
-    borderColor: darkGray,
-    borderWidth: 1,
-  })
-
-  doc.drawText('Útgáfa ákæru', {
-    x: width - 72,
-    y: height - pageMargin - titleHeight - calculatePt(15),
-    size: calculatePt(smallFontSize),
-    font: timesRomanBoldFont,
-  })
-
-  if (confirmation?.date) {
-    const dateFormattedDate = formatDate(confirmation.date)
-
-    if (dateFormattedDate) {
-      doc.drawText(dateFormattedDate, {
-        x: width - 62,
-        y: height - pageMargin - titleHeight - calculatePt(29),
-        font: timesRomanFont,
-        size: calculatePt(smallFontSize),
-      })
-    }
-  }
-}
-
 const createRulingConfirmation = async (
   confirmation: Confirmation,
   pdfDoc: PDFDocument,
@@ -443,9 +272,6 @@ export const createConfirmedPdf = async (
   const pdfDoc = await PDFDocument.load(pdf)
 
   switch (fileType) {
-    case CaseFileCategory.INDICTMENT:
-      await createIndictmentConfirmation(confirmation, pdfDoc)
-      break
     case CaseFileCategory.RULING: {
       await createRulingConfirmation(confirmation, pdfDoc)
       break

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

@@ -47,7 +47,6 @@ import {
   isIndictmentCase,
   isInvestigationCase,
   isRequestCase,
-  isTrafficViolationCase,
   notificationTypes,
   StringType,
   stringTypes,
@@ -388,7 +387,6 @@ export const include: Includeable[] = [
           state: { [Op.not]: CaseFileState.DELETED },
           category: {
             [Op.in]: [
-              CaseFileCategory.INDICTMENT,
               CaseFileCategory.COURT_RECORD,
               CaseFileCategory.CRIMINAL_RECORD,
               CaseFileCategory.COST_BREAKDOWN,
@@ -819,22 +817,13 @@ export class CaseService {
       }),
     )
 
-    const caseFilesCategories = isTrafficViolationCase(theCase)
-      ? [
-          CaseFileCategory.CRIMINAL_RECORD,
-          CaseFileCategory.COST_BREAKDOWN,
-          CaseFileCategory.CASE_FILE,
-          CaseFileCategory.PROSECUTOR_CASE_FILE,
-          CaseFileCategory.DEFENDANT_CASE_FILE,
-        ]
-      : [
-          CaseFileCategory.INDICTMENT,
-          CaseFileCategory.CRIMINAL_RECORD,
-          CaseFileCategory.COST_BREAKDOWN,
-          CaseFileCategory.CASE_FILE,
-          CaseFileCategory.PROSECUTOR_CASE_FILE,
-          CaseFileCategory.DEFENDANT_CASE_FILE,
-        ]
+    const caseFilesCategories = [
+      CaseFileCategory.CRIMINAL_RECORD,
+      CaseFileCategory.COST_BREAKDOWN,
+      CaseFileCategory.CASE_FILE,
+      CaseFileCategory.PROSECUTOR_CASE_FILE,
+      CaseFileCategory.DEFENDANT_CASE_FILE,
+    ]
 
     const deliverCaseFileToCourtMessages =
       theCase.caseFiles
@@ -856,13 +845,11 @@ export class CaseService {
       deliverCaseFileToCourtMessages,
     )
 
-    if (isTrafficViolationCase(theCase)) {
-      messages.push({
-        type: MessageType.DELIVERY_TO_COURT_INDICTMENT,
-        user,
-        caseId: theCase.id,
-      })
-    }
+    messages.push({
+      type: MessageType.DELIVERY_TO_COURT_INDICTMENT,
+      user,
+      caseId: theCase.id,
+    })
 
     if (theCase.state === CaseState.WAITING_FOR_CANCELLATION) {
       messages.push({
@@ -1854,10 +1841,6 @@ export class CaseService {
   ): Promise<Case | undefined> {
     const receivingCase =
       update.courtCaseNumber && theCase.state === CaseState.SUBMITTED
-    const returningIndictmentCase =
-      isIndictmentCase(theCase.type) &&
-      update.state === CaseState.DRAFT &&
-      theCase.state === CaseState.RECEIVED
     const completingIndictmentCaseWithoutRuling =
       isIndictmentCase(theCase.type) &&
       update.state === CaseState.COMPLETED &&
@@ -1916,13 +1899,6 @@ export class CaseService {
           await this.fileService.resetCaseFileStates(theCase.id, transaction)
         }
 
-        if (returningIndictmentCase) {
-          await this.fileService.resetIndictmentCaseFileHashes(
-            theCase.id,
-            transaction,
-          )
-        }
-
         // Remove uploaded ruling files if an indictment case is completed without a ruling
         if (completingIndictmentCaseWithoutRuling && theCase.caseFiles) {
           await Promise.all(

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

@@ -32,7 +32,6 @@ import {
   isProsecutionUser,
   isRequestCase,
   isRestrictionCase,
-  isTrafficViolationCase,
   NotificationType,
   restrictionCases,
   type User as TUser,
@@ -1051,39 +1050,14 @@ export class InternalCaseService {
     user: TUser,
   ): Promise<DeliverResponse> {
     try {
-      let policeDocuments: PoliceDocument[]
+      const file = await this.pdfService.getIndictmentPdf(theCase)
 
-      if (isTrafficViolationCase(theCase)) {
-        const file = await this.pdfService.getIndictmentPdf(theCase)
-
-        policeDocuments = [
-          {
-            type: PoliceDocumentType.RVAS,
-            courtDocument: Base64.btoa(file.toString('binary')),
-          },
-        ]
-      } else {
-        policeDocuments = await Promise.all(
-          theCase.caseFiles
-            ?.filter(
-              (caseFile) =>
-                caseFile.category === CaseFileCategory.INDICTMENT &&
-                caseFile.key,
-            )
-            .map(async (caseFile) => {
-              // TODO: Tolerate failure, but log error
-              const file = await this.fileService.getCaseFileFromS3(
-                theCase,
-                caseFile,
-              )
-
-              return {
-                type: PoliceDocumentType.RVAS,
-                courtDocument: Base64.btoa(file.toString('binary')),
-              }
-            }) ?? [],
-        )
-      }
+      const policeDocuments = [
+        {
+          type: PoliceDocumentType.RVAS,
+          courtDocument: Base64.btoa(file.toString('binary')),
+        },
+      ]
 
       const delivered = await this.deliverCaseToPoliceWithFiles(
         theCase,

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

@@ -228,7 +228,6 @@ export const include: Includeable[] = [
         CaseFileCategory.APPEAL_RULING,
         CaseFileCategory.APPEAL_COURT_RECORD,
         CaseFileCategory.COURT_RECORD,
-        CaseFileCategory.INDICTMENT,
         CaseFileCategory.CRIMINAL_RECORD,
         CaseFileCategory.COST_BREAKDOWN,
         CaseFileCategory.CASE_FILE,
@@ -277,7 +276,6 @@ export const include: Includeable[] = [
           state: { [Op.not]: CaseFileState.DELETED },
           category: {
             [Op.in]: [
-              CaseFileCategory.INDICTMENT,
               CaseFileCategory.COURT_RECORD,
               CaseFileCategory.CRIMINAL_RECORD,
               CaseFileCategory.COST_BREAKDOWN,

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

@@ -742,7 +742,7 @@ export class Case extends Model {
   crimeScenes?: CrimeSceneMap
 
   /**********
-   * The introduction to a traffic violation case
+   * The introduction to a indictment case
    **********/
   @Column({ type: DataType.TEXT, allowNull: true })
   @ApiPropertyOptional({ type: String })
@@ -1029,7 +1029,6 @@ export class Case extends Model {
 
   /**********
    * The md5 hash of the confirmed generated indictment
-   * Only used for traffic violation cases
    **********/
   @Column({ type: DataType.STRING, allowNull: true })
   @ApiPropertyOptional({ type: String })