X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FUtils.ts;h=1a93669dbc334f4b7c2b1d18bd7f049d0625cc4f;hb=6fc0c6f3db444377c0fdea238183a14823278046;hp=c5a276bc92609e21bb55f79f2df4549a5f0fe447;hpb=32f5e42d9017783787e24fff7bcf67d3b4118311;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index c5a276bc..1a93669d 100644
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -70,19 +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') {
-    return new Date(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 valueToDate;
   }
-  return null;
 };
 
 export const convertToInt = (value: unknown): number => {
@@ -100,8 +101,7 @@ export const convertToInt = (value: unknown): number => {
     changedValue = parseInt(value as string);
   }
   if (isNaN(changedValue)) {
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    throw new Error(`Cannot convert to integer: ${value.toString()}`);
+    throw new Error(`Cannot convert to integer: '${String(value)}'`);
   }
   return changedValue;
 };
@@ -115,8 +115,7 @@ export const convertToFloat = (value: unknown): number => {
     changedValue = parseFloat(value as string);
   }
   if (isNaN(changedValue)) {
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    throw new Error(`Cannot convert to float: ${value.toString()}`);
+    throw new Error(`Cannot convert to float: '${String(value)}'`);
   }
   return changedValue;
 };