fix(j-s): Digital mailbox API

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

@@ -1,4 +1,3 @@
-import { Base } from 'infra/src/dsl/xroad'
 import { Base64 } from 'js-base64'
 import { Includeable, Sequelize } from 'sequelize'
 import { Transaction } from 'sequelize/types'

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

@@ -1,7 +1,10 @@
 import { ApiProperty } from '@nestjs/swagger'
 
 import { formatDate } from '@island.is/judicial-system/formatters'
-import { DateType } from '@island.is/judicial-system/types'
+import {
+  DateType,
+  isSuccessfulServiceStatus,
+} from '@island.is/judicial-system/types'
 
 import { InternalCaseResponse } from './internal/internalCase.response'
 import { Groups } from './shared/groups.model'
@@ -41,7 +44,10 @@ export class CaseResponse {
       caseId: internalCase.id,
       data: {
         caseNumber: `${t.caseNumber} ${internalCase.courtCaseNumber}`,
-        hasBeenServed: subpoenas.length > 0 ? subpoenas[0].acknowledged : false,
+        hasBeenServed:
+          subpoenas.length > 0
+            ? isSuccessfulServiceStatus(subpoenas[0].serviceStatus)
+            : false,
         groups: [
           {
             label: t.defendant,

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

@@ -3,6 +3,7 @@ import {
   DefenderChoice,
   Gender,
   Institution,
+  ServiceStatus,
   User,
 } from '@island.is/judicial-system/types'
 
@@ -42,5 +43,5 @@ interface DateLog {
 interface Subpoena {
   id: string
   subpoenaId: string
-  acknowledged: boolean
+  serviceStatus?: ServiceStatus
 }

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

@@ -6,7 +6,11 @@ import {
   formatDate,
   normalizeAndFormatNationalId,
 } from '@island.is/judicial-system/formatters'
-import { DateType, DefenderChoice } from '@island.is/judicial-system/types'
+import {
+  DateType,
+  DefenderChoice,
+  isSuccessfulServiceStatus,
+} from '@island.is/judicial-system/types'
 
 import { InternalCaseResponse } from './internal/internalCase.response'
 import { Groups } from './shared/groups.model'
@@ -59,6 +63,12 @@ class SubpoenaData {
 
   @ApiProperty({ type: Boolean })
   hasBeenServed?: boolean
+
+  @ApiProperty({ type: Boolean })
+  hasChosenDefender?: boolean
+
+  @ApiProperty({ type: () => String })
+  defaultDefenderChoice?: string
 }
 
 export class SubpoenaResponse {
@@ -88,8 +98,8 @@ export class SubpoenaResponse {
 
     const waivedRight = defendantInfo?.defenderChoice === DefenderChoice.WAIVE
     const hasDefender = defendantInfo?.defenderName !== undefined
-    const subpoena = defendantInfo?.subpoenas ?? []
-    const hasBeenServed = subpoena[0]?.acknowledged ?? false
+    const subpoenas = defendantInfo?.subpoenas ?? []
+    const hasBeenServed = isSuccessfulServiceStatus(subpoenas[0].serviceStatus)
     const canChangeDefenseChoice = !waivedRight && !hasDefender
 
     const subpoenaDateLog = internalCase.dateLogs?.find(
@@ -108,6 +118,12 @@ export class SubpoenaResponse {
         title: t.subpoena,
         subtitle: courtNameAndAddress,
         hasBeenServed: hasBeenServed,
+        hasChosenDefender:
+          defendantInfo?.defenderChoice &&
+          defendantInfo.defenderChoice !== DefenderChoice.DELAY
+            ? true
+            : false,
+        defaultDefenderChoice: DefenderChoice.DELAY,
         alerts: [
           ...(hasBeenServed
             ? [

libs/judicial-system/types/src/index.ts

@@ -7,6 +7,7 @@ export {
   DefendantPlea,
   ServiceRequirement,
   ServiceStatus,
+  isSuccessfulServiceStatus,
 } from './lib/defendant'
 export { InstitutionType } from './lib/institution'
 export { NotificationType } from './lib/notification'

libs/judicial-system/types/src/lib/defendant.ts

@@ -35,3 +35,13 @@ export enum ServiceStatus {
   FAILED = 'FAILED',
   EXPIRED = 'EXPIRED', // If a subpoena expires
 }
+
+export const successfulServiceStatus: string[] = [
+  ServiceStatus.ELECTRONICALLY,
+  ServiceStatus.DEFENDER,
+  ServiceStatus.IN_PERSON,
+]
+
+export const isSuccessfulServiceStatus = (status?: ServiceStatus): boolean => {
+  return Boolean(status && successfulServiceStatus.includes(status))
+}