From 45ece13d04b02d35f2adda80a3058ec116de3869 Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Fri, 29 Sep 2023 21:12:27 +0200 Subject: [PATCH] refactor: g-sheet time is object --- apps/server/src/utils/time.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/server/src/utils/time.ts b/apps/server/src/utils/time.ts index 9beb41a16..f3a010436 100644 --- a/apps/server/src/utils/time.ts +++ b/apps/server/src/utils/time.ts @@ -90,17 +90,17 @@ export const forgivingStringToMillis = (value: string, fillLeft = true): number */ export const parseExcelDate = (excelDate: unknown): number => { - if (typeof excelDate !== 'string') { - return 0; + if (excelDate instanceof Date) { + return dateToMillis(excelDate); + } else if (typeof excelDate === 'string') { + const date = new Date(excelDate); + if (date instanceof Date && !isNaN(date.getTime())) { + return dateToMillis(date); + } else if (isTimeString(excelDate)) { + return forgivingStringToMillis(excelDate); + } } - // attempt converting to date object - const date = new Date(excelDate); - if (date instanceof Date && !isNaN(date.getTime())) { - return dateToMillis(date); - } else if (isTimeString(excelDate)) { - return forgivingStringToMillis(excelDate); - } return 0; };