rez_core 5.0.52 → 5.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.52",
+  "version": "5.0.54",
   "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.repository.ts

@@ -8,6 +8,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
 import { ActionEntity } from '../entity/action.entity';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class ActionRepository {
@@ -15,6 +16,7 @@ export class ActionRepository {
     @InjectRepository(ActionEntity)
     private readonly actionRepository: Repository<ActionEntity>,
     private readonly dataSource: DataSource,
+    private readonly reflectionHelper: ReflectionHelper,
   ) {}
 
   async getReasonCode(loggedInUser: UserData): Promise<any> {
@@ -221,10 +223,14 @@ export class ActionRepository {
     mapped_entity_type: string,
   ) {
     // Step 1: Get all action mappings for the stage
-    const stageActions = await this.dataSource.query(
-      `SELECT id, action_id FROM frm_wf_stage_action_mapping WHERE stage_id = $1`,
-      [stage_id],
-    );
+
+    const stageActionMappingRepo =
+      this.reflectionHelper.getRepoService('StageActionMapping');
+    const stageActions = await stageActionMappingRepo.find({
+      where: {
+        stage_id: stage_id,
+      },
+    });
 
     if (!stageActions?.length) {
       return [
@@ -249,13 +255,17 @@ export class ActionRepository {
         'a.mode AS mode',
         'a.action_category AS action_category_id',
         'ac.reason_code AS category_reason_code',
-        'ac.modalName AS modalName',
+        'ac.modalname AS modalname',
         'ac.logo AS logo',
         'ac.name AS action_category_name',
         '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::text')
+      .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();
@@ -300,7 +310,7 @@ export class ActionRepository {
         value: row.action_id,
         dependent_action_id: row.dependent_action_id,
         label: row.action_name,
-        modalName: row.modalName,
+        modalname: row.modalname,
         logo: row.logo,
         mode: row.mode,
         name: row.action_category_name,