rez_core 2.2.39 → 2.2.41

package/package.json

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

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

@@ -32,13 +32,17 @@ export class StageGroupController {
     );
   }
 
-  @Post('/get-all-stage-groups-and-stages')
+  @Post('/get-workflow-stage-hierarchy')
   @HttpCode(HttpStatus.OK)
-  async getAllStageGroupAndStageHierarchy(@Req() req: Request & { user: any }) {
+  async getAllStageGroupAndStageHierarchy(
+    @Req() req: Request & { user: any },
+    @Body() body: { lead_id: number },
+  ) {
     const loggedInUser = req.user.userData;
 
     return this.stageGroupService.getAllStageGroupAndStageHierarchy(
       loggedInUser,
+      body.lead_id,
     );
   }
 }

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

@@ -61,11 +61,15 @@ export class StageGroupRepository {
 
     const stages = await this.dataSource.query(
       `
-    SELECT * FROM cr_wf_stage
-    WHERE stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
-      AND organization_id = ?
-    ORDER BY 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],
     );
 

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

@@ -27,8 +27,13 @@ export class ActionService extends EntityServiceImpl {
     }
 
     const result = await this.dataSource.query(
-      `SELECT template_code, form_id FROM cr_wf_action_resources_mapping WHERE stg_act_mapping_id =
-        (SELECT id FROM cr_wf_stage_action_mapping WHERE action_id = ? AND entity_type = 'STGM')`,
+      `SELECT template_code, form_id 
+   FROM cr_wf_action_resources_mapping 
+   WHERE stg_act_mapping_id IN (
+     SELECT id 
+     FROM cr_wf_stage_action_mapping 
+     WHERE action_id = ? AND entity_type = 'STGM'
+   )`,
       [actionData.id],
     );
 

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

@@ -7,6 +7,8 @@ import { StageService } from './stage.service';
 import { DataSource, Repository } from 'typeorm';
 import { WorkflowLevelMappingEntity } from '../entity/workflow-level-mapping.entity';
 import { InjectRepository } from '@nestjs/typeorm';
+import { StageMovementData } from '../entity/stage-movement-data.entity';
+import * as moment from 'moment';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -17,6 +19,8 @@ export class StageGroupService extends EntityServiceImpl {
     private readonly dataSource: DataSource,
     @InjectRepository(WorkflowLevelMappingEntity)
     private readonly workflowLevelMappingRepo: Repository<WorkflowLevelMappingEntity>,
+    @InjectRepository(StageMovementData)
+    private readonly stageMovementRepo: Repository<StageMovementData>,
   ) {
     super();
   }
@@ -27,8 +31,11 @@ export class StageGroupService extends EntityServiceImpl {
     );
   }
 
-  async getAllStageGroupAndStageHierarchy(loggedInUser: UserData) {
-    // Try finding mapping at user's level
+  async getAllStageGroupAndStageHierarchy(
+    loggedInUser: UserData,
+    lead_id: number,
+  ) {
+    // 1. Find workflow mapping at user level
     let workflowLevelMapping = await this.workflowLevelMappingRepo.findOne({
       where: {
         mapped_level_type: loggedInUser.level_type,
@@ -36,7 +43,7 @@ export class StageGroupService extends EntityServiceImpl {
       },
     });
 
-    // If not found, fallback to organization-level mapping
+    // 2. Fallback to organization level if not found
     if (!workflowLevelMapping) {
       workflowLevelMapping = await this.workflowLevelMappingRepo.findOne({
         where: {
@@ -46,13 +53,96 @@ export class StageGroupService extends EntityServiceImpl {
       });
     }
 
-    // If still not found, return null
     if (!workflowLevelMapping) return null;
 
-    return await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
-      workflowLevelMapping.workflow_id,
-      loggedInUser.organization_id,
-    );
+    // 3. Fetch stage groups and their stages
+    const stageGroupAndStageHierarchy =
+      (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
+        workflowLevelMapping.workflow_id,
+        loggedInUser.organization_id,
+      )) as Array<{
+        stages: any[];
+        stage_group_status?: string; // Extend type here to satisfy TS
+        [key: string]: any; // Allow additional dynamic props
+      }>;
+
+    if (stageGroupAndStageHierarchy.length === 0) return [];
+
+    // 4. Fetch all stage movement data for this lead
+    const stageMovementData = await this.stageMovementRepo.find({
+      where: {
+        mapped_entity_type: 'LEAD',
+        mapped_entity_id: lead_id,
+      },
+    });
+
+    // 5. Map: stage_id => movement data
+    const stageMovementMap = new Map<number, any>();
+    for (const movement of stageMovementData) {
+      stageMovementMap.set(movement.stage_id, movement);
+    }
+
+    // 6. Attach movement info to each stage
+    for (const group of stageGroupAndStageHierarchy) {
+      for (const stage of group.stages || []) {
+        const movement = stageMovementMap.get(Number(stage.id));
+
+        if (movement) {
+          stage.is_current = movement.is_current === 'Y';
+          stage.is_done = movement.is_current === 'N';
+          stage.start_time = movement.start_date
+            ? moment(movement.start_date).format('DD-MMM, hh:mm A')
+            : null;
+          stage.end_time = movement.end_date
+            ? moment(movement.end_date).format('DD-MMM, hh:mm A')
+            : null;
+          stage.time_spent = await this.calculateTimeSpent(
+            movement.start_date,
+            movement.end_date ?? new Date(), // fallback to current datetime
+          );
+        } else {
+          stage.is_current = false;
+          stage.is_done = false;
+          stage.start_time = null;
+          stage.end_time = null;
+          stage.time_spent = null;
+          stage.created_by_name = null;
+        }
+      }
+
+      // 7. Set stage_group_status based on all its stages
+      group.stage_group_status =
+        group.stages && group.stages.length > 0
+          ? group.stages.every((stage) => stage.is_done)
+            ? 'COMPLETED'
+            : 'IN_PROGRESS'
+          : 'NOT_STARTED';
+    }
+
+    return stageGroupAndStageHierarchy;
+  }
+
+  async calculateTimeSpent(
+    start: Date | string,
+    end?: Date | string,
+  ): Promise<string> {
+    const startMoment = moment(start);
+    const endMoment = end ? moment(end) : moment();
+
+    const duration = moment.duration(endMoment.diff(startMoment));
+    const days = duration.asDays();
+
+    if (days > 7) {
+      return startMoment.format('DD-MMM-YYYY');
+    } else if (days >= 1) {
+      return `${Math.floor(days)} days`;
+    } else if (duration.asHours() >= 1) {
+      return `${Math.floor(duration.asHours())} hours`;
+    } else if (duration.asMinutes() >= 1) {
+      return `${Math.floor(duration.asMinutes())} mins`;
+    } else {
+      return `${Math.floor(duration.asSeconds())} sec`;
+    }
   }
 
   async updateEntity(