rez_core 2.2.80 → 2.2.81

package/package.json

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

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

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
 import { ActivityLog } from '../entity/activity-log.entity';
 import { Repository } from 'typeorm';
-import * as moment from 'moment';
+import * as moment from 'moment-timezone';
 
 export const ACTIVITY_CATEGORIES = {
   ASSIGN: 'ASSIGN',
@@ -78,7 +78,7 @@ export class ActivityLogRepository {
           user_name: rows.raw[i].user_name,
           profile, // whole JSON from media service
           created_date: entity.created_date
-            ? moment(entity.created_date).format('DD-MMM, hh:mm A')
+            ? moment(entity.created_date).local().format('DD-MMM, hh:mm A')
             : null,
         };
       }),

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

@@ -8,7 +8,7 @@ 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';
+import * as moment from 'moment-timezone';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -55,6 +55,7 @@ export class StageGroupService extends EntityServiceImpl {
 
     if (!workflowLevelMapping) return null;
 
+    // 3. Get lead status
     let leadStatus: string | null = null;
     const leadData = await this.dataSource.query(
       `SELECT lead_status FROM crm_lead WHERE id = ${lead_id}`,
@@ -70,7 +71,7 @@ export class StageGroupService extends EntityServiceImpl {
       }
     }
 
-    // 3. Fetch stage groups and their stages
+    // 4. Fetch stage groups & hierarchy
     const stageGroupAndStageHierarchy =
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
         workflowLevelMapping.workflow_id,
@@ -79,13 +80,13 @@ export class StageGroupService extends EntityServiceImpl {
         lead_id,
       )) as Array<{
         stages: any[];
-        stage_group_status?: string; // Extend type here to satisfy TS
-        [key: string]: any; // Allow additional dynamic props
+        stage_group_status?: string;
+        [key: string]: any;
       }>;
 
     if (stageGroupAndStageHierarchy.length === 0) return [];
 
-    // 4. Fetch all stage movement data for this lead
+    // 5. Get stage movement data
     const stageMovementData = await this.stageMovementRepo.find({
       where: {
         mapped_entity_type: 'LEAD',
@@ -95,12 +96,11 @@ export class StageGroupService extends EntityServiceImpl {
 
     if (stageMovementData.length === 0) {
       throw new BadGatewayException(
-        `No lead found with id ${lead_id} or no stage movements recorded for this lead
-        `,
+        `No lead found with id ${lead_id} or no stage movements recorded for this lead`,
       );
     }
 
-    // 5. Map: stage_id => movement data
+    // 6. Map stage_id => movement data
     const stageMovementMap = new Map<number, any>();
     for (const movement of stageMovementData) {
       stageMovementMap.set(movement.stage_id, movement);
@@ -108,6 +108,7 @@ export class StageGroupService extends EntityServiceImpl {
 
     let foundInProgressGroup = false;
 
+    // 7. Loop & apply IST conversions
     for (const group of stageGroupAndStageHierarchy) {
       for (const stage of group.stages || []) {
         const movement = stageMovementMap.get(Number(stage.id));
@@ -115,12 +116,15 @@ export class StageGroupService extends EntityServiceImpl {
         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')
+            ? moment.utc(movement.start_date).local().format('DD-MMM, hh:mm A')
             : null;
+
           stage.end_time = movement.end_date
-            ? moment(movement.end_date).format('DD-MMM, hh:mm A')
+            ? moment.utc(movement.end_date).local().format('DD-MMM, hh:mm A')
             : null;
+
           stage.time_spent = await this.calculateTimeSpent(
             movement.start_date,
             movement.end_date ?? new Date(),