Merge pull request #743 from ministryofjustice/fix/1693-dtr-whitespace

(1693) Strip whitespace from DtR date

server/utils/applications/reportDataFromApplication.test.ts

@@ -37,11 +37,23 @@ describe('reportDataFromApplication', () => {
           data: {
             'accommodation-referral-details': {
               'dtr-submitted': { dtrSubmitted: 'yes' },
-              'dtr-details': { date: 'Duty of care submission date' },
+              'dtr-details': { date: '2023-05-24' },
             },
           },
         })
-        expect(dutyToReferSubmissionDateFromApplication(application)).toEqual('Duty of care submission date')
+        expect(dutyToReferSubmissionDateFromApplication(application)).toEqual('2023-05-24')
+      })
+
+      it('strips the date if it contains whitespace', () => {
+        const application = applicationFactory.build({
+          data: {
+            'accommodation-referral-details': {
+              'dtr-submitted': { dtrSubmitted: 'yes' },
+              'dtr-details': { date: ' 2023 - 05 - 24 ' },
+            },
+          },
+        })
+        expect(dutyToReferSubmissionDateFromApplication(application)).toEqual('2023-05-24')
       })
     })
 

server/utils/applications/reportDataFromApplication.ts

@@ -1,6 +1,7 @@
 import { eligibilityReasons } from '../../form-pages/apply/accommodation-need/eligibility/eligibilityReason'
 import { TemporaryAccommodationApplication as Application } from '../../@types/shared'
 import { SessionDataError } from '../errors'
+import { stripWhitespace } from '../utils'
 
 const isDutyToReferSubmittedFromApplication = (application: Application): boolean => {
   const isDutyToReferSubmitted: string = (application.data as Record<string, unknown>)?.[
@@ -29,7 +30,7 @@ const dutyToReferSubmissionDateFromApplication = (application: Application): str
     throw new SessionDataError('No duty to refer submitted date')
   }
 
-  return dutyToReferSubmissionDate
+  return stripWhitespace(dutyToReferSubmissionDate)
 }
 
 const needsAccessiblePropertyFromApplication = (application: Application): boolean => {

server/utils/utils.test.ts

@@ -12,6 +12,7 @@ import {
   pascalCase,
   removeBlankSummaryListItems,
   sentenceCase,
+  stripWhitespace,
   unique,
 } from './utils'
 
@@ -231,3 +232,9 @@ describe('unique', () => {
     )
   })
 })
+
+describe('stripWhitespace', () => {
+  it('removes whitespace from a string', () => {
+    expect(stripWhitespace(' 2034 -   05 - 25  ')).toEqual('2034-05-25')
+  })
+})

server/utils/utils.ts

@@ -118,3 +118,7 @@ export const appendQueryString = (
   }
   return `${path}${queryString ? `?${queryString}` : ''}`
 }
+
+export const stripWhitespace = (text: string): string => {
+  return text.replace(/\s+/g, '')
+}