Merge pull request #596 from companieshouse/lp-1384-invalid-date-error-fix

LP-1384: Improve invalid date error handling

Author: jdowie-ch

src/infrastructure/gateway/utils.ts

@@ -35,16 +35,17 @@ const zeroPadNumber = (input: string = ""): string => {
 const isDateValid = (date: string): boolean => {
   const [year, month, day] = date.split("-");
 
-  const isMonthInvalid = isNaN(parseInt(month));
-  const isYearInvalid = isNaN(parseInt(year)) || year.length !== 4;
+  const isDayInvalid = day.length > 2 || isNaN(parseInt(day));
+  const isMonthInvalid = month.length > 2 || isNaN(parseInt(month));
+  const isYearInvalid = year.length !== 4 || isNaN(parseInt(year));
 
-  if (isMonthInvalid || isYearInvalid) {
+  if (isDayInvalid || isMonthInvalid || isYearInvalid) {
     return false;
   }
 
   const days = daysInMonth(parseInt(month));
 
-  if (!day.length || parseInt(day) > days) {
+  if (parseInt(day) > days) {
     return false;
   }
 

src/presentation/test/unit/gateway/utils.spec.ts

@@ -58,7 +58,9 @@ describe("Gateway utils test suite", () => {
         ["space as year", { day: "11", month: "03", year: " " }],
         ["empty string as day", { day: "", month: "03", year: "1980" }],
         ["empty string as month", { day: "11", month: "", year: "1980" }],
-        ["empty string as year", { day: "11", month: "03", year: "" }]
+        ["empty string as year", { day: "11", month: "03", year: "" }],
+        ["day with 3 digits", { day: "001", month: "10", year: "2011" }],
+        ["month with 3 digits", { day: "01", month: "012", year: "2011" }]
       ])("should return false for invalid date - %s", (_desciption, date) => {
         let thrownError: UIErrors | null = null;