rez_core 5.0.197 → 5.0.198

package/package.json

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

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

@@ -899,18 +899,32 @@ 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];
+    // };
+
+    const moveBusinessDays = (offset: number): string => {
+      let d = new Date();
+      const abs = Math.abs(offset);
+      let count = 0;
+
+      while (count < abs) {
+        d.setDate(d.getDate() + (offset > 0 ? 1 : -1)); // forward for +ve / backward for -ve
+        const day = d.getDay(); // 0=Sun, 6=Sat
+        if (day !== 0 && day !== 6) count++; // skip weekends
       }
 
       return d.toISOString().split('T')[0];
@@ -918,7 +932,6 @@ export class FilterService {
 
     switch (op) {
       // BASIC COMPARISONS
-
       case 'equal':
       case 'is':
         return {
@@ -1098,14 +1111,12 @@ export class FilterService {
         };
       }
 
-      // BUSINESS DAY OFFSET LOGIC (SKIPS WEEKENDS)
-      // ALWAYS ADJUST -1 DAY FOR DB SHIFT
       case 'is_before_business_days': {
         if (isNaN(numVal)) {
           throw new BadRequestException('Value must be a number');
         }
 
-        const targetDate = subtractBusinessDays(numVal);
+        const targetDate = moveBusinessDays(numVal);
 
         return {
           query: `${dateColumn} < :${key} AND EXTRACT(DOW FROM ${dateColumn}) NOT IN (0, 6)`,
@@ -1115,33 +1126,56 @@ export class FilterService {
 
       case 'is_after_business_days': {
         if (isNaN(numVal)) {
-          throw new BadRequestException(
-            'Value must be a number for is_after_business_days',
-          );
+          throw new BadRequestException('Value must be a number');
         }
 
-        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];
-        })();
+        const targetDate = moveBusinessDays(numVal);
 
         return {
           query: `${dateColumn} > :${key}`,
-          params: { [key]: businessAfter },
+          params: { [key]: targetDate },
         };
       }
 
+      // 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++;
+      //     }
+
+      //     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)) {