feat: allow passing dynamic date to MinDate and MaxDate decorators (#1692)

Author: CodyTseng

README.md

@@ -816,8 +816,8 @@ isBoolean(value);
 | `@Min(min: number)`                             | Checks if the given number is greater than or equal to given number. |
 | `@Max(max: number)`                             | Checks if the given number is less than or equal to given number. |
 | **Date validation decorators**                  |
-| `@MinDate(date: Date)`                          | Checks if the value is a date that's after the specified date. |
-| `@MaxDate(date: Date)`                          | Checks if the value is a date that's before the specified date. |  
+| `@MinDate(date: Date | (() => Date))`           | Checks if the value is a date that's after the specified date. |
+| `@MaxDate(date: Date | (() => Date))`           | Checks if the value is a date that's before the specified date. |  
 | **String-type validation decorators**           | |
 | `@IsBooleanString()`                            | Checks if a string is a boolean (e.g. is "true" or "false"). |
 | `@IsDateString()`                               | Alias for `@IsISO8601()`. |

src/decorator/date/MaxDate.ts

@@ -6,14 +6,14 @@ export const MAX_DATE = 'maxDate';
 /**
  * Checks if the value is a date that's before the specified date.
  */
-export function maxDate(date: unknown, maxDate: Date): boolean {
-  return date instanceof Date && date.getTime() <= maxDate.getTime();
+export function maxDate(date: unknown, maxDate: Date | (() => Date)): boolean {
+  return date instanceof Date && date.getTime() <= (maxDate instanceof Date ? maxDate : maxDate()).getTime();
 }
 
 /**
  * Checks if the value is a date that's after the specified date.
  */
-export function MaxDate(date: Date, validationOptions?: ValidationOptions): PropertyDecorator {
+export function MaxDate(date: Date | (() => Date), validationOptions?: ValidationOptions): PropertyDecorator {
   return ValidateBy(
     {
       name: MAX_DATE,

src/decorator/date/MinDate.ts

@@ -6,14 +6,14 @@ export const MIN_DATE = 'minDate';
 /**
  * Checks if the value is a date that's after the specified date.
  */
-export function minDate(date: unknown, minDate: Date): boolean {
-  return date instanceof Date && date.getTime() >= minDate.getTime();
+export function minDate(date: unknown, minDate: Date | (() => Date)): boolean {
+  return date instanceof Date && date.getTime() >= (minDate instanceof Date ? minDate : minDate()).getTime();
 }
 
 /**
  * Checks if the value is a date that's after the specified date.
  */
-export function MinDate(date: Date, validationOptions?: ValidationOptions): PropertyDecorator {
+export function MinDate(date: Date | (() => Date), validationOptions?: ValidationOptions): PropertyDecorator {
   return ValidateBy(
     {
       name: MIN_DATE,

test/functional/validation-functions-and-decorators.spec.ts

@@ -1211,6 +1211,72 @@ describe('MaxDate', () => {
   });
 });
 
+describe('MinDate function constraint', () => {
+  const constraint = () => new Date(1995, 11, 17);
+  const validValues = [new Date()];
+  const invalidValues = [new Date(1994, 11, 17)];
+
+  class MyClass {
+    @MinDate(constraint)
+    someProperty: Date;
+  }
+
+  it('should not fail if validator.validate said that its valid', () => {
+    return checkValidValues(new MyClass(), validValues);
+  });
+
+  it('should fail if validator.validate said that its invalid', () => {
+    return checkInvalidValues(new MyClass(), invalidValues);
+  });
+
+  it('should not fail if method in validator said that its valid', () => {
+    validValues.forEach(value => expect(minDate(value, constraint)).toBeTruthy());
+  });
+
+  it('should fail if method in validator said that its invalid', () => {
+    invalidValues.forEach(value => expect(minDate(value, constraint)).toBeFalsy());
+  });
+
+  it('should return error object with proper data', () => {
+    const validationType = 'minDate';
+    const message = 'minimal allowed date for someProperty is ' + constraintToString(constraint);
+    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+  });
+});
+
+describe('MaxDate function constraint', () => {
+  const constraint = () => new Date(1995, 11, 17);
+  const validValues = [new Date(1994, 11, 17)];
+  const invalidValues = [new Date()];
+
+  class MyClass {
+    @MaxDate(constraint)
+    someProperty: Date;
+  }
+
+  it('should not fail if validator.validate said that its valid', () => {
+    return checkValidValues(new MyClass(), validValues);
+  });
+
+  it('should fail if validator.validate said that its invalid', () => {
+    return checkInvalidValues(new MyClass(), invalidValues);
+  });
+
+  it('should not fail if method in validator said that its valid', () => {
+    validValues.forEach(value => expect(maxDate(value, constraint)).toBeTruthy());
+  });
+
+  it('should fail if method in validator said that its invalid', () => {
+    invalidValues.forEach(value => expect(maxDate(value, constraint)).toBeFalsy());
+  });
+
+  it('should return error object with proper data', () => {
+    const validationType = 'maxDate';
+    const message = 'maximal allowed date for someProperty is ' + constraintToString(constraint);
+    return checkReturnedError(new MyClass(), invalidValues, validationType, message);
+  });
+});
+
 describe('IsBooleanString', () => {
   const validValues = ['1', '0', 'true', 'false'];
   const invalidValues = ['2', '3', 'falze'];