rez_core 5.0.73 → 5.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.73",
+  "version": "5.0.74",
   "description": "",
   "author": "",
   "private": false,
@@ -47,6 +47,7 @@
     "cron-parser": "^5.4.0",
     "crypto": "^1.0.1",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.19",
     "dotenv": "^16.4.7",
     "exceljs": "^4.4.0",
     "firebase-admin": "^13.5.0",

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

@@ -10,6 +10,7 @@ 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 {
@@ -1110,61 +1111,40 @@ export class FilterService {
       // ============================================
 
       case 'is_before_business_days': {
-        const days = Number(val);
-        const target = moveBusinessDays(new Date(), days, -1); // go backward
+        if (isNaN(numVal)) {
+          throw new BadRequestException('Value must be a number');
+        }
+
+        const targetDate = subtractBusinessDays(numVal);
 
-        // SQL: only match dates that are business days
         return {
-          query: `e.${attr} = :${key} AND EXTRACT(DOW FROM e.${attr}) NOT IN (0, 6)`,
-          params: { [key]: target.toISOString().split('T')[0] },
+          query: `${dateColumn} < :${key} AND EXTRACT(DOW FROM ${dateColumn}) NOT IN (0, 6)`,
+          params: { [key]: targetDate },
         };
       }
 
       case 'is_after_business_days': {
         const days = Number(val);
-        const target = moveBusinessDays(new Date(), days, +1); // go forward
-
-        return {
-          query: `e.${attr} = :${key} AND EXTRACT(DOW FROM e.${attr}) NOT IN (0, 6)`,
-          params: { [key]: target.toISOString().split('T')[0] },
-        };
-      }
-
-      // 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': {
-      //   const days = Number(val);
-
-      //   // Start from today
-      //   const targetDate = dayjs().startOf('day');
-      //   let count = 0;
+        // Start from today
+        const targetDate = dayjs().startOf('day');
+        let count = 0;
 
-      //   while (count < days) {
-      //     targetDate.add(1, 'day'); // move forward
-      //     const day = targetDate.day(); // 0 = Sun, 6 = Sat
+        while (count < days) {
+          targetDate.add(1, 'day'); // move forward
+          const day = targetDate.day(); // 0 = Sun, 6 = Sat
 
-      //     if (day !== 0 && day !== 6) {
-      //       // skip weekends
-      //       count++;
-      //     }
-      //   }
+          if (day !== 0 && day !== 6) {
+            // skip weekends
+            count++;
+          }
+        }
 
-      //   return {
-      //     query: `DATE(e.${attr}) > :${key}`,
-      //     params: { [key]: targetDate.format('YYYY-MM-DD') },
-      //   };
-      // }
+        return {
+          query: `DATE(e.${attr}) > :${key}`,
+          params: { [key]: targetDate.format('YYYY-MM-DD') },
+        };
+      }
 
       // case 'is_before_business_days': {
       //   if (isNaN(numVal)) {

package/src/module/integration/service/wrapper.service.ts

@@ -420,7 +420,7 @@ export class WrapperService {
             content: base64Content,
             type:
               response.headers['content-type'] || 'application/octet-stream',
-            filename: `attachment-${attachmentId}`,
+            filename: url.fileName,
             disposition: 'attachment',
           });
         }