feat(j-s): Court Session type (#15338)

* Adds court session type to scheduled indictments * Removes unused Contentful string --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Jun 25, 2024 · b7942bd · b7942bd
1 parent b04fa29
commit b7942bd
Show file tree

Hide file tree

Showing 30 changed files with 303 additions and 121 deletions.
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
@@ -8,6 +8,7 @@ import {
   CaseIndictmentRulingDecision,
   CaseState,
   CaseType,
+  CourtSessionType,
   IndictmentCaseReviewDecision,
   IndictmentDecision,
 } from '@island.is/judicial-system/types'
@@ -128,4 +129,7 @@ export class CaseListEntry {
 
   @Field(() => CaseIndictmentRulingDecision, { nullable: true })
   readonly indictmentRulingDecision?: CaseIndictmentRulingDecision
+
+  @Field(() => CourtSessionType, { nullable: true })
+  readonly courtSessionType?: CourtSessionType
 }
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
@@ -24,6 +24,7 @@ import {
   CaseIndictmentRulingDecision,
   CaseLegalProvisions,
   CaseType,
+  CourtSessionType,
   IndictmentCaseReviewDecision,
   IndictmentDecision,
   RequestSharedWithDefender,
@@ -495,4 +496,9 @@ export class UpdateCaseInput {
   @IsOptional()
   @Field(() => IndictmentDecision, { nullable: true })
   readonly indictmentDecision?: IndictmentDecision
+
+  @Allow()
+  @IsOptional()
+  @Field(() => CourtSessionType, { nullable: true })
+  readonly courtSessionType?: CourtSessionType
 }
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
@@ -18,6 +18,7 @@ import {
   CaseState,
   CaseType,
   CourtDocument,
+  CourtSessionType,
   IndictmentCaseReviewDecision,
   IndictmentDecision,
   RequestSharedWithDefender,
@@ -53,6 +54,7 @@ registerEnumType(IndictmentCaseReviewDecision, {
   name: 'IndictmentCaseReviewDecision',
 })
 registerEnumType(IndictmentDecision, { name: 'IndictmentDecision' })
+registerEnumType(CourtSessionType, { name: 'CourtSessionType' })
 
 @ObjectType()
 class DateLog {
@@ -439,4 +441,7 @@ export class Case {
 
   @Field(() => IndictmentDecision, { nullable: true })
   readonly indictmentDecision?: IndictmentDecision
+
+  @Field(() => CourtSessionType, { nullable: true })
+  readonly courtSessionType?: CourtSessionType
 }
diff --git a/apps/judicial-system/backend/migrations/20240623202256-update-case.js b/apps/judicial-system/backend/migrations/20240623202256-update-case.js
@@ -0,0 +1,25 @@
+'use strict'
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((transaction) =>
+      queryInterface.addColumn(
+        'case',
+        'court_session_type',
+        {
+          type: Sequelize.STRING,
+          allowNull: true,
+        },
+        { transaction },
+      ),
+    )
+  },
+
+  async down(queryInterface) {
+    return queryInterface.sequelize.transaction((transaction) =>
+      queryInterface.removeColumn('case', 'court_session_type', {
+        transaction,
+      }),
+    )
+  },
+}
diff --git a/apps/judicial-system/backend/src/app/modules/case/case.service.ts b/apps/judicial-system/backend/src/app/modules/case/case.service.ts
@@ -156,21 +156,24 @@ export interface UpdateCase
     | 'appealIsolationToDate'
     | 'indictmentRulingDecision'
     | 'indictmentReviewerId'
+    | 'indictmentReviewDecision'
+    | 'indictmentDecision'
+    | 'rulingSignatureDate'
+    | 'judgeId'
+    | 'courtSessionType'
   > {
   type?: CaseType
   state?: CaseState
   policeCaseNumbers?: string[]
   defendantWaivesRightToCounsel?: boolean
   rulingDate?: Date | null
-  rulingSignatureDate?: Date | null
   courtCaseNumber?: string | null
   courtRecordSignatoryId?: string | null
   courtRecordSignatureDate?: Date | null
   parentCaseId?: string | null
   arraignmentDate?: UpdateDateLog | null
   courtDate?: UpdateDateLog | null
   postponedIndefinitelyExplanation?: string | null
-  judgeId?: string | null
   indictmentReturnedExplanation?: string | null
   indictmentDeniedExplanation?: string | null
   indictmentHash?: string | null

diff --git a/apps/judicial-system/backend/src/app/modules/case/dto/updateCase.dto.ts b/apps/judicial-system/backend/src/app/modules/case/dto/updateCase.dto.ts
@@ -27,6 +27,7 @@ import {
   CaseLegalProvisions,
   CaseType,
   CourtDocument,
+  CourtSessionType,
   IndictmentCaseReviewDecision,
   IndictmentDecision,
   RequestSharedWithDefender,
@@ -502,4 +503,9 @@ export class UpdateCaseDto {
   @IsEnum(IndictmentDecision)
   @ApiPropertyOptional({ enum: IndictmentDecision })
   readonly indictmentDecision?: IndictmentDecision
+
+  @IsOptional()
+  @IsEnum(CourtSessionType)
+  @ApiPropertyOptional({ enum: CourtSessionType })
+  readonly courtSessionType?: CourtSessionType
 }
diff --git a/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts b/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts
@@ -92,6 +92,7 @@ const districtCourtFields: (keyof UpdateCaseDto)[] = [
   'postponedIndefinitelyExplanation',
   'indictmentRulingDecision',
   'indictmentDecision',
+  'courtSessionType',
 ]
 
 const courtOfAppealsFields: (keyof UpdateCaseDto)[] = [

diff --git a/apps/judicial-system/backend/src/app/modules/case/interceptors/caseList.interceptor.ts b/apps/judicial-system/backend/src/app/modules/case/interceptors/caseList.interceptor.ts
@@ -64,6 +64,7 @@ export class CaseListInterceptor implements NestInterceptor {
             indictmentReviewDecision: theCase.indictmentReviewDecision,
             indictmentDecision: theCase.indictmentDecision,
             indictmentRulingDecision: theCase.indictmentRulingDecision,
+            courtSessionType: theCase.courtSessionType,
           }
         }),
       ),

diff --git a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts
@@ -103,6 +103,7 @@ export const attributes: (keyof Case)[] = [
   'indictmentDecision',
   'indictmentRulingDecision',
   'indictmentHash',
+  'courtSessionType',
 ]
 
 export interface LimitedAccessUpdateCase

diff --git a/apps/judicial-system/backend/src/app/modules/case/models/case.model.ts b/apps/judicial-system/backend/src/app/modules/case/models/case.model.ts
@@ -29,6 +29,7 @@ import {
   CaseState,
   CaseType,
   CourtDocument,
+  CourtSessionType,
   IndictmentCaseReviewDecision,
   IndictmentDecision,
   RequestSharedWithDefender,
@@ -1033,4 +1034,15 @@ export class Case extends Model {
   @Column({ type: DataType.STRING, allowNull: true })
   @ApiPropertyOptional({ type: String })
   indictmentHash?: string
+
+  /**********
+   * The court session type in indictment cases - example: MAIN_HEARING
+   **********/
+  @Column({
+    type: DataType.ENUM,
+    allowNull: true,
+    values: Object.values(CourtSessionType),
+  })
+  @ApiPropertyOptional({ enum: CourtSessionType })
+  courtSessionType?: CourtSessionType
 }
diff --git a/apps/judicial-system/web/src/components/FormProvider/case.graphql b/apps/judicial-system/web/src/components/FormProvider/case.graphql
@@ -266,5 +266,6 @@ query Case($input: CaseQueryInput!) {
     indictmentVerdictAppealDeadline
     indictmentDecision
     indictmentReviewDecision
+    courtSessionType
   }
 }
diff --git a/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql b/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql
@@ -146,5 +146,6 @@ query LimitedAccessCase($input: CaseQueryInput!) {
     postponedIndefinitelyExplanation
     indictmentDecision
     indictmentRulingDecision
+    courtSessionType
   }
 }
diff --git a/apps/judicial-system/web/src/components/InfoCard/InfoCardCaseScheduled.tsx b/apps/judicial-system/web/src/components/InfoCard/InfoCardCaseScheduled.tsx
@@ -12,7 +12,7 @@ interface Props {
   court: Institution
   courtDate: string
   courtRoom?: string | null
-  title?: string
+  title?: string | null
 }
 
 const InfoCardCaseScheduled: React.FC<Props> = (props) => {

diff --git a/apps/judicial-system/web/src/components/InfoCard/InfoCardCaseScheduledIndictment.strings.ts b/apps/judicial-system/web/src/components/InfoCard/InfoCardCaseScheduledIndictment.strings.ts
@@ -7,11 +7,6 @@ export const strings = defineMessages({
     description:
       'Notaður sem titill á Frestað um ótilgreindan tíma upplýsingakorti.',
   },
-  schedulingTitle: {
-    id: 'judicial.system.core:info_card_case_scheduled_indictment.scheduling_title',
-    defaultMessage: 'Aðalmeðferð',
-    description: 'Notaður sem titill á Aðalmeðferð upplýsingakorti.',
-  },
   schedulingUntilVerdictTitle: {
     id: 'judicial.system.core:info_card_case_scheduled_indictment.scheduling_until_verdict_title',
     defaultMessage: 'Á dagskrá',

diff --git a/apps/judicial-system/web/src/components/InfoCard/InfoCardCaseScheduledIndictment.tsx b/apps/judicial-system/web/src/components/InfoCard/InfoCardCaseScheduledIndictment.tsx
@@ -2,8 +2,13 @@ import React from 'react'
 import { useIntl } from 'react-intl'
 
 import { Text } from '@island.is/island-ui/core'
+import { courtSessionTypeNames } from '@island.is/judicial-system/types'
+import {
+  CourtSessionType,
+  IndictmentDecision,
+  Institution,
+} from '@island.is/judicial-system-web/src/graphql/schema'
 
-import { IndictmentDecision, Institution } from '../../graphql/schema'
 import InfoCard from './InfoCard'
 import InfoCardCaseScheduled from './InfoCardCaseScheduled'
 import { strings } from './InfoCardCaseScheduledIndictment.strings'
@@ -14,6 +19,7 @@ interface Props {
   courtDate: string
   courtRoom?: string | null
   postponedIndefinitelyExplanation?: string | null
+  courtSessionType?: CourtSessionType | null
 }
 
 const InfoCardCaseScheduledIndictment: React.FC<Props> = (props) => {
@@ -23,6 +29,7 @@ const InfoCardCaseScheduledIndictment: React.FC<Props> = (props) => {
     courtDate,
     courtRoom,
     postponedIndefinitelyExplanation,
+    courtSessionType,
   } = props
   const { formatMessage } = useIntl()
 
@@ -59,7 +66,7 @@ const InfoCardCaseScheduledIndictment: React.FC<Props> = (props) => {
         court={court}
         courtDate={courtDate}
         courtRoom={courtRoom}
-        title={formatMessage(strings.schedulingTitle)}
+        title={courtSessionType && courtSessionTypeNames[courtSessionType]}
       />
     )
   ) : (

diff --git a/apps/judicial-system/web/src/components/Table/CourtDate/CourtDate.tsx b/apps/judicial-system/web/src/components/Table/CourtDate/CourtDate.tsx
@@ -6,40 +6,88 @@ import parseISO from 'date-fns/parseISO'
 
 import { Box, Text } from '@island.is/island-ui/core'
 import { capitalize } from '@island.is/judicial-system/formatters'
+import { courtSessionTypeNames } from '@island.is/judicial-system/types'
 import { tables } from '@island.is/judicial-system-web/messages'
+import { CourtSessionType } from '@island.is/judicial-system-web/src/graphql/schema'
 
 interface Props {
   courtDate?: string | null
   postponedIndefinitelyExplanation?: string | null
+  courtSessionType?: CourtSessionType | null
 }
 
-const CourtDate: FC<Props> = (props) => {
-  const { courtDate, postponedIndefinitelyExplanation } = props
+const PostponedCourtDate = () => {
   const { formatMessage } = useIntl()
 
-  if (!courtDate && !postponedIndefinitelyExplanation) {
+  return <Text>{formatMessage(tables.postponed)}</Text>
+}
+
+const CourtDateWithCourtSessionType: FC<{
+  courtDate: string
+  courtSessionType: CourtSessionType
+}> = ({ courtDate, courtSessionType }) => {
+  return (
+    <>
+      <Text>{courtSessionTypeNames[courtSessionType]}</Text>
+      <Text as="span" variant="small">
+        {capitalize(
+          format(parseISO(courtDate), 'EEEE', {
+            locale: localeIS,
+          }),
+        ).substring(0, 3)}
+        {'. '}
+        {capitalize(
+          format(parseISO(courtDate), 'dd.MM.y', {
+            locale: localeIS,
+          }),
+        ).replace('dagur', 'd.')}{' '}
+        kl. {format(parseISO(courtDate), 'kk:mm')}
+      </Text>
+    </>
+  )
+}
+
+const SimpleCourtDate: FC<{ courtDate: string }> = ({ courtDate }) => {
+  return (
+    <>
+      <Text>
+        <Box component="span">
+          {capitalize(
+            format(parseISO(courtDate), 'EEEE d. LLLL y', {
+              locale: localeIS,
+            }),
+          ).replace('dagur', 'd.')}
+        </Box>
+      </Text>
+      <Text as="span" variant="small">
+        kl. {format(parseISO(courtDate), 'kk:mm')}
+      </Text>
+    </>
+  )
+}
+
+const CourtDate: FC<Props> = ({
+  courtDate,
+  postponedIndefinitelyExplanation,
+  courtSessionType,
+}) => {
+  if (postponedIndefinitelyExplanation) {
+    return <PostponedCourtDate />
+  }
+
+  if (!courtDate) {
     return null
   }
 
-  return postponedIndefinitelyExplanation ? (
-    <Text>{formatMessage(tables.postponed)}</Text>
-  ) : (
-    courtDate && (
-      <>
-        <Text>
-          <Box component="span">
-            {capitalize(
-              format(parseISO(courtDate), 'EEEE d. LLLL y', {
-                locale: localeIS,
-              }),
-            ).replace('dagur', 'd.')}
-          </Box>
-        </Text>
-        <Text as="span" variant="small">
-          kl. {format(parseISO(courtDate), 'kk:mm')}
-        </Text>
-      </>
+  if (courtSessionType) {
+    return (
+      <CourtDateWithCourtSessionType
+        courtDate={courtDate}
+        courtSessionType={courtSessionType}
+      />
     )
-  )
+  }
+
+  return <SimpleCourtDate courtDate={courtDate} />
 }
 export default CourtDate
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.strings.ts b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.strings.ts
@@ -127,4 +127,16 @@ export const strings = defineMessages({
     defaultMessage: 'Staðfesta',
     description: 'Notaður sem texti á halda áfram takka.',
   },
+  courtSessionLabel: {
+    id: 'judicial.system.core:court.indictments.conclusion.court_session_label',
+    defaultMessage: 'Tegund þinghalds',
+    description:
+      'Notaður sem titill á tegund þinghalds valkosti á Niðurstaða skrefi.',
+  },
+  courtSessionPlaceholder: {
+    id: 'judicial.system.core:court.indictments.conclusion.court_session_placeholder',
+    defaultMessage: 'Veldu tegund þinghalds',
+    description:
+      'Notaður sem skýritexti í tegund þinghalds valkosti á Niðurstaða skrefi.',
+  },
 })