feat: dateIntervalStringSchema

Author: kirillgroshkov

src/validation/joi/joi.shared.schemas.test.ts

@@ -19,6 +19,7 @@ import {
   numberSchemaTyped,
   numberEnumValueSchema,
   numberEnumKeySchema,
+  dateIntervalStringSchema,
 } from './joi.shared.schemas'
 import { isValid, validate } from './joi.validation.util'
 
@@ -141,3 +142,24 @@ test('enum schemas', () => {
   const appIdKey = validate(AppId[AppId.APP1], numberEnumKeySchema(AppId))
   expectTypeOf(appIdKey).toEqualTypeOf<string>()
 })
+
+test('dateIntervalSchema', () => {
+  const schema = dateIntervalStringSchema
+
+  validate('2022-01-01/2022-01-02', schema)
+  expect(() => validate(undefined, schema)).toThrowErrorMatchingInlineSnapshot(
+    `""value" is required"`,
+  )
+  expect(() => validate('2022-01-01', schema)).toThrowErrorMatchingInlineSnapshot(
+    `"must be a DateInterval string"`,
+  )
+  expect(() => validate('2022-01-01/2022-01-0', schema)).toThrowErrorMatchingInlineSnapshot(
+    `"must be a DateInterval string"`,
+  )
+  expect(() => validate('2022-01-01/2022-01-02/', schema)).toThrowErrorMatchingInlineSnapshot(
+    `"must be a DateInterval string"`,
+  )
+  expect(() =>
+    validate('2022-01-01/2022-01-02/2022-01-03', schema),
+  ).toThrowErrorMatchingInlineSnapshot(`"must be a DateInterval string"`)
+})

src/validation/joi/joi.shared.schemas.ts

@@ -24,6 +24,11 @@ export const dateStringSchema = stringSchema.dateString()
 export const binarySchema = Joi.binary()
 export const dateObjectSchema = Joi.object().instance(Date)
 
+const DATE_INTERVAL_REGEX = /^\d{4}-\d{2}-\d{2}\/\d{4}-\d{2}-\d{2}$/
+export const dateIntervalStringSchema = stringSchema.regex(DATE_INTERVAL_REGEX).messages({
+  'string.pattern.base': `must be a DateInterval string`,
+})
+
 /**
  * Allows all values of a String Enum.
  */

src/validation/joi/string.extensions.ts

@@ -51,10 +51,10 @@ export function stringExtensions(joi: typeof Joi): Extension {
 
           // Today allows +-14 hours gap to account for different timezones
           if (max === 'today') {
-            max = localTimeNow().add(14, 'hour').toISODate()
+            max = localTimeNow().plus(14, 'hour').toISODate()
           }
           if (min === 'today') {
-            min = localTimeNow().subtract(14, 'hour').toISODate()
+            min = localTimeNow().minus(14, 'hour').toISODate()
           }
           // console.log('min/max', min, max)