rez_core 5.0.53 → 5.0.55

package/package.json

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

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

@@ -895,6 +895,24 @@ export class FilterService {
     // convert to number when needed
     const numVal = Number(val);
 
+    // INSIDE buildDateCondition
+    const subtractBusinessDays = (days: number): string => {
+      let d = new Date();
+      let count = 0;
+
+      while (count < days) {
+        d.setDate(d.getDate() - 1);
+
+        const day = d.getDay(); // 0 = Sunday, 6 = Saturday
+
+        if (day !== 0 && day !== 6) {
+          count++;
+        }
+      }
+
+      return d.toISOString().split('T')[0];
+    };
+
     switch (op) {
       // ============================================
       // BASIC COMPARISONS
@@ -1070,30 +1088,14 @@ export class FilterService {
 
       case 'is_before_business_days': {
         if (isNaN(numVal)) {
-          throw new BadRequestException(
-            'Value must be a number for is_before_business_days',
-          );
+          throw new BadRequestException('Value must be a number');
         }
 
-        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];
-        })();
+        const targetDate = subtractBusinessDays(numVal);
 
         return {
           query: `${dateColumn} < :${key}`,
-          params: { [key]: businessBefore },
+          params: { [key]: targetDate },
         };
       }
 

package/src/module/workflow/repository/action-category.repository.ts

@@ -57,15 +57,15 @@ export class ActionCategoryRepository {
   async actionscategoryinfo(entity_type: string) {
     const result = await this.actionCategoryRepository
       .createQueryBuilder('ac')
-      .select(['ac.id', 'ac.name', 'ac.logo', 'ac.modalName'])
+      .select('ac.*')
       .where('ac.mapped_entity_type = :entityType', { entityType: entity_type })
       .getRawMany();
 
     const mapped = result.map((row) => ({
-      label: row.ac_name,
-      logo: row.ac_logo,
-      modalName: row.ac_modalName,
-      value: String(row.ac_id),
+      label: row.name,
+      logo: row.logo,
+      modalname: row.modalname,
+      value: String(row.id),
     }));
 
     return mapped.reduce(

package/src/module/workflow/repository/action.repository.ts

@@ -224,12 +224,13 @@ export class ActionRepository {
   ) {
     // Step 1: Get all action mappings for the stage
 
-    const stageActionMappingRepo = this.reflectionHelper.getRepoService('StageActionMapping');
+    const stageActionMappingRepo =
+      this.reflectionHelper.getRepoService('StageActionMapping');
     const stageActions = await stageActionMappingRepo.find({
       where: {
-        stage_id: stage_id
-      }
-    })
+        stage_id: stage_id,
+      },
+    });
 
     if (!stageActions?.length) {
       return [
@@ -260,7 +261,11 @@ export class ActionRepository {
         'a.dependent_action_id AS dependent_action_id',
       ])
       .from('frm_wf_action', 'a')
-      .leftJoin('frm_wf_action_category', 'ac', 'ac.id::text = a.action_category')
+      .leftJoin(
+        'frm_wf_action_category',
+        'ac',
+        'ac.id::text = a.action_category',
+      )
       .where('a.organization_id = :orgId', { orgId: organization_id })
       .andWhere('a.id IN (:...actionIds)', { actionIds })
       .getRawMany();