Merge pull request #7456 from uktrade/refactor/date-functions

Remove `createDateFromObject` and replace with `parseDateWithYearMonth`
uktrade · Jan 7, 2025 · fc57eeb · fc57eeb
2 parents f079a8f + 520b15d
commit fc57eeb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/src/client/modules/Companies/CompanyInvestments/LargeCapitalProfile/validators.js b/src/client/modules/Companies/CompanyInvestments/LargeCapitalProfile/validators.js
@@ -1,9 +1,15 @@
-import { createDateFromObject } from '../../../../utils/date'
+import { isValid } from 'date-fns'
+
+import { parseDateWithYearMonth } from '../../../../utils/date'
 
 export const validateDateWithinTheLastYear = (value, field, { values }) => {
   if (values && values.date) {
-    const date = createDateFromObject(values.date)
-    if (date) {
+    const date = parseDateWithYearMonth(
+      values.date.year,
+      values.date.month,
+      values.date.day
+    )
+    if (isValid(date)) {
       const now = new Date()
       const oneYearPrior = new Date()
       oneYearPrior.setFullYear(oneYearPrior.getFullYear() - 1)

diff --git a/src/client/modules/Events/EventForm/validators.jsx b/src/client/modules/Events/EventForm/validators.jsx
@@ -1,14 +1,24 @@
-import { createDateFromObject } from '../../../utils/date'
+import { isValid } from 'date-fns'
+
+import { parseDateWithYearMonth } from '../../../utils/date'
 
 export const validateStartDateBeforeOrEqualToEndDate = (
   value,
   field,
   { values }
 ) => {
   if (values && values.start_date && values.end_date) {
-    const startDate = createDateFromObject(values.start_date)
-    const endDate = createDateFromObject(values.end_date)
-    if (startDate && endDate) {
+    const startDate = parseDateWithYearMonth(
+      values.start_date.year,
+      values.start_date.month,
+      values.start_date.day
+    )
+    const endDate = parseDateWithYearMonth(
+      values.end_date.year,
+      values.end_date.month,
+      values.end_date.day
+    )
+    if (isValid(startDate) && isValid(endDate)) {
       const result =
         startDate > endDate
           ? 'Enter a valid end date. This must be after the start date.'

diff --git a/src/client/utils/date.js b/src/client/utils/date.js
@@ -125,12 +125,6 @@ function getDifferenceInWords(date, suffix = true) {
   }
 }
 
-function createDateFromObject({ day, month, year }) {
-  const monthIndex = parseInt(month, 10) - 1
-  const result = new Date(year, monthIndex, day)
-  return result
-}
-
 function formatStartAndEndDate(startDate, endDate) {
   if (startDate) {
     const startDateParsed = startDate ? parseISO(startDate) : startDate
@@ -270,7 +264,6 @@ module.exports = {
   getFinancialYearStart,
   parseDateWithYearMonth,
   formatDateWithYearMonth,
-  createDateFromObject,
   formatStartAndEndDate,
   convertDateToFieldShortDateObject,
   convertDateToFieldDateObject,