rez_core 5.0.43 → 5.0.46

package/package.json

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

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

@@ -46,9 +46,7 @@ export class FilterService {
         Object.entries(clause.params).forEach(([key, val]) => {
           if (Array.isArray(val)) {
             // Create ($1,$2,$3)
-            const placeholders = val
-              .map(() => `$${paramIndex++}`)
-              .join(', ');
+            const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
 
             parsedQuery = parsedQuery.replace(
               new RegExp(`:${key}`, 'g'),
@@ -328,7 +326,11 @@ export class FilterService {
       baseWhere.push({
         query:
           'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
-        params: { organization_id : String(organization_id), level_type, level_id },
+        params: {
+          organization_id: String(organization_id),
+          level_type,
+          level_id,
+        },
       });
     }
 
@@ -368,8 +370,7 @@ export class FilterService {
             query: `e.${attrName} = :${attrName}`,
             params: { [attrName]: attrValue }, // <-- string
           });
-        }
-        else if (key !== 'attributeValue') {
+        } else if (key !== 'attributeValue') {
           baseWhere.push({
             query: `e.${key} = :${key}`,
             params: { [key]: strValue }, // <-- string
@@ -486,9 +487,9 @@ export class FilterService {
 
     let query = await qb.getQuery();
 
-    console.log('------------------------------------------------------\n')
+    console.log('------------------------------------------------------\n');
     console.log(query);
-    console.log('\n------------------------------------------------------')
+    console.log('\n------------------------------------------------------');
     const entity_list = await qb.getRawMany();
 
     console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
@@ -763,7 +764,10 @@ export class FilterService {
   ) {
     return filters
       .map((f) => {
-        const clause = this.buildCondition(f, attributeMeta[f.filter_attribute]);
+        const clause = this.buildCondition(
+          f,
+          attributeMeta[f.filter_attribute],
+        );
 
         if (!clause) return null;
 
@@ -885,13 +889,16 @@ export class FilterService {
   }
 
   private buildDateCondition(attr: string, op: string, val: any, key: string) {
-    const dateColumn = `e.${attr}::date`;
-    const monthColumn = `date_trunc('month', e.${attr})::date`;
+    const dateColumn = `DATE(e.${attr})`;
+    const monthColumn = `DATE_TRUNC('month', e.${attr})`;
 
+    // convert to number when needed
     const numVal = Number(val);
 
     switch (op) {
-      // ===== BASIC COMPARISONS =====
+      // ============================================
+      // BASIC COMPARISONS
+      // ============================================
       case 'equal':
       case 'is':
         return {
@@ -925,64 +932,99 @@ export class FilterService {
           params: { [key]: val },
         };
 
-      // ===== MONTH COMPARISONS =====
-      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})::date`,
-            params: { [key]: target },
-          };
-        }
+      // ============================================
+      // EMPTY / NOT EMPTY
+      // ============================================
+      case 'empty':
         return {
-          query: `${monthColumn} < date_trunc('month', :${key})::date`,
-          params: { [key]: val },
+          query: `e.${attr} IS NULL OR e.${attr} = ''`,
+          params: {},
         };
 
-      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})::date`,
-            params: { [key]: target },
-          };
-        }
+      case 'not_empty':
         return {
-          query: `${monthColumn} > date_trunc('month', :${key})::date`,
-          params: { [key]: val },
+          query: `e.${attr} IS NOT NULL AND e.${attr} <> ''`,
+          params: {},
         };
 
-      // ===== DAY BEFORE / AFTER =====
+      // ============================================
+      // DAY OFFSET LOGIC (ALWAYS ADJUST -1 DAY)
+      // ============================================
       case 'is_day_before':
-        if (isNaN(numVal))
+        if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_day_before',
           );
+        }
+
+        const dayBefore = (() => {
+          const d = new Date();
+          d.setDate(d.getDate() - numVal - 1); // -1 because DB stores previous day
+          return d.toISOString().split('T')[0];
+        })();
 
-        const beforeDate = moment()
-          .subtract(numVal + 1, 'days')
-          .format('YYYY-MM-DD');
         return {
           query: `${dateColumn} < :${key}`,
-          params: { [key]: beforeDate },
+          params: { [key]: dayBefore },
         };
 
       case 'is_day_after':
-        if (isNaN(numVal))
+        if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_day_after',
           );
+        }
+
+        const dayAfter = (() => {
+          const d = new Date();
+          d.setDate(d.getDate() - 1 + numVal); // -1 because DB stores previous day
+          return d.toISOString().split('T')[0];
+        })();
 
-        const afterDate = moment().add(numVal + 1, 'days').format('YYYY-MM-DD');
         return {
           query: `${dateColumn} > :${key}`,
-          params: { [key]: afterDate },
+          params: { [key]: dayAfter },
+        };
+
+      // ============================================
+      // MONTH OFFSET LOGIC
+      // ============================================
+      case 'is_month_before':
+        if (isNaN(numVal)) {
+          throw new BadRequestException(
+            'Value must be a number for is_month_before',
+          );
+        }
+
+        const monthBefore = (() => {
+          const d = new Date();
+          d.setMonth(d.getMonth() - numVal);
+          d.setDate(d.getDate() - 1); // adjust -1 day for DB shift
+          return d.toISOString().split('T')[0];
+        })();
+
+        return {
+          query: `${monthColumn} < DATE_TRUNC('month', :${key})`,
+          params: { [key]: monthBefore },
+        };
+
+      case 'is_month_after':
+        if (isNaN(numVal)) {
+          throw new BadRequestException(
+            'Value must be a number for is_month_after',
+          );
+        }
+
+        const monthAfter = (() => {
+          const d = new Date();
+          d.setMonth(d.getMonth() + numVal);
+          d.setDate(d.getDate() - 1); // adjust -1 for DB shift
+          return d.toISOString().split('T')[0];
+        })();
+
+        return {
+          query: `${monthColumn} > DATE_TRUNC('month', :${key})`,
+          params: { [key]: monthAfter },
         };
 
       // ===== BETWEEN =====
@@ -1019,19 +1061,68 @@ export class FilterService {
         };
       }
 
-      // ===== EMPTY =====
-      case 'empty':
-      case 'is_empty':
+      // ============================================
+      // 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 for is_before_business_days',
+          );
+        }
+
+        const businessBefore = (() => {
+          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: `e.${attr} IS NULL`,
-          params: {},
+          query: `${dateColumn} < :${key}`,
+          params: { [key]: businessBefore },
         };
+      }
+
+      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];
+        })();
 
