fix(j-s): rename

island-is · Jan 21, 2025 · cac9f57 · cac9f57
1 parent bb47ea5
commit cac9f57
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts b/apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts
@@ -1,5 +1,5 @@
 import {
-  getIndictmentDeadlineDate,
+  getAppealDeadlineDate,
   hasDatePassed,
 } from '@island.is/judicial-system/types'
 import {
@@ -95,7 +95,7 @@ export const getAppealInfo = (theCase: Case): AppealInfo => {
   )
 
   const theRulingDate = new Date(rulingDate)
-  appealInfo.appealDeadline = getIndictmentDeadlineDate({
+  appealInfo.appealDeadline = getAppealDeadlineDate({
     baseDate: theRulingDate,
     isFine: true,
   }).toISOString()
@@ -124,7 +124,7 @@ const transformRequestCase = (theCase: Case): Case => {
     isClosedCourtHidden: theCase.isClosedCourtHidden ?? false,
     isHeightenedSecurityLevel: theCase.isHeightenedSecurityLevel ?? false,
     isValidToDateInThePast: theCase.validToDate
-      ? Date.now() > new Date(theCase.validToDate).getTime()
+      ? hasDatePassed(new Date(theCase.validToDate))
       : theCase.isValidToDateInThePast,
 
     // TODO: Move remaining appeal fields to appealInfo
@@ -162,7 +162,7 @@ export const getIndictmentInfo = (
   }
 
   const theRulingDate = new Date(rulingDate)
-  const indictmentAppealDeadline = getIndictmentDeadlineDate({
+  const indictmentAppealDeadline = getAppealDeadlineDate({
     baseDate: theRulingDate,
     isFine,
   }).toISOString()
@@ -206,7 +206,7 @@ export const getIndictmentDefendantsInfo = (theCase: Case) => {
 
     const baseDate = serviceRequired ? verdictViewDate : theCase.rulingDate
     const verdictAppealDeadline = baseDate
-      ? getIndictmentDeadlineDate({ baseDate: new Date(baseDate), isFine })
+      ? getAppealDeadlineDate({ baseDate: new Date(baseDate), isFine })
       : undefined
     const isVerdictAppealDeadlineExpired =
       verdictAppealDeadline && hasDatePassed(verdictAppealDeadline)

diff --git a/apps/judicial-system/web/src/components/BlueBoxWithIcon/BlueBoxWithDate.tsx b/apps/judicial-system/web/src/components/BlueBoxWithIcon/BlueBoxWithDate.tsx
@@ -13,7 +13,7 @@ import {
 } from '@island.is/island-ui/core'
 import { PUBLIC_PROSECUTOR_STAFF_INDICTMENT_SEND_TO_PRISON_ADMIN_ROUTE } from '@island.is/judicial-system/consts'
 import { formatDate } from '@island.is/judicial-system/formatters'
-import { getIndictmentDeadlineDate } from '@island.is/judicial-system/types'
+import { getAppealDeadlineDate } from '@island.is/judicial-system/types'
 import { core, errors } from '@island.is/judicial-system-web/messages'
 
 import {
@@ -136,12 +136,11 @@ const BlueBoxWithDate: FC<Props> = (props) => {
     )
   }
 
-  // TODO
   const appealExpirationInfo = useMemo(() => {
     const deadline =
       defendant.verdictAppealDeadline ||
       (dates.verdictViewDate &&
-        getIndictmentDeadlineDate({
+        getAppealDeadlineDate({
           baseDate: dates.verdictViewDate,
           isFine: false,
         }).toISOString())

diff --git a/libs/judicial-system/types/src/index.ts b/libs/judicial-system/types/src/index.ts
@@ -104,7 +104,7 @@ export {
 
 export { getIndictmentVerdictAppealDeadlineStatus } from './lib/indictmentCase'
 
-export { getIndictmentDeadlineDate, hasDatePassed } from './lib/dates'
+export { getAppealDeadlineDate, hasDatePassed } from './lib/dates'
 
 export type {
   CrimeScene,

diff --git a/libs/judicial-system/types/src/lib/dates.spec.ts b/libs/judicial-system/types/src/lib/dates.spec.ts
@@ -1,13 +1,13 @@
-import { getIndictmentDeadlineDate } from './dates'
+import { getAppealDeadlineDate } from './dates'
 
-describe('getIndictmentDeadlineDate', () => {
+describe('getAppealDeadlineDate', () => {
   test('should return fine appeal deadline', () => {
     // Arrange
     const baseDate = new Date(2024, 1, 1)
     const isFine = true
 
     // Act
-    const actualDate = getIndictmentDeadlineDate({ baseDate, isFine })
+    const actualDate = getAppealDeadlineDate({ baseDate, isFine })
 
     // Assert
     expect(actualDate).toStrictEqual(new Date(2024, 1, 4, 23, 59, 59, 999))
@@ -19,7 +19,7 @@ describe('getIndictmentDeadlineDate', () => {
     const isFine = false
 
     // Act
-    const actualDate = getIndictmentDeadlineDate({ baseDate, isFine })
+    const actualDate = getAppealDeadlineDate({ baseDate, isFine })
 
     // Assert
     expect(actualDate).toStrictEqual(new Date(2024, 1, 29, 23, 59, 59, 999))

diff --git a/libs/judicial-system/types/src/lib/dates.ts b/libs/judicial-system/types/src/lib/dates.ts
@@ -7,7 +7,7 @@ const setEndOfDay = (date: Date) => new Date(date.setHours(23, 59, 59, 999))
 
 export const hasDatePassed = (deadline: Date) => Date.now() > deadline.getTime()
 
-export const getIndictmentDeadlineDate = ({
+export const getAppealDeadlineDate = ({
   baseDate,
   isFine,
 }: {

diff --git a/libs/judicial-system/types/src/lib/indictmentCase.ts b/libs/judicial-system/types/src/lib/indictmentCase.ts
@@ -1,4 +1,4 @@
-import { getIndictmentDeadlineDate, hasDatePassed } from './dates'
+import { getAppealDeadlineDate, hasDatePassed } from './dates'
 
 /*
   This function takes an array of verdict info tuples:
@@ -32,7 +32,7 @@ export const getIndictmentVerdictAppealDeadlineStatus = (
     (newest, [_, current]) => (current && current > newest ? current : newest),
     new Date(0),
   )
-  const deadline = getIndictmentDeadlineDate({
+  const deadline = getAppealDeadlineDate({
     baseDate: newestViewDate,
     isFine,
   })