rez_core 3.1.126 → 3.1.127

package/package.json

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

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

@@ -24,7 +24,7 @@ export class StageController {
   @Post('/getAllStage')
   async getAllStage(
     @Req() req: Request & { user: any },
-    @Body() body: { stage_group_id: number },
+    @Body() body: { stage_group_id: number; mapped_entity_id: number },
     @Query() query: { show_previous: boolean },
   ) {
     const { organization_id } = req.user.userData;

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

@@ -34,6 +34,7 @@ export class StageService extends EntityServiceImpl {
   async getAllStage(
     payload: {
       stage_group_id: number;
+      mapped_entity_id: number;
     },
     organization_id: number,
     show_previous: boolean,
@@ -63,15 +64,52 @@ export class StageService extends EntityServiceImpl {
       return allStages;
     }
 
+    // 1. Get all stages up to the current stage group
     const allStageWithStageGroup =
       await this.stageRepository.getAllStageGroupAndStageByStageMovement(
         payload.stage_group_id,
         organization_id,
       );
 
-    this.logger.debug('allStageWithStageGroup', allStageWithStageGroup);
+    // 2. Get stage movement history for this entity
+    const allStageMovementData = await this.dataSource.manager.find<{
+      id: number;
+      stage_group_id: number;
+      stage_id: number;
+      mapped_entity_id: number;
+      mapped_entity_type: string;
+      is_current: string;
+    }>('cr_wf_stage_movement_data', {
+      where: {
+        mapped_entity_id: payload.mapped_entity_id,
+        mapped_entity_type: 'LEAD',
+      },
+      order: { id: 'ASC' },
+    });
+
+    if (!allStageMovementData || allStageMovementData.length === 0) {
+      return allStageWithStageGroup;
+    }
+
+    // 3. Find the current stage movement (is_current === 'Y')
+    const currentMovement = allStageMovementData.find(
+      (m) => m.is_current === 'Y',
+    );
+
+    if (!currentMovement) {
+      return allStageWithStageGroup;
+    }
+
+    // 4. Filter stages up to and including the current stage_id
+    const filteredStages: any[] = [];
+    for (const stage of allStageWithStageGroup) {
+      filteredStages.push(stage);
+      if (stage.id === currentMovement.stage_id) {
+        break; // stop once we reach the current stage
+      }
+    }
 
-    return allStageWithStageGroup;
+    return filteredStages;
   }
 
   async updateEntity(