Merge branch 'main' into feat/app-disable-dark-mode

.eslintrc.json

@@ -311,6 +311,11 @@
           {
             "selector": "enumMember",
             "format": ["camelCase", "UPPER_CASE", "PascalCase"]
+          },
+          {
+            "selector": "import",
+            "leadingUnderscore": "allow",
+            "format": ["camelCase", "PascalCase"]
           }
         ],
         "@typescript-eslint/no-empty-interface": [

.github/actions/get-cache/action.yml

@@ -34,8 +34,11 @@ runs:
         ENABLE_CACHE: ${{ inputs.enable-cache }}
         NODE_OPTIONS: --max-old-space-size=8192
       run: |
-        echo $_CACHE_KEYS
+        # This is because of a weird bug where Github would write as root to .cache
+        export COREPACK_HOME=/github/home/.corepack-cache
+        export CYPRESS_CACHE_FOLDER=/github/home/.cypress-cache
+        echo "COREPACK_HOME=$COREPACK_HOME" >> $GITHUB_ENV
+        echo "CYPRESS_CACHE_FOLDER=$CYPRESS_CACHE_FOLDER" >> $GITHUB_ENV
         cd scripts/ci/cache
-        yarn install --immutable
+        npx yarn install --immutable
         node cache-action.mjs
-        echo $_CACHE_KEYS

.github/workflows/config-values.yaml

@@ -74,7 +74,7 @@ jobs:
         uses: ./.github/actions/cache
         with:
           path: infra/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('infra/yarn.lock') }}-infra
+          key: ${{ runner.os }}-${{ hashFiles('infra/yarn.lock') }}-infra-2
 
       - name: Check cache success
         run: '[[ "${{ steps.node-modules.outputs.success }}" != "false" ]] || exit 1'
@@ -94,7 +94,7 @@ jobs:
       - name: Commit any changes to charts
         if: ${{ github.event_name == 'pull_request' }}
         run: |
-          yarn --cwd infra charts
+          (cd infra && yarn charts)
           ./infra/scripts/ci/git-check-dirty.sh "charts/" "charts" "dirtybot"
 
   check-secrets:

.github/workflows/datadog-analysis.yml

@@ -0,0 +1,44 @@
+name: Datadog Static Analysis
+on:
+  push:
+    branches:
+      - 'main'
+      - 'release/**'
+      - 'pre-release/**'
+    paths-ignore:
+      - '**/*.md'
+  workflow_dispatch:
+  create:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  static-analysis:
+    runs-on: ec2-runners
+    container:
+      image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
+    name: Datadog Static Analyzer
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Check code meets quality and security standards
+        id: datadog-static-analysis
+        uses: DataDog/datadog-static-analyzer-github-action@v1
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+          dd_app_key: ${{ secrets.DD_APP_KEY }}
+          dd_service: islandis
+          dd_env: ci
+          dd_site: datadoghq.eu
+          cpu_count: 2
+      - name: Check imported libraries are secure and compliant
+        id: datadog-software-composition-analysis
+        uses: DataDog/datadog-sca-github-action@main
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+          dd_app_key: ${{ secrets.DD_APP_KEY }}
+          dd_service: islandis
+          dd_env: ci
+          dd_site: datadoghq.eu

.github/workflows/push.yml

@@ -259,7 +259,7 @@ jobs:
             echo "SHA='$SHA', retrived from action environment"
           fi
           echo "Using SHA='$SHA' as docker tag sha"
-          export DOCKER_TAG=${DOCKER_BRANCH_TAG}_${SHA:0:7}_${GITHUB_RUN_NUMBER}
+          export DOCKER_TAG=${DOCKER_BRANCH_TAG}_${SHA}_${GITHUB_RUN_NUMBER}
           echo "Docker tag will be ${DOCKER_TAG}"
           echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_OUTPUT
           echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV

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

@@ -447,4 +447,10 @@ export class Case {
 
   @Field(() => String, { nullable: true })
   readonly indictmentCompletedDate?: string
+
+  @Field(() => Case, { nullable: true })
+  readonly mergeCase?: Case
+
+  @Field(() => [Case], { nullable: true })
+  readonly mergedCases?: Case[]
 }

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

@@ -73,9 +73,6 @@ export class Defendant {
   @Field(() => DefenderChoice, { nullable: true })
   readonly defenderChoice?: DefenderChoice
 
-  @Field(() => Boolean, { nullable: true })
-  readonly acceptCompensationClaim?: boolean
-
   @Field(() => SubpoenaType, { nullable: true })
   readonly subpoenaType?: SubpoenaType
 }

