check and use formatter datetime formats

Author: m0nggh

packages/backend/src/apps/delay/helpers/generate-timestamp.ts

@@ -1,4 +1,4 @@
-import { DateTime } from 'luxon'
+import { generateTimestampFromFormats } from '@/helpers/generate-timestamp-from-formats'
 
 const VALID_DATETIME_FORMATS = [
   'yyyy-MM-dd HH:mm',
@@ -8,22 +8,5 @@ const VALID_DATETIME_FORMATS = [
 
 export default function generateTimestamp(date: string, time: string): number {
   const datetimeString = `${date} ${time}`
-  // check through our accepted formats
-  for (const datetimeFormat of VALID_DATETIME_FORMATS) {
-    // check both en-SG and en-US because Sept accepted for SG but Sep accepted for US
-    let datetime = DateTime.fromFormat(datetimeString, datetimeFormat, {
-      locale: 'en-SG',
-    })
-    if (datetime.isValid) {
-      return datetime.toMillis()
-    }
-
-    datetime = DateTime.fromFormat(datetimeString, datetimeFormat, {
-      locale: 'en-US',
-    })
-    if (datetime.isValid) {
-      return datetime.toMillis()
-    }
-  }
-  return NaN
+  return generateTimestampFromFormats(datetimeString, VALID_DATETIME_FORMATS)
 }

packages/backend/src/apps/toolbox/__tests__/common/condition-is-true.test.ts

@@ -94,16 +94,12 @@ describe('Condition is true', () => {
     expect(result).toEqual(expectedResult)
   })
 
-  /**
-   * Typical datetime formats:
-   * yyyy-MM-dd HH:mm
-   * dd MMM yyyy
-   * dd/MM/yyyy HH:mm:ss
-   * ISO format
-   */
+  // check all date formats
   it.each([
-    { text: '2024-11-06 12:00', expectedResult: true },
-    { text: '03/11/2024 12:00:30', expectedResult: false },
+    { text: '05/11/24', expectedResult: true }, // 'dd/LL/yy'
+    { text: '03/11/2024', expectedResult: false }, // 'dd/LL/yyyy'
+    { text: '05 Nov 2024', expectedResult: true }, // 'dd LLL yyyy'
+    { text: '03 November 2024', expectedResult: false }, // 'dd LLLL yyyy'
   ])('supports before', ({ text, expectedResult }) => {
     const result = conditionIsTrue({
       field: '04 Nov 2024',
@@ -116,8 +112,9 @@ describe('Condition is true', () => {
   })
 
   it.each([
-    { text: '2024-11-06T12:00:00.500+08:00', expectedResult: false },
-    { text: '03 Nov 2024 23:59', expectedResult: true },
+    { text: '2024/11/03', expectedResult: true }, // 'yyyy/LL/dd'
+    { text: '04 Nov 2024 12:01 AM', expectedResult: false }, // 'dd LLL yyyy hh:mm a'
+    { text: '03 Nov 2024 11:59:59 PM', expectedResult: true }, // 'dd LLL yyyy hh:mm:ss a'
   ])('supports after', ({ text, expectedResult }) => {
     const result = conditionIsTrue({
       field: '04 Nov 2024',
@@ -173,8 +170,8 @@ describe('Condition is true', () => {
   it.each([
     { field: 10, condition: 'gte', text: 'abc' },
     { field: 'abc', condition: 'lt', text: 10 },
-    { field: '04 Nov 2024', condition: 'before', text: 'abc' },
-    { field: 'abc', condition: 'before', text: '04 Nov 2024' },
+    { field: '04 Sep 2024', condition: 'before', text: 'abc' },
+    { field: '123', condition: 'before', text: '04 Nov 2024' },
   ])(
     'throws an error for invalid field or value for comparison',
     ({ field, condition, text }) => {

packages/backend/src/apps/toolbox/common/condition-is-true.ts

@@ -1,5 +1,7 @@
 import type { IJSONObject, IJSONValue } from '@plumber/types'
 
+import { generateTimestampFromFormats } from '@/helpers/generate-timestamp-from-formats'
+
 function compareNumbers(
   field: IJSONValue,
   condition: 'gte' | 'gt' | 'lte' | 'lt',
@@ -26,17 +28,34 @@ function compareNumbers(
   }
 }
 
+// support only formatter date formats
+const VALID_DATETIME_FORMATS = [
+  'dd/LL/yy',
+  'dd/LL/yyyy',
+  'dd LLL yyyy',
+  'dd LLLL yyyy',
+  'yyyy/LL/dd',
+  'dd LLL yyyy hh:mm a',
+  'dd LLL yyyy hh:mm:ss a',
+]
+
 function compareDates(
   field: IJSONValue,
   condition: 'before' | 'after',
   value: IJSONValue,
 ) {
-  const fieldTimestamp = new Date(field as string).getTime()
+  const fieldTimestamp = generateTimestampFromFormats(
+    field as string,
+    VALID_DATETIME_FORMATS,
+  )
   if (isNaN(fieldTimestamp)) {
     throw new Error('Invalid date used in field for comparison')
   }
 
-  const valueTimestamp = new Date(value as string).getTime()
+  const valueTimestamp = generateTimestampFromFormats(
+    value as string,
+    VALID_DATETIME_FORMATS,
+  )
   if (isNaN(valueTimestamp)) {
     throw new Error('Invalid date used in value for comparison')
   }

packages/backend/src/helpers/generate-timestamp-from-formats.ts

@@ -0,0 +1,25 @@
+import { DateTime } from 'luxon'
+
+export function generateTimestampFromFormats(
+  datetimeString: string,
+  datetimeFormats: string[],
+): number {
+  // check through the list of formats
+  for (const datetimeFormat of datetimeFormats) {
+    // check both en-SG and en-US because Sept accepted for SG but Sep accepted for US
+    let datetime = DateTime.fromFormat(datetimeString, datetimeFormat, {
+      locale: 'en-SG',
+    })
+    if (datetime.isValid) {
+      return datetime.toMillis()
+    }
+
+    datetime = DateTime.fromFormat(datetimeString, datetimeFormat, {
+      locale: 'en-US',
+    })
+    if (datetime.isValid) {
+      return datetime.toMillis()
+    }
+  }
+  return NaN
+}