@mondart/nestjs-common-module 2.3.5 → 2.4.1

package/dist/validators/is-date-range.validator.d.ts

@@ -1,4 +1,4 @@
 import { ValidationOptions } from 'class-validator';
 type DateComparisonOperator = '<' | '<=' | '>' | '>=';
-export declare function IsDateRangeValid(relatedPropertyNameOrCurrent: string, operator: DateComparisonOperator, validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;
+export declare function IsDateRangeValid(relatedPropertyNameOrCurrent: string, operator: DateComparisonOperator, timezone?: string, validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;
 export {};

package/dist/validators/is-date-range.validator.js

@@ -8,32 +8,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IsDateRangeValid = IsDateRangeValid;
 const class_validator_1 = require("class-validator");
+const moment = require("moment-timezone");
 let IsDateRangeValidConstraint = class IsDateRangeValidConstraint {
     validate(from, args) {
-        const [relatedPropertyNameOrCurrent, operator] = args.constraints;
+        const [relatedPropertyNameOrCurrent, operator, timezone] = args.constraints;
         let compareTo;
         if (relatedPropertyNameOrCurrent === 'current') {
-            compareTo = new Date();
-            compareTo.setHours(0, 0, 0, 0);
+            compareTo = moment
+                .tz(timezone || moment.tz.guess())
+                .startOf('day')
+                .toDate();
+            console.log('Compare To Date:', compareTo);
         }
         else {
             compareTo = args.object[relatedPropertyNameOrCurrent];
-            compareTo =
-                typeof compareTo === 'string' ? new Date(compareTo) : compareTo;
+            compareTo = moment(compareTo)
+                .tz(timezone || moment.tz.guess())
+                .startOf('day')
+                .toDate();
         }
         if (!from || !compareTo) {
             return true;
         }
-        from = typeof from === 'string' ? new Date(from) : from;
+        const convertedFrom = moment(from).endOf('day').toDate();
+        console.log('From Date:', from);
         switch (operator) {
             case '<':
-                return from.getTime() < compareTo.getTime();
+                return convertedFrom.getTime() < compareTo.getTime();
             case '<=':
-                return from.getTime() <= compareTo.getTime();
+                return convertedFrom.getTime() <= compareTo.getTime();
             case '>':
-                return from.getTime() > compareTo.getTime();
+                return convertedFrom.getTime() > compareTo.getTime();
             case '>=':
-                return from.getTime() >= compareTo.getTime();
+                return convertedFrom.getTime() >= compareTo.getTime();
             default:
                 return false;
         }
@@ -49,13 +56,13 @@ let IsDateRangeValidConstraint = class IsDateRangeValidConstraint {
 IsDateRangeValidConstraint = __decorate([
     (0, class_validator_1.ValidatorConstraint)({ async: false })
 ], IsDateRangeValidConstraint);
-function IsDateRangeValid(relatedPropertyNameOrCurrent, operator, validationOptions) {
+function IsDateRangeValid(relatedPropertyNameOrCurrent, operator, timezone, validationOptions) {
     return (object, propertyName) => {
         (0, class_validator_1.registerDecorator)({
             target: object.constructor,
             propertyName: propertyName,
             options: validationOptions,
-            constraints: [relatedPropertyNameOrCurrent, operator],
+            constraints: [relatedPropertyNameOrCurrent, operator, timezone],
             validator: IsDateRangeValidConstraint,
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondart/nestjs-common-module",
-  "version": "2.3.5",
+  "version": "2.4.1",
   "description": "",
   "author": {
     "name": "Mondart"
@@ -38,6 +38,7 @@
     "@sentry/profiling-node": "^8.32.0",
     "@types/redis": "^4.0.11",
     "axios": "^1.7.9",
+    "bottleneck": "^2.19.5",
     "cache-manager": "^6.4.0",
     "cache-manager-ioredis-yet": "^2.1.1",
     "class-transformer": "^0.5.1",
@@ -45,6 +46,7 @@
     "express-basic-auth": "^1.2.1",
     "kafkajs": "^2.2.4",
     "nestjs-paginate": "^11.1.0",
+    "moment-timezone": "^0.6.0",
     "npm": "^10.8.1",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",