-      case 'not_empty':
         return {
-          query: `e.${attr} IS NOT NULL`,
-          params: {},
+          query: `${dateColumn} > :${key}`,
+          params: { [key]: businessAfter },
         };
+      }
 
       default:
         throw new BadRequestException(`Unsupported operator for date: ${op}`);
@@ -1135,7 +1226,7 @@ export class FilterService {
 
   async queryWithSchema(sql: string, params: any[] = []) {
     await this.dataSource.query('BEGIN');
-    const schema = this.configService.get<string>('DB_SCHEMA')
+    const schema = this.configService.get<string>('DB_SCHEMA');
     await this.dataSource.query(`SET LOCAL search_path TO ${schema}`);
     const result = await this.dataSource.query(sql, params);
     await this.dataSource.query('COMMIT');

package/src/module/workflow/service/populate-workflow.service.ts

@@ -110,7 +110,8 @@ export class PopulateWorkflowService extends EntityServiceImpl {
     const workflowLevelMappingRepo = this.reflectionHelper.getRepoService(
       'WorkflowLevelMappingEntity',
     );
-    const listMasterRepo = this.reflectionHelper.getRepoService('ListMaster');
+    const listMasterRepo =
+      this.reflectionHelper.getRepoService('ListMasterData');
     const actionCategoryRepo =
       this.reflectionHelper.getRepoService('ActionCategory');
     const viewMasterRepo = this.reflectionHelper.getRepoService('ViewMaster');