From 85cce27f97abb607fbc4a2c4c6b335680dd65c2b Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Mon, 31 Jul 2023 01:12:13 +0200
Subject: [PATCH] refactor: add date validation to date convertion helper
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/utils/Utils.ts       | 19 ++++++++-----------
 test/utils/Utils.test.ts | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index b619144b..1a93669d 100644
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -70,23 +70,20 @@ export const isValidTime = (date: unknown): boolean => {
   return false;
 };
 
-export const convertToDate = (
-  value: Date | string | number | null | undefined,
-): Date | null | undefined => {
+export const convertToDate = (value: Date | string | number | undefined): Date | undefined => {
   if (isNullOrUndefined(value)) {
-    return value as null | undefined;
+    return value as undefined;
   }
   if (isDate(value)) {
     return value as Date;
   }
   if (isString(value) || typeof value === 'number') {
-    value = new Date(value as string | number);
-    if (isNaN(value.getTime())) {
-      throw new Error(`Cannot convert to date: ${String(value)}`);
+    const valueToDate = new Date(value as string | number);
+    if (isNaN(valueToDate.getTime())) {
+      throw new Error(`Cannot convert to date: '${value as string | number}'`);
     }
-    return value;
+    return valueToDate;
   }
-  return null;
 };
 
 export const convertToInt = (value: unknown): number => {
@@ -104,7 +101,7 @@ export const convertToInt = (value: unknown): number => {
     changedValue = parseInt(value as string);
   }
   if (isNaN(changedValue)) {
-    throw new Error(`Cannot convert to integer: ${String(value)}`);
+    throw new Error(`Cannot convert to integer: '${String(value)}'`);
   }
   return changedValue;
 };
@@ -118,7 +115,7 @@ export const convertToFloat = (value: unknown): number => {
     changedValue = parseFloat(value as string);
   }
   if (isNaN(changedValue)) {
-    throw new Error(`Cannot convert to float: ${String(value)}`);
+    throw new Error(`Cannot convert to float: '${String(value)}'`);
   }
   return changedValue;
 };
diff --git a/test/utils/Utils.test.ts b/test/utils/Utils.test.ts
index 0a672917..8804e577 100644
--- a/test/utils/Utils.test.ts
+++ b/test/utils/Utils.test.ts
@@ -1,4 +1,4 @@
-import { hoursToMilliseconds, hoursToSeconds, isValid } from 'date-fns';
+import { hoursToMilliseconds, hoursToSeconds } from 'date-fns';
 import { expect } from 'expect';
 
 import { Constants } from '../../src/utils/Constants';
@@ -84,9 +84,14 @@ describe('Utils test suite', () => {
 
   it('Verify convertToDate()', () => {
     expect(convertToDate(undefined)).toBe(undefined);
-    expect(convertToDate(null)).toBe(null);
-    expect(isValid(convertToDate(''))).toBe(false);
+    expect(() => convertToDate('')).toThrowError(new Error("Cannot convert to date: ''"));
+    expect(() => convertToDate('00:70:61')).toThrowError(
+      new Error("Cannot convert to date: '00:70:61'"),
+    );
+    expect(convertToDate('0')).toStrictEqual(new Date('1999-12-31T23:00:00.000Z'));
+    expect(convertToDate('-1')).toStrictEqual(new Date('2000-12-31T23:00:00.000Z'));
     expect(convertToDate(0)).toStrictEqual(new Date('1970-01-01T00:00:00.000Z'));
+    expect(convertToDate(-1)).toStrictEqual(new Date('1969-12-31T23:59:59.999Z'));
     const dateStr = '2020-01-01T00:00:00.000Z';
     let date = convertToDate(dateStr);
     expect(date).toBeInstanceOf(Date);
@@ -114,7 +119,7 @@ describe('Utils test suite', () => {
     expect(convertToInt(1.999)).toBe(1);
     expect(() => {
       convertToInt('NaN');
-    }).toThrow('Cannot convert to integer: NaN');
+    }).toThrow("Cannot convert to integer: 'NaN'");
   });
 
   it('Verify convertToFloat()', () => {
@@ -135,7 +140,7 @@ describe('Utils test suite', () => {
     expect(convertToFloat(1.999)).toBe(1.999);
     expect(() => {
       convertToFloat('NaN');
-    }).toThrow('Cannot convert to float: NaN');
+    }).toThrow("Cannot convert to float: 'NaN'");
   });
 
   it('Verify convertToBoolean()', () => {
-- 
2.34.1