rez_core 2.2.138 → 2.2.140

package/package.json

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

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

@@ -88,12 +88,27 @@ export class StageRepository {
       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 = ?
+    INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
     ORDER BY g.id, s.id
     `,
-      [stageGroup.workflow_id, organization_id],
+      [stageGroup.workflow_id, organization_id, stage_group_id],
     );
+    // const rows2 = 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
+    // INNER 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],
+    // );
+
+    console.log(rows, '-----------LEFT JOIN----------');
+    // console.log(rows2, '-----------INNER JOIN----------');
 
     if (!rows || rows.length === 0) {
       return [];

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

@@ -34,60 +34,61 @@ export class StageService extends EntityServiceImpl {
     organization_id: number,
   ) {
     // 1. Get all stages under the given stage_group_id
-    const allStageGrpData =
-      await this.stageRepository.getStageGroupsWithStagesByWorkflowId(
-        stage_group_id,
-        organization_id,
-      );
+    const allStageGrpData = await this.stageRepository.getAllStage(
+      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 
-     WHERE listtype = 'STS' AND organization_id = ?`,
-      [organization_id],
-    );
-
-    const statusMap = new Map(
-      statusListMaster.map((s) => [String(s.id), s.name]),
-    );
-
-    // 5. Enrich result but stop at is_current
-    const result: any[] = [];
-    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;
-      stage.full_name = `${stage.stage_group_name} - ${stage.name}`;
-
-      result.push(stage);
-
-      // stop once we hit the current stage
-      if (stage.is_current) {
-        break;
-      }
-    }
-
-    return result;
+    return allStageGrpData;
+
+    // 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
+    //  WHERE listtype = 'STS' AND organization_id = ?`,
+    //   [organization_id],
+    // );
+
+    // const statusMap = new Map(
+    //   statusListMaster.map((s) => [String(s.id), s.name]),
+    // );
+
+    // // 5. Enrich result but stop at is_current
+    // const result: any[] = [];
+    // 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;
+    //   stage.full_name = `${stage.stage_group_name} - ${stage.name}`;
+
+    //   result.push(stage);
+
+    //   // stop once we hit the current stage
+    //   if (stage.is_current) {
+    //     break;
+    //   }
+    // }
+
+    // return result;
   }
 
   async updateEntity(

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}