apps/judicial-system/backend/migrations/20240706153647-update-case.js

@@ -0,0 +1,29 @@
+'use strict'
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.addColumn(
+        'case',
+        'merge_case_id',
+        {
+          type: Sequelize.UUID,
+          references: {
+            model: 'case',
+            key: 'id',
+          },
+          allowNull: true,
+        },
+        { transaction: t },
+      ),
+    )
+  },
+
+  down: (queryInterface) => {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.removeColumn('case', 'merge_case_id', {
+        transaction: t,
+      }),
+    )
+  },
+}

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

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

apps/judicial-system/backend/src/app/formatters/courtRecord.spec.ts

@@ -9,9 +9,8 @@ describe('formatCourtEndDate', () => {
     onError: jest.fn,
   }).formatMessage
 
-  function fn(startDate?: Date, endDate?: Date) {
-    return formatCourtEndDate(formatMessage, startDate, endDate)
-  }
+  const fn = (startDate?: Date, endDate?: Date) =>
+    formatCourtEndDate(formatMessage, startDate, endDate)
 
   test('should return court still in progress', () => {
     const startDate = undefined

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

@@ -84,7 +84,6 @@ import {
   courtOfAppealsRegistrarUpdateRule,
   districtCourtAssistantTransitionRule,
   districtCourtAssistantUpdateRule,
-  districtCourtJudgeSignRulingRule,
   districtCourtJudgeTransitionRule,
   districtCourtJudgeUpdateRule,
   districtCourtRegistrarTransitionRule,
@@ -765,7 +764,7 @@ export class CaseController {
     new CaseTypeGuard([...restrictionCases, ...investigationCases]),
     CaseWriteGuard,
   )
-  @RolesRules(districtCourtJudgeSignRulingRule)
+  @RolesRules(districtCourtJudgeRule)
   @Post('case/:caseId/ruling/signature')
   @ApiCreatedResponse({
     type: SigningServiceResponse,
@@ -778,6 +777,12 @@ export class CaseController {
   ): Promise<SigningServiceResponse> {
     this.logger.debug(`Requesting a signature for the ruling of case ${caseId}`)
 
+    if (user.id !== theCase.judgeId) {
+      throw new ForbiddenException(
+        'A ruling must be signed by the assigned judge',
+      )
+    }
+
     return this.caseService.requestRulingSignature(theCase).catch((error) => {
       if (error instanceof DokobitError) {
         throw new HttpException(
@@ -802,7 +807,7 @@ export class CaseController {
     new CaseTypeGuard([...restrictionCases, ...investigationCases]),
     CaseWriteGuard,
   )
-  @RolesRules(districtCourtJudgeSignRulingRule)
+  @RolesRules(districtCourtJudgeRule)
   @Get('case/:caseId/ruling/signature')
   @ApiOkResponse({
     type: SignatureConfirmationResponse,
@@ -817,6 +822,12 @@ export class CaseController {
   ): Promise<SignatureConfirmationResponse> {
     this.logger.debug(`Confirming a signature for the ruling of case ${caseId}`)
 
+    if (user.id !== theCase.judgeId) {
+      throw new ForbiddenException(
+        'A ruling must be signed by the assigned judge',
+      )
+    }
+
     return this.caseService.getRulingSignatureConfirmation(
       theCase,
       user,

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

@@ -299,6 +299,8 @@ export const include: Includeable[] = [
     where: { commentType: { [Op.in]: commentTypes } },
   },
   { model: Notification, as: 'notifications' },
+  { model: Case, as: 'mergeCase' },
+  { model: Case, as: 'mergedCases', separate: true },
 ]
 
 export const order: OrderItem[] = [

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

@@ -656,12 +656,12 @@ export class InternalCaseService {
       theCase.judge?.nationalId === nationalId
         ? {
             name: theCase.judge?.name,
-            role: UserRole.DISTRICT_COURT_JUDGE,
+            role: theCase.judge?.role,
           }
         : theCase.registrar?.nationalId === nationalId
         ? {
             name: theCase.registrar?.name,
-            role: UserRole.DISTRICT_COURT_REGISTRAR,
+            role: theCase.registrar?.role,
           }
         : {}
 

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

@@ -1045,4 +1045,26 @@ export class Case extends Model {
   })
   @ApiPropertyOptional({ enum: CourtSessionType })
   courtSessionType?: CourtSessionType
+
+  /**********
+   * The surrogate key of the case an indictment was merged in to - only used if the has been merged
+   **********/
+  @ForeignKey(() => Case)
+  @Column({ type: DataType.UUID, allowNull: true })
+  @ApiPropertyOptional({ type: String })
+  mergeCaseId?: string
+
+  /**********
+   * The case this was merged in to - only used if the case was merged
+   **********/
+  @BelongsTo(() => Case, 'mergeCaseId')
+  @ApiPropertyOptional({ type: () => Case })
+  mergeCase?: Case
+
+  // /**********
+  //  * The cases that have been merged in to the current case - only used if the case was merged
+  //  **********/
+  @HasMany(() => Case, 'mergeCaseId')
+  @ApiPropertyOptional({ type: () => Case })
+  mergedCases?: Case[]
 }

apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmationRolesRules.spec.ts

@@ -1,6 +1,5 @@
+import { districtCourtJudgeRule } from '../../../../guards'
 import { CaseController } from '../../case.controller'
-import { districtCourtJudgeSignRulingRule } from '../../guards/rolesRules'
-
 describe('CaseController - Get ruling signature confirmation rules', () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let rules: any[]
@@ -14,6 +13,6 @@ describe('CaseController - Get ruling signature confirmation rules', () => {
 
   it('should give permission to one roles', () => {
     expect(rules).toHaveLength(1)
-    expect(rules).toContain(districtCourtJudgeSignRulingRule)
+    expect(rules).toContain(districtCourtJudgeRule)
   })
 })

apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignatureRolesRules.spec.ts

@@ -1,6 +1,5 @@
+import { districtCourtJudgeRule } from '../../../../guards'
 import { CaseController } from '../../case.controller'
-import { districtCourtJudgeSignRulingRule } from '../../guards/rolesRules'
-
 describe('CaseController - Request ruling signature rules', () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let rules: any[]
@@ -14,6 +13,6 @@ describe('CaseController - Request ruling signature rules', () => {
 
   it('should give permission to one roles', () => {
     expect(rules).toHaveLength(1)
-    expect(rules).toContain(districtCourtJudgeSignRulingRule)
+    expect(rules).toContain(districtCourtJudgeRule)
   })
 })

apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentAssignedRolesToCourt.spec.ts

@@ -30,7 +30,11 @@ describe('InternalCaseController - Deliver assigned roles for indictment case to
     type: CaseType.INDICTMENT,
     court: { name: courtName },
     courtCaseNumber,
-    judge: { name: 'Test Dómari', nationalId: '0101010101' },
+    judge: {
+      name: 'Test Dómari',
+      nationalId: '0101010101',
+      role: UserRole.DISTRICT_COURT_JUDGE,
+    },
     registrar: { name: 'Test Ritari', nationalId: '0202020202' },
   } as Case
 

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

@@ -89,11 +89,6 @@ export class UpdateDefendantDto {
   @ApiPropertyOptional({ type: Date })
   readonly verdictViewDate?: Date
 
-  @IsOptional()
-  @IsBoolean()
-  @ApiPropertyOptional({ type: Boolean })
-  readonly acceptCompensationClaim?: boolean
-
   @IsOptional()
   @IsEnum(SubpoenaType)
   @ApiPropertyOptional({ enum: SubpoenaType })

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

@@ -65,8 +65,7 @@ export class InternalDefendantController {
   @Patch('defense/:defendantNationalId')
   @ApiOkResponse({
     type: Defendant,
-    description:
-      'Assigns defense choice and compensation claim decision to defendant',
+    description: 'Assigns defense choice to defendant',
   })
   async assignDefender(
     @Param('caseId') caseId: string,

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

@@ -124,10 +124,6 @@ export class Defendant extends Model {
   @ApiPropertyOptional({ type: Date })
   verdictViewDate?: Date
 
-  @Column({ type: DataType.BOOLEAN, allowNull: true })
-  @ApiPropertyOptional({ type: Boolean })
-  acceptCompensationClaim?: boolean
-
   @Column({
     type: DataType.ENUM,
     allowNull: true,

apps/judicial-system/digital-mailbox-api/src/app/modules/cases/dto/subpoena.dto.ts

@@ -20,9 +20,4 @@ export class UpdateSubpoenaDto {
   @IsString()
   @ApiProperty({ type: String, required: false })
   defenderNationalId?: string
-
-  @IsOptional()
-  @IsBoolean()
-  @ApiProperty({ type: Boolean, required: false })
-  acceptCompensationClaim?: boolean
 }

apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/internal/internalCase.response.ts

@@ -28,7 +28,6 @@ interface Defendant {
   defenderEmail?: string
   defenderPhoneNumber?: string
   defenderChoice?: DefenderChoice
-  acceptCompensationClaim?: boolean
 }
 
 interface DateLog {