rez_core 2.2.129 → 2.2.131

package/package.json

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

package/src/module/master/service/master.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { Brackets, EntityManager } from 'typeorm';
 import { ExcelUtil } from 'src/utils/service/excelUtil.service';
 import { EntityMasterService } from '../../meta/service/entity-master.service';
@@ -371,7 +371,10 @@ export class MasterService {
 
     // ✅ if any row failed, return errors instead of inserting
     if (errors.length > 0) {
-      return { message: 'Validation errors found', errors };
+      throw new BadRequestException({
+        message: 'Validation errors found',
+        errors,
+      });
     }
 
     // ✅ only upsert if no validation errors

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

@@ -23,11 +23,17 @@ 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;
+      mapped_entity_type: string;
+    },
   ) {
     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

@@ -60,4 +60,45 @@ export class StageRepository {
 
     return updatedStages;
   }
+
+  async getStageGroupsWithStagesByWorkflowId(
+    stage_group_id: number,
+    organization_id: number,
+  ): Promise<any[]> {
+    if (!stage_group_id) {
+      throw new BadRequestException('stage_group_id is required');
+    }
+
+    // 1. Find the stage group to get workflow_id
+    const stageGroup = (await this.dataSource.manager.findOne(
+      'cr_wf_stage_group',
+      {
+        where: { id: stage_group_id, organization_id },
+      },
+    )) as StageGroup;
+
+    if (!stageGroup) {
+      throw new NotFoundException('Stage group not found');
+    }
+
+    // 2. Fetch all groups + stages in one query
+    const rows = await this.dataSource.query(
+      `
+    SELECT 
+      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+      s.*
+    FROM cr_wf_stage_group g
+    LEFT JOIN cr_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = ? AND g.organization_id = ?
+    ORDER BY g.id, s.id
+    `,
+      [stageGroup.workflow_id, organization_id],
+    );
+
+    if (!rows || rows.length === 0) {
+      return [];
+    }
+
+    return rows;
+  }
 }

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

@@ -9,26 +9,54 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { StageRepository } from '../repository/stage.repository';
-import { DataSource } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { StageGroupRepository } from '../repository/stage-group.repository';
+import { InjectRepository } from '@nestjs/typeorm';
+import { StageMovementData } from '../entity/stage-movement-data.entity';
 
 @Injectable()
 export class StageService extends EntityServiceImpl {
   constructor(
     private readonly stageRepository: StageRepository,
     private readonly stageGroupRepository: StageGroupRepository,
+    @InjectRepository(StageMovementData)
+    private readonly stageMovementRepo: Repository<StageMovementData>,
     private readonly dataSource: DataSource,
     @Inject('ActionService')
     private readonly actionService: ActionService,
   ) {
     super();
   }
-  async getAllStage(stage_group_id: number, organization_id: number) {
-    const allStages = await this.stageRepository.getAllStage(
-      stage_group_id,
-      organization_id,
+
+  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.getStageGroupsWithStagesByWorkflowId(
+        stage_group_id,
+        organization_id,
+      );
+
+    if (allStageGrpData.length === 0) {
+      return [];
+    }
+
+    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 
@@ -36,16 +64,21 @@ export class StageService extends EntityServiceImpl {
       [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;
+    // 5. Enrich result in a single pass
+    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;
     }
 
-    return allStages;
+    return allStageGrpData;
   }
 
   async updateEntity(