rez_core 2.2.69 → 2.2.70

package/package.json

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

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

@@ -43,6 +43,7 @@ export class StageGroupRepository {
   async getAllStageGroupAndStageHierarchy(
     workflow_id: number,
     organization_id: number,
+    lead_id: number,
   ) {
     if (!workflow_id) {
       throw new BadRequestException('workflow_id is required');
@@ -81,10 +82,10 @@ export class StageGroupRepository {
       `
     SELECT stage_id, COUNT(*) AS task_count
     FROM cr_wf_task_data
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
     GROUP BY stage_id
     `,
-      [...stageIds],
+      [...stageIds, lead_id],
     );
 
     // Meeting counts
@@ -92,10 +93,10 @@ export class StageGroupRepository {
       `
     SELECT stage_id, COUNT(*) AS meeting_count
     FROM cr_lead_meeting
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')})
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND lead_id = ?
     GROUP BY stage_id
     `,
-      [...stageIds],
+      [...stageIds, lead_id],
     );
 
     // Send communication counts
@@ -103,38 +104,36 @@ export class StageGroupRepository {
       `
     SELECT stage_id, COUNT(*) AS send_comm_count
     FROM cr_lead_communication
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) 
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND lead_id = ?
     AND type IN ('SEND', 'LOG')
     GROUP BY stage_id
     `,
-      [...stageIds],
-    );
-
-    const logIntCounts = await this.dataSource.query(
-      `
-    SELECT stage_id, COUNT(*) AS send_comm_count
-    FROM cr_lead_communication
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND type = 'LOG'
-    GROUP BY stage_id
-    `,
-      [...stageIds],
+      [...stageIds, lead_id],
     );
 
+    // Convert to maps for quick lookup
     // Convert to maps for quick lookup
     const taskCountMap = new Map(
-      taskCounts.map((row) => [row.stage_id, row.task_count]),
+      taskCounts.map((row) => [Number(row.stage_id), Number(row.task_count)]),
     );
     const meetingCountMap = new Map(
-      meetingCounts.map((row) => [row.stage_id, row.meeting_count]),
+      meetingCounts.map((row) => [
+        Number(row.stage_id),
+        Number(row.meeting_count),
+      ]),
     );
     const sendCommCountMap = new Map(
-      sendCommCounts.map((row) => [row.stage_id, row.send_comm_count]),
+      sendCommCounts.map((row) => [
+        Number(row.stage_id),
+        Number(row.send_comm_count),
+      ]),
     );
 
     // Step 4: Add counts to each stage
     const stageMap = new Map<number, any[]>();
     for (const stage of stages) {
-      const stageId = Number(stage.id);
+      const stageId = Number(stage.id); // ensure number
+
       stage.task_count = taskCountMap.get(stageId) || 0;
       stage.meeting_count = meetingCountMap.get(stageId) || 0;
       stage.send_comm_count = sendCommCountMap.get(stageId) || 0;

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

@@ -75,6 +75,7 @@ export class StageGroupService extends EntityServiceImpl {
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
         workflowLevelMapping.workflow_id,
         loggedInUser.organization_id,
+        lead_id,
       )) as Array<{
         stages: any[];
         stage_group_status?: string; // Extend type here to satisfy TS