rez_core 2.1.151 → 2.1.152

package/package.json

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

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

@@ -293,7 +293,7 @@ export class ActionService extends EntityServiceImpl {
         'ar.name AS action_requirement',
       ])
       .from('cr_wf_action', 'a')
-      .leftJoin('cr_wf_action_category', 'ac', 'ac.id = a.action_cat_id')
+      .leftJoin('cr_wf_action_category', 'ac', 'ac.id = a.action_category')
       .leftJoin(
         'cr_list_master_items',
         'ar',

package/src/module/workflow/service/workflow-list-master.service.ts

@@ -18,7 +18,7 @@ export class WorkflowListMasterService extends EntityServiceImpl {
         a.action_requirement AS actionRequirement
       FROM cr_wf_stage_action_mapping sam
       JOIN cr_wf_action a ON sam.action_id = a.id
-      JOIN cr_wf_action_category ac ON a.action_cat_id = ac.id
+      JOIN cr_wf_action_category ac ON a.action_category = ac.id
       WHERE sam.stage_id = ?
       `,
       [stageId],

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

@@ -1,7 +1,7 @@
 import { log } from 'console';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { Repository, DataSource } from 'typeorm';
 import { StageMovementData } from '../entity/stage-movement-data.entity';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { StageMovementRepository } from '../repository/stage-movement.repository';
@@ -13,6 +13,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
     @InjectRepository(StageMovementData)
     private readonly stageMovementRepo: Repository<StageMovementData>,
     private readonly stageMovementRepository: StageMovementRepository,
+    private readonly dataSource: DataSource,
   ) {
     super();
   }
@@ -51,8 +52,21 @@ export class WorkflowMetaService extends EntityServiceImpl {
       },
     });
 
+    if (!currentStage) {
+      // If no current stage found, return null
+      return null;
+    }
+
+    // get group name for the current stage
+    const getGroupName = await this.dataSource.query(
+      `SELECT name FROM cr_wf_stage_group WHERE id = ${currentStage?.stage_group_id}`,
+    );
+
     // Return the found or newly created current stage movement
-    return currentStage;
+    return {
+      ...currentStage,
+      stage_group_name: getGroupName[0]?.name,
+    };
   }
 
   /**
@@ -63,13 +77,21 @@ export class WorkflowMetaService extends EntityServiceImpl {
     // get all stage for that stage group
     const nextStage =
       await this.stageMovementRepository.getNextStageOrFirstOfNextGroup(
-        currentStage.stage_group_id,
-        currentStage.stage_id,
+        currentStage?.stage_group_id,
+        currentStage?.stage_id,
       );
 
+    if (!nextStage) {
+      return { hasNextStage: false, nextStage: null };
+    }
+
+    const groupName = await this.dataSource.query(
+      `SELECT name FROM cr_wf_stage_group WHERE id = ${nextStage?.stage_group_id}`,
+    );
+
     return {
       hasNextStage: !!nextStage,
-      nextStage: nextStage,
+      nextStage: { ...nextStage, stage_group_name: groupName[0]?.name },
     };
   }
 
@@ -141,7 +163,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
         current_user_id: loggedInUser.id,
         stage_action_mapping_id: nextStage.id,
         start_date: now,
-        stage_group_id: nextStage.stage_group_id,
+        stage_group_id: nextStage?.stage_group_id,
         stage_id: nextStage.id,
         is_current: 'Y',
       });