rez_core 5.0.192 → 5.0.193

package/package.json

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

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

@@ -899,22 +899,22 @@ export class FilterService {
     // convert to number when needed
     const numVal = Number(val);
 
-    // const subtractBusinessDays = (days: number): string => {
-    //   let d = new Date();
-    //   let count = 0;
+    const subtractBusinessDays = (days: number): string => {
+      let d = new Date();
+      let count = 0;
 
-    //   while (count < days) {
-    //     d.setDate(d.getDate() - 1);
+      while (count < days) {
+        d.setDate(d.getDate() - 1);
 
-    //     const day = d.getDay(); // 0 = Sunday, 6 = Saturday
+        const day = d.getDay(); // 0 = Sunday, 6 = Saturday
 
-    //     if (day !== 0 && day !== 6) {
-    //       count++;
-    //     }
-    //   }
+        if (day !== 0 && day !== 6) {
+          count++;
+        }
+      }
 
-    //   return d.toISOString().split('T')[0];
-    // };
+      return d.toISOString().split('T')[0];
+    };
 
     switch (op) {
       // BASIC COMPARISONS
@@ -965,7 +965,6 @@ export class FilterService {
           params: {},
         };
 
-      // DAY OFFSET LOGIC (ALWAYS ADJUST -1 DAY)
       // DAY OFFSET LOGIC – NEW RULE:
       // +N  → future date (today + N)
       // -N  → past date (today - |N|)
@@ -992,7 +991,7 @@ export class FilterService {
         })();
 
         return {
-          query: `${dateColumn} < :${key}`,
+          query: `${dateColumn} <= :${key}`,
           params: { [key]: dayBefore },
         };
       }
@@ -1106,111 +1105,43 @@ export class FilterService {
           throw new BadRequestException('Value must be a number');
         }
 
-        const abs = Math.abs(numVal);
-
-        const calcDate = (() => {
-          let d = new Date();
-          let count = 0;
-
-          if (numVal >= 0) {
-            // POSITIVE → move forward
-            while (count < abs) {
-              d.setDate(d.getDate() + 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
-          } else {
-            // NEGATIVE → move backward
-            while (count < abs) {
-              d.setDate(d.getDate() - 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
-          }
-
-          return d.toISOString().split('T')[0];
-        })();
+        const targetDate = subtractBusinessDays(numVal);
 
         return {
           query: `${dateColumn} <= :${key} AND EXTRACT(DOW FROM ${dateColumn}) NOT IN (0, 6)`,
-          params: { [key]: calcDate },
+          params: { [key]: targetDate },
         };
       }
 
       case 'is_after_business_days': {
         if (isNaN(numVal)) {
-          throw new BadRequestException('Value must be a number');
+          throw new BadRequestException(
+            'Value must be a number for is_after_business_days',
+          );
         }
 
-        const abs = Math.abs(numVal);
-
-        const calcDate = (() => {
+        const businessAfter = (() => {
           let d = new Date();
           let count = 0;
 
-          if (numVal >= 0) {
-            // POSITIVE → move forward
-            while (count < abs) {
-              d.setDate(d.getDate() + 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
-          } else {
-            // NEGATIVE → move backward
-            while (count < abs) {
-              d.setDate(d.getDate() - 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
+          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]: calcDate },
+          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} AND EXTRACT(DOW FROM ${dateColumn}) NOT IN (0, 6)`,
-      //     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)
       case 'in_last_day': {
         if (isNaN(numVal)) {