rez_core 2.2.141 → 2.2.142

package/package.json

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

package/src/module/workflow/controller/stage.controller.ts

@@ -23,17 +23,11 @@ export class StageController {
   @Post('/getAllStage')
   async getAllStage(
     @Req() req: Request & { user: any },
-    @Body()
-    body: {
-      stage_group_id: number;
-      mapped_entity_id: number;
-      mapped_entity_type: string;
-    },
+    @Body() body: { stage_group_id: number },
   ) {
     const { organization_id } = req.user.userData;
     return this.stageGroupService.getAllStage(
       body.stage_group_id,
-      body.mapped_entity_id,
       organization_id,
     );
   }

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

@@ -55,7 +55,7 @@ export class StageRepository {
     const updatedStages = result.map((stage) => ({
       ...stage,
       name: stage.name,
-      fullName: `${stageGroupName} - ${stage.name}`,
+      full_name: `${stageGroupName} - ${stage.name}`,
     }));
 
     return updatedStages;

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

@@ -28,67 +28,29 @@ export class StageService extends EntityServiceImpl {
     super();
   }
 
-  async getAllStage(
-    stage_group_id: number,
-    mapped_entity_id: number,
-    organization_id: number,
-  ) {
-    // 1. Get all stages under the given stage_group_id
-    const allStageGrpData = await this.stageRepository.getAllStage(
+  async getAllStage(stage_group_id: number, organization_id: number) {
+    const allStages = await this.stageRepository.getAllStage(
       stage_group_id,
       organization_id,
     );
 
-    if (allStageGrpData.length === 0) {
-      return [];
+    const statusListMaster = await this.dataSource.query(
+      `SELECT id, name 
+     FROM cr_list_master_items 
+     WHERE listtype = 'STS' AND organization_id = ?`,
+      [organization_id],
+    );
+
+    // Build a lookup map: id → name
+    const statusMap = new Map(
+      statusListMaster.map((s) => [String(s.id), s.name]),
+    );
+
+    for (const stage of allStages) {
+      stage.status = statusMap.get(String(stage.status)) as any;
     }
 
-    return allStageGrpData;
-
-    // const stageMovementData = await this.stageMovementRepo.find({
-    //   where: {
-    //     mapped_entity_type: 'LEAD',
-    //     mapped_entity_id,
-    //   },
-    // });
-
-    // // Build a lookup: stage_action_mapping_id → movement
-    // const stageMovementMap = new Map(
-    //   stageMovementData.map((s) => [Number(s.stage_action_mapping_id), s]),
-    // );
-
-    // // 4. Fetch statuses (id → name map)
-    // const statusListMaster = await this.dataSource.query(
-    //   `SELECT id, name
-    //  FROM cr_list_master_items
-    //  WHERE listtype = 'STS' AND organization_id = ?`,
-    //   [organization_id],
-    // );
-
-    // const statusMap = new Map(
-    //   statusListMaster.map((s) => [String(s.id), s.name]),
-    // );
-
-    // // 5. Enrich result but stop at is_current
-    // const result: any[] = [];
-    // for (const stage of allStageGrpData) {
-    //   // Attach human-readable status
-    //   stage.status = statusMap.get(String(stage.status)) || stage.status;
-
-    //   // Attach is_current flag
-    //   const movement = stageMovementMap.get(Number(stage.id));
-    //   stage.is_current = movement ? movement.is_current === 'Y' : false;
-    //   stage.full_name = `${stage.stage_group_name} - ${stage.name}`;
-
-    //   result.push(stage);
-
-    //   // stop once we hit the current stage
-    //   if (stage.is_current) {
-    //     break;
-    //   }
-    // }
-
-    // return result;
+    return allStages;
   }
 
   async updateEntity(