rez_core 2.2.52 → 2.2.53

package/package.json

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

package/src/module/workflow/repository/activity-log.repository.ts

@@ -10,11 +10,15 @@ export class ActivityLogRepository {
 
   async getAllActivityLog(mapped_entity_type: string, loggedInUser) {
     const { organization_id } = loggedInUser;
-    return this.activityLogRepository.find({
-      where: {
-        mapped_entity_type: mapped_entity_type,
-        organization_id: organization_id,
-      },
-    });
+
+    return this.activityLogRepository
+      .createQueryBuilder('log')
+      .leftJoin('cr_user', 'user', 'log.user_id = user.id')
+      .where('log.mapped_entity_type = :mapped_entity_type', {
+        mapped_entity_type,
+      })
+      .andWhere('log.organization_id = :organization_id', { organization_id })
+      .addSelect('user.name', 'user_name') // Add only user_name
+      .getRawMany();
   }
 }

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

@@ -56,33 +56,85 @@ export class StageGroupRepository {
 
     if (!stageGroups.length) return [];
 
-    // Step 2: Get all stages where stage_group_id IN (...)
+    // Step 2: Get all stages for these stage groups
     const stageGroupIds = stageGroups.map((sg) => sg.id);
 
     const stages = await this.dataSource.query(
       `
-  SELECT
-    cr_wf_stage.*,
-    cr_user.name AS created_by_name
-  FROM cr_wf_stage
-  LEFT JOIN cr_user ON cr_wf_stage.created_by = cr_user.id
-  WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
-    AND cr_wf_stage.organization_id = ?
-  ORDER BY cr_wf_stage.sequence ASC
-  `,
+    SELECT
+      cr_wf_stage.*,
+      cr_user.name AS created_by_name
+    FROM cr_wf_stage
+    LEFT JOIN cr_user ON cr_wf_stage.created_by = cr_user.id
+    WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
+      AND cr_wf_stage.organization_id = ?
+    ORDER BY cr_wf_stage.sequence ASC
+    `,
       [...stageGroupIds, organization_id],
     );
 
-    // Step 3: Group stages by stage_group_id
+    // Step 3: Get all counts in bulk
+    const stageIds = stages.map((s) => s.id);
+
+    // Task counts
+    const taskCounts = await this.dataSource.query(
+      `
+    SELECT stage_id, COUNT(*) AS task_count
+    FROM cr_wf_task_data
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')})
+    GROUP BY stage_id
+    `,
+      [...stageIds],
+    );
+
+    // Meeting counts
+    const meetingCounts = await this.dataSource.query(
+      `
+    SELECT stage_id, COUNT(*) AS meeting_count
+    FROM cr_lead_meeting
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')})
+    GROUP BY stage_id
+    `,
+      [...stageIds],
+    );
+
+    // Send communication counts
+    const sendCommCounts = 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 = 'SEND'
+    GROUP BY stage_id
+    `,
+      [...stageIds],
+    );
+
+    // Convert to maps for quick lookup
+    const taskCountMap = new Map(
+      taskCounts.map((row) => [row.stage_id, row.task_count]),
+    );
+    const meetingCountMap = new Map(
+      meetingCounts.map((row) => [row.stage_id, row.meeting_count]),
+    );
+    const sendCommCountMap = new Map(
+      sendCommCounts.map((row) => [row.stage_id, 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);
+      stage.task_count = taskCountMap.get(stageId) || 0;
+      stage.meeting_count = meetingCountMap.get(stageId) || 0;
+      stage.send_comm_count = sendCommCountMap.get(stageId) || 0;
+
       if (!stageMap.has(stage.stage_group_id)) {
         stageMap.set(stage.stage_group_id, []);
       }
       stageMap.get(stage.stage_group_id)?.push(stage);
     }
 
-    // Step 4: Attach stages to stage groups
+    // Step 5: Attach stages with counts to stage groups
     const result = stageGroups.map((stageGroup) => {
       return {
         ...stageGroup,