rez_core 5.0.96 → 5.0.98

package/package.json

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

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

@@ -982,9 +982,12 @@ export class FilterService {
 
         const dayBefore = (() => {
           const d = new Date();
-          d.setDate(d.getDate() - numVal);
-          return d.toISOString().split('T')[0];
+          d.setDate(d.getDate() - (numVal));
+        
+          // Format as YYYY-MM-DD in IST
+          return d.toLocaleDateString('en-CA', { timeZone: 'Asia/Kolkata' });
         })();
+        
 
         return {
           query: `${dateColumn} <= :${key}`,

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

@@ -8,9 +8,7 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
 import { FORM_STATUS_TO_BE_SENT } from 'src/constant/global.constant';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
-import {
-  WorkflowAutomationEngineService,
-} from 'src/module/workflow-automation/service/workflow-automation-engine.service';
+import { WorkflowAutomationEngineService } from 'src/module/workflow-automation/service/workflow-automation-engine.service';
 
 @Injectable()
 export class ActionDataRepository extends EntityServiceImpl {
@@ -38,7 +36,8 @@ export class ActionDataRepository extends EntityServiceImpl {
 
     if (action.length > 0) {
       for (const act of action) {
-        const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+        const listMasterItemsRepo =
+          this.reflectionHelper.getRepoService('ListMasterItems');
         const is_mandatory = await listMasterItemsRepo.findOne({
           where: {
             id: act.action_requirement,
@@ -103,7 +102,8 @@ export class ActionDataRepository extends EntityServiceImpl {
           );
           // THEN INSERT SDFM IN RELATION TASK TABLE
 
-          const entityRelationRepo = this.reflectionHelper.getRepoService('EntityRelation');
+          const entityRelationRepo =
+            this.reflectionHelper.getRepoService('EntityRelation');
           let relationData = await entityRelationRepo.findOne({
             where: {
               source_entity_type: createdEntity.mapped_entity_type,
@@ -112,7 +112,8 @@ export class ActionDataRepository extends EntityServiceImpl {
           });
 
           if (relationData) {
-            const entityRelationDataRepo = this.reflectionHelper.getRepoService('EntityRelationData');
+            const entityRelationDataRepo =
+              this.reflectionHelper.getRepoService('EntityRelationData');
 
             await entityRelationDataRepo.save({
               organization_id: loggedInUser.organization_id,
@@ -261,7 +262,8 @@ export class ActionDataRepository extends EntityServiceImpl {
         task.is_done = false;
 
         // Reset status (optional: set to something like 'pending' if needed)
-        const listMasterItemRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+        const listMasterItemRepo =
+          this.reflectionHelper.getRepoService('ListMasterItems');
         const listMasterItem = await listMasterItemRepo.findOne({
           where: {
             code: 'in_progress',
@@ -313,7 +315,7 @@ export class ActionDataRepository extends EntityServiceImpl {
       console.error('Internal Entity API call failed:', error.message);
     }
 
-    const org_slug = organizationData[0]?.slug;
+    const org_slug = organizationData?.slug;
 
     // fetch required var from config or env
     const profile = this.configService.get('PROFILE');

package/src/module/workflow/repository/stage-movement.repository.ts

@@ -189,7 +189,7 @@ export class StageMovementRepository {
     const actionRepo = this.reflectionHelper.getRepoService('ActionEntity');
     const result = await actionRepo
       .createQueryBuilder('a')
-      .leftJoin(
+      .innerJoin(
         'frm_wf_stage_action_mapping',
         'm',
         'a.id = m.action_id::bigint',
@@ -199,12 +199,18 @@ export class StageMovementRepository {
         'ac',
         'a.action_category::bigint = ac.id',
       )
+      .leftJoin(
+        'frm_wf_action_resources_mapping',
+        'arm',
+        'm.id = arm.stg_act_mapping_id::bigint',
+      )
       .where('m.stage_id::bigint = :stageId', { stageId: Number(stageId) })
       .select([
-        'a.*', // select all columns from action table
+        'a.*',
         'm.id AS mapping_id',
         'm.stage_id AS stage_id',
         'ac.code AS action_category_code',
+        'arm.form_id AS form_id',
       ])
       .orderBy('a.sequence', 'ASC')
       .getRawMany();

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -116,16 +116,25 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
         'ct.name AS label',
         'ct.id AS id',
       ])
+      .innerJoin(
+        'frm_list_master_items',
+        'fmi',
+        `fmi.id = ct.status::bigint 
+     AND fmi.code = 'STATUS_ACTIVE'
+     AND fmi.organization_id::text = :orgId`,
+        { orgId: String(loggedInUser.organization_id) }
+      )
       .where('ct.code IN (:...codes)', { codes: templateCodes })
       .andWhere('ct.mode::text = :mode', { mode: String(mode) })
-      .andWhere('ct.organization_id = :orgId', { orgId: loggedInUser.organization_id })
-      .andWhere('ct.level_type = :levelType', { levelType: loggedInUser.level_type })
-      .andWhere('ct.level_id = :levelId', { levelId: Number(loggedInUser.level_id) })
-      .andWhere(`ct.status IN (
-      SELECT id FROM frm_list_master_items 
-      WHERE code = 'STATUS_ACTIVE' 
-        AND organization_id = :orgId2
-    )`, { orgId2: loggedInUser.organization_id })
+      .andWhere('ct.organization_id::text = :orgId', {
+        orgId: String(loggedInUser.organization_id),
+      })
+      .andWhere('ct.level_type = :levelType', {
+        levelType: loggedInUser.level_type,
+      })
+      .andWhere('ct.level_id::text = :levelId', {
+        levelId: String(loggedInUser.level_id),
+      })
       .getRawMany();
   }
 }