Merge branch 'main' into feat/skilavottord-handle-unregister-vehicles

island-is · Sep 9, 2024 · 8018de0 · 8018de0
2 parents 0ffdfc3 + 3aa0c69
commit 8018de0
Show file tree

Hide file tree

Showing 337 changed files with 12,232 additions and 5,018 deletions.
diff --git a/apps/api/infra/api.ts b/apps/api/infra/api.ts
@@ -47,6 +47,8 @@ import {
   OfficialJournalOfIceland,
   OfficialJournalOfIcelandApplication,
   Frigg,
+  HealthDirectorateOrganDonation,
+  HealthDirectorateVaccination,
 } from '../../../infra/src/dsl/xroad'
 
 export const serviceSetup = (services: {
@@ -427,6 +429,8 @@ export const serviceSetup = (services: {
       OfficialJournalOfIceland,
       OfficialJournalOfIcelandApplication,
       Frigg,
+      HealthDirectorateOrganDonation,
+      HealthDirectorateVaccination,
     )
     .files({ filename: 'islyklar.p12', env: 'ISLYKILL_CERT' })
     .ingress({

diff --git a/apps/judicial-system/api/src/app/modules/case-list/interceptors/caseList.interceptor.ts b/apps/judicial-system/api/src/app/modules/case-list/interceptors/caseList.interceptor.ts
@@ -8,6 +8,8 @@ import {
   NestInterceptor,
 } from '@nestjs/common'
 
+import { isRequestCase } from '@island.is/judicial-system/types'
+
 import { getIndictmentInfo } from '../../case/interceptors/case.transformer'
 import { CaseListEntry } from '../models/caseList.model'
 
@@ -27,21 +29,28 @@ export class CaseListInterceptor implements NestInterceptor {
     return next.handle().pipe(
       map((cases: CaseListEntry[]) => {
         return cases.map((theCase) => {
+          if (isRequestCase(theCase.type)) {
+            return {
+              ...theCase,
+              isValidToDateInThePast: theCase.validToDate
+                ? Date.now() > new Date(theCase.validToDate).getTime()
+                : theCase.isValidToDateInThePast,
+              appealedDate: getAppealedDate(
+                theCase.prosecutorPostponedAppealDate,
+                theCase.accusedPostponedAppealDate,
+              ),
+            }
+          }
+
           const indictmentInfo = getIndictmentInfo(
+            theCase.indictmentRulingDecision,
             theCase.rulingDate,
-            theCase.type,
             theCase.defendants,
             theCase.eventLogs,
           )
+
           return {
             ...theCase,
-            isValidToDateInThePast: theCase.validToDate
-              ? Date.now() > new Date(theCase.validToDate).getTime()
-              : theCase.isValidToDateInThePast,
-            appealedDate: getAppealedDate(
-              theCase.prosecutorPostponedAppealDate,
-              theCase.accusedPostponedAppealDate,
-            ),
             ...indictmentInfo,
           }
         })

diff --git a/apps/judicial-system/api/src/app/modules/case-list/models/caseList.model.ts b/apps/judicial-system/api/src/app/modules/case-list/models/caseList.model.ts
@@ -122,8 +122,8 @@ export class CaseListEntry {
   @Field(() => Boolean, { nullable: true })
   readonly indictmentVerdictViewedByAll?: boolean
 
-  @Field(() => String, { nullable: true })
-  readonly indictmentVerdictAppealDeadline?: string
+  @Field(() => Boolean, { nullable: true })
+  readonly indictmentVerdictAppealDeadlineExpired?: boolean
 
   @Field(() => IndictmentDecision, { nullable: true })
   readonly indictmentDecision?: IndictmentDecision