rez_core 5.0.79 → 5.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.79",
+  "version": "5.0.80",
   "description": "",
   "author": "",
   "private": false,

package/src/module/filter/service/filter.service.ts

@@ -10,7 +10,6 @@ import { EntityRelationService } from 'src/module/meta/service/entity-relation.s
 import { ResolverService } from 'src/module/meta/service/resolver.service';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
 import { ConfigService } from '@nestjs/config';
-import dayjs from 'dayjs';
 
 @Injectable()
 export class FilterService {
@@ -1101,75 +1100,34 @@ export class FilterService {
       }
 
       case 'is_after_business_days': {
-        const days = Number(val);
-
-        if (isNaN(days)) {
+        if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_after_business_days',
           );
         }
 
-        let targetDate = dayjs().startOf('day'); // MUST be let
-        let count = 0;
+        const businessAfter = (() => {
+          let d = new Date();
+          let count = 0;
 
-        while (count < days) {
-          targetDate = targetDate.add(1, 'day'); // ✔ FIX: assign back
+          while (count < numVal) {
+            d.setDate(d.getDate() + 1);
+            const day = d.getDay(); // 0=Sun, 6=Sat
+            if (day !== 0 && day !== 6) count++;
+          }
 
-          const day = targetDate.day(); // 0 = Sunday, 6 = Saturday
+          // DB shift -1 day
+          d.setDate(d.getDate() - 1);
 
-          if (day !== 0 && day !== 6) {
-            count++;
-          }
-        }
+          return d.toISOString().split('T')[0];
+        })();
 
         return {
-          query: `DATE(e.${attr}) > :${key}`,
-          params: { [key]: targetDate.format('YYYY-MM-DD') },
+          query: `${dateColumn} > :${key}`,
+          params: { [key]: businessAfter },
         };
       }
 
-      // case 'is_before_business_days': {
-      //   if (isNaN(numVal)) {
-      //     throw new BadRequestException('Value must be a number');
-      //   }
-
-      //   const targetDate = subtractBusinessDays(numVal);
-
-      //   return {
-      //     query: `${dateColumn} <= :${key}`,
-      //     params: { [key]: targetDate },
-      //   };
-      // }
-
-      // case 'is_after_business_days': {
-      //   if (isNaN(numVal)) {
-      //     throw new BadRequestException(
-      //       'Value must be a number for is_after_business_days',
-      //     );
-      //   }
-
-      //   const businessAfter = (() => {
-      //     let d = new Date();
-      //     let count = 0;
-
-      //     while (count < numVal) {
-      //       d.setDate(d.getDate() + 1);
-      //       const day = d.getDay(); // 0=Sun, 6=Sat
-      //       if (day !== 0 && day !== 6) count++;
-      //     }
-
-      //     // DB shift -1 day
-      //     d.setDate(d.getDate() - 1);
-
-      //     return d.toISOString().split('T')[0];
-      //   })();
-
-      //   return {
-      //     query: `${dateColumn} > :${key}`,
-      //     params: { [key]: businessAfter },
-      //   };
-      // }
-
       // ============================================
       // IN LAST DAY (range: today to N days before)
       // ============================================