rez_core 4.0.290 → 4.0.291

package/package.json

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

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

@@ -851,6 +851,8 @@ export class FilterService {
     const dateColumn = `DATE(e.${attr})`;
     const monthColumn = `DATE_TRUNC('month', e.${attr})`;
 
+    const numVal = Number(val);
+
     switch (op) {
       // ===== BASIC COMPARISONS =====
       case 'equal':
@@ -886,19 +888,66 @@ export class FilterService {
           params: { [key]: val },
         };
 
-      // ===== MONTH COMPARISONS =====
+      // ===== MONTH COMPARISONS (NUMERIC OR DATE) =====
       case 'is_month_before':
+        if (!isNaN(numVal)) {
+          const target = moment()
+            .subtract(numVal, 'months')
+            .startOf('month')
+            .format('YYYY-MM-DD');
+          return {
+            query: `${monthColumn} < DATE_TRUNC('month', :${key})`,
+            params: { [key]: target },
+          };
+        }
         return {
           query: `${monthColumn} < DATE_TRUNC('month', :${key})`,
           params: { [key]: val },
         };
 
       case 'is_month_after':
+        if (!isNaN(numVal)) {
+          const target = moment()
+            .add(numVal, 'months')
+            .startOf('month')
+            .format('YYYY-MM-DD');
+          return {
+            query: `${monthColumn} > DATE_TRUNC('month', :${key})`,
+            params: { [key]: target },
+          };
+        }
         return {
           query: `${monthColumn} > DATE_TRUNC('month', :${key})`,
           params: { [key]: val },
         };
 
+      // ===== DAY BEFORE / AFTER WITH MOMENT =====
+      case 'is_day_before':
+        if (isNaN(numVal))
+          throw new BadRequestException(
+            'Value must be a number for is_day_before',
+          );
+
+        return {
+          query: `${dateColumn} < :${key}`,
+          params: {
+            [key]: moment().subtract(numVal, 'days').format('YYYY-MM-DD'),
+          },
+        };
+
+      case 'is_day_after':
+        if (isNaN(numVal))
+          throw new BadRequestException(
+            'Value must be a number for is_day_after',
+          );
+
+        return {
+          query: `${dateColumn} > :${key}`,
+          params: {
+            [key]: moment().add(numVal, 'days').format('YYYY-MM-DD'),
+          },
+        };
+
       // ===== BETWEEN =====
       case 'between': {
         if (typeof val === 'string') {
@@ -924,17 +973,18 @@ export class FilterService {
         };
       }
 
-      // ===== TODAY KEYWORD =====
+      // ===== TODAY =====
       case 'today': {
-        const today = new Date().toISOString().split('T')[0];
+        const today = moment().format('YYYY-MM-DD');
         return {
           query: `${dateColumn} = :today`,
           params: { today },
         };
       }
 
-      // ===== EMPTY / NOT EMPTY =====
+      // ===== EMPTY =====
       case 'empty':
+      case 'is_empty':
         return {
           query: `e.${attr} IS NULL`,
           params: {},
@@ -946,7 +996,6 @@ export class FilterService {
           params: {},
         };
 
-      // ===== UNSUPPORTED =====
       default:
         throw new BadRequestException(`Unsupported operator for date: ${op}`);
     }