rez_core 5.0.249 → 5.0.251

package/package.json

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

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

@@ -934,18 +934,32 @@ export class FilterService {
     const numVal = Number(val);
 
     // INSIDE buildDateCondition
-    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];
@@ -1006,7 +1020,7 @@ export class FilterService {
       // ============================================
       // DAY OFFSET LOGIC (ALWAYS ADJUST -1 DAY)
       // ============================================
-      case 'is_day_before':
+      case 'is_day_before': {
         if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_day_before',
@@ -1015,18 +1029,23 @@ export class FilterService {
 
         const dayBefore = (() => {
           const d = new Date();
-          d.setDate(d.getDate() - numVal);
 
-          // Format as YYYY-MM-DD in IST
-          return d.toLocaleDateString('en-CA', { timeZone: 'Asia/Kolkata' });
+          if (numVal >= 0) {
+            d.setDate(d.getDate() + numVal);
+          } else {
+            d.setDate(d.getDate() - Math.abs(numVal));
+          }
+
+          return d.toISOString().split('T')[0];
         })();
 
         return {
-          query: `${dateColumn} <= :${key}`,
+          query: `${dateColumn} < :${key}`,
           params: { [key]: dayBefore },
         };
+      }
 
-      case 'is_day_after':
+      case 'is_day_after': {
         if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_day_after',
@@ -1035,7 +1054,13 @@ export class FilterService {
 
         const dayAfter = (() => {
           const d = new Date();
-          d.setDate(d.getDate() - 1 + numVal); // -1 because DB stores previous day
+
+          if (numVal >= 0) {
+            d.setDate(d.getDate() + numVal);
+          } else {
+            d.setDate(d.getDate() - Math.abs(numVal));
+          }
+
           return d.toISOString().split('T')[0];
         })();
 
@@ -1043,6 +1068,7 @@ export class FilterService {
           query: `${dateColumn} > :${key}`,
           params: { [key]: dayAfter },
         };
+      }
 
       // ============================================
       // MONTH OFFSET LOGIC
@@ -1131,7 +1157,7 @@ export class FilterService {
           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)`,
@@ -1141,30 +1167,14 @@ 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 },
         };
       }
 

package/src/module/meta/service/media-data.service.ts

@@ -168,8 +168,7 @@ export class MediaDataService extends EntityServiceImpl {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
         Expires: Number(expiresIn) || 60 * 5,
-        // ResponseContentDisposition: 'inline',
-        ResponseContentDisposition: `attachment; filename="${mediaData.file_name}"`,
+        ResponseContentDisposition: 'inline',
       });
       return {
         signedUrl,