Return empty string for undefined/null date formatting (#21)

ministryofjustice · Jun 7, 2024 · 2144063 · 2144063
1 parent d0cce2e
commit 2144063
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 0 deletions.
diff --git a/server/formatters/formatDate.test.ts b/server/formatters/formatDate.test.ts
@@ -18,4 +18,16 @@ describe('formatDate', () => {
       expect(formatDate('an invalid date')).toEqual('an invalid date')
     })
   })
+
+  describe('when given undefined', () => {
+    it('returns ""', () => {
+      expect(formatDate(undefined)).toEqual('')
+    })
+  })
+
+  describe('when given null', () => {
+    it('returns ""', () => {
+      expect(formatDate(null)).toEqual('')
+    })
+  })
 })
diff --git a/server/formatters/formatDate.ts b/server/formatters/formatDate.ts
@@ -3,6 +3,10 @@ import { format, parseISO } from 'date-fns'
 export default function formatDate(dateOrString: string | Date) {
   const date = typeof dateOrString === 'string' ? parseISO(dateOrString) : dateOrString
 
+  if (!date) {
+    return ''
+  }
+
   if (Number.isNaN(date.getTime())) {
     return dateOrString as string
   }

diff --git a/server/formatters/formatDateWithTime.test.ts b/server/formatters/formatDateWithTime.test.ts
@@ -56,4 +56,16 @@ describe('formatDateWithTime', () => {
       expect(formatDateWithTime('an invalid date')).toEqual('an invalid date')
     })
   })
+
+  describe('when given undefined', () => {
+    it('returns ""', () => {
+      expect(formatDateWithTime(undefined)).toEqual('')
+    })
+  })
+
+  describe('when given null', () => {
+    it('returns ""', () => {
+      expect(formatDateWithTime(null)).toEqual('')
+    })
+  })
 })
diff --git a/server/formatters/formatDateWithTime.ts b/server/formatters/formatDateWithTime.ts
@@ -8,6 +8,10 @@ export default function formatDateWithTime(
 ): string {
   const date = typeof dateOrString === 'string' ? parseISO(dateOrString) : dateOrString
 
+  if (!date) {
+    return ''
+  }
+
   if (Number.isNaN(date.getTime())) {
     return dateOrString as string
   }

diff --git a/server/formatters/formatDaysAgo.test.ts b/server/formatters/formatDaysAgo.test.ts
@@ -55,4 +55,16 @@ describe('formatTime', () => {
       expect(formatDaysAgo('an invalid date')).toEqual('an invalid date')
     })
   })
+
+  describe('when given undefined', () => {
+    it('returns ""', () => {
+      expect(formatDaysAgo(undefined)).toEqual('')
+    })
+  })
+
+  describe('when given null', () => {
+    it('returns ""', () => {
+      expect(formatDaysAgo(null)).toEqual('')
+    })
+  })
 })
diff --git a/server/formatters/formatDaysAgo.ts b/server/formatters/formatDaysAgo.ts
@@ -4,6 +4,10 @@ export default function formatDaysAgo(dateOrString: string | Date) {
   const date = typeof dateOrString === 'string' ? parseISO(dateOrString) : dateOrString
   const today = new Date()
 
+  if (!date) {
+    return ''
+  }
+
   if (Number.isNaN(date.getTime())) {
     return dateOrString as string
   }

diff --git a/server/formatters/formatTime.test.ts b/server/formatters/formatTime.test.ts
@@ -18,4 +18,16 @@ describe('formatTime', () => {
       expect(formatTime('an invalid date')).toEqual('an invalid date')
     })
   })
+
+  describe('when given undefined', () => {
+    it('returns ""', () => {
+      expect(formatTime(undefined)).toEqual('')
+    })
+  })
+
+  describe('when given null', () => {
+    it('returns ""', () => {
+      expect(formatTime(null)).toEqual('')
+    })
+  })
 })
diff --git a/server/formatters/formatTime.ts b/server/formatters/formatTime.ts
@@ -3,6 +3,10 @@ import { format, parseISO } from 'date-fns'
 export default function formatTime(dateOrString: string | Date) {
   const date = typeof dateOrString === 'string' ? parseISO(dateOrString) : dateOrString
 
+  if (!date) {
+    return ''
+  }
+
   if (Number.isNaN(date.getTime())) {
     return dateOrString as string
   }