rez_core 3.1.125 → 3.1.127

package/package.json

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

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

@@ -6,6 +6,7 @@ import {
   HttpStatus,
   Inject,
   Post,
+  Query,
   Req,
   UseGuards,
 } from '@nestjs/common';
@@ -23,12 +24,14 @@ 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;
     return this.stageGroupService.getAllStage(
-      body.stage_group_id,
+      body,
       organization_id,
+      query.show_previous,
     );
   }
 

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

@@ -115,4 +115,58 @@ export class StageRepository {
 
     return rows;
   }
+
+  async getAllStageGroupAndStageByStageMovement(
+    stage_group_id: number,
+    organization_id: number,
+  ) {
+    // 1. Find the current stage group
+    const currentStageGroup = await this.dataSource.manager.findOne<any>(
+      'cr_wf_stage_group',
+      { where: { id: stage_group_id, organization_id } },
+    );
+
+    if (!currentStageGroup) {
+      return [];
+    }
+
+    // 2. Get all stage groups in the same workflow with sequence <= current
+    const stageGroups = await this.dataSource.manager.find<any>(
+      'cr_wf_stage_group',
+      {
+        where: {
+          workflow_id: currentStageGroup.workflow_id,
+          organization_id,
+        },
+        order: { sequence: 'ASC' },
+      },
+    );
+
+    // Filter only groups with sequence <= current
+    const eligibleGroups = stageGroups.filter(
+      (g) => g.sequence <= currentStageGroup.sequence,
+    );
+
+    const flatResults: any[] = [];
+
+    // 3. For each eligible group, fetch its stages
+    for (const group of eligibleGroups) {
+      const stages = await this.stageRepository.find({
+        where: { stage_group_id: group.id, organization_id },
+        order: { sequence: 'ASC' },
+      });
+
+      if (!stages || stages.length === 0) continue;
+
+      // 4. Flatten into result with full_name
+      for (const stage of stages) {
+        flatResults.push({
+          ...stage,
+          full_name: `${group.name} - ${stage.name}`,
+        });
+      }
+    }
+
+    return flatResults;
+  }
 }

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

@@ -3,6 +3,7 @@ import {
   BadRequestException,
   Inject,
   Injectable,
+  Logger,
   NotFoundException,
 } from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
@@ -16,6 +17,8 @@ import { StageMovementData } from '../entity/stage-movement-data.entity';
 
 @Injectable()
 export class StageService extends EntityServiceImpl {
+  private readonly logger = new Logger(StageService.name);
+
   constructor(
     private readonly stageRepository: StageRepository,
     private readonly stageGroupRepository: StageGroupRepository,
@@ -28,29 +31,85 @@ export class StageService extends EntityServiceImpl {
     super();
   }
 
-  async getAllStage(stage_group_id: number, organization_id: number) {
-    const allStages = await this.stageRepository.getAllStage(
-      stage_group_id,
-      organization_id,
-    );
+  async getAllStage(
+    payload: {
+      stage_group_id: number;
+      mapped_entity_id: number;
+    },
+    organization_id: number,
+    show_previous: boolean,
+  ) {
+    if (!show_previous) {
+      const allStages = await this.stageRepository.getAllStage(
+        payload.stage_group_id,
+        organization_id,
+      );
+
+      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;
+      }
 
-    const statusListMaster = await this.dataSource.query(
-      `SELECT id, name 
-     FROM cr_list_master_items 
-     WHERE listtype = 'STS' AND organization_id = ?`,
-      [organization_id],
-    );
+      return allStages;
+    }
 
-    // Build a lookup map: id → name
-    const statusMap = new Map(
-      statusListMaster.map((s) => [String(s.id), s.name]),
+    // 1. Get all stages up to the current stage group
+    const allStageWithStageGroup =
+      await this.stageRepository.getAllStageGroupAndStageByStageMovement(
+        payload.stage_group_id,
+        organization_id,
+      );
+
+    // 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',
     );
 
-    for (const stage of allStages) {
-      stage.status = statusMap.get(String(stage.status)) as any;
+    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 allStages;
+    return filteredStages;
   }
 
   async updateEntity(
@@ -119,7 +178,7 @@ export class StageService extends EntityServiceImpl {
         allStages.push(...stages);
       } catch (err) {
         if (err instanceof NotFoundException) {
-          console.warn(`No stages for group ID ${groupId}`);
+          this.logger.warn(`No stages for group ID ${groupId}`);
           continue;
         }
         throw err;