rez_core 2.2.81 → 2.2.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.81",
+  "version": "2.2.83",
   "description": "",
   "author": "",
   "private": false,
@@ -44,6 +44,7 @@
     "exceljs": "^4.4.0",
     "handlebars": "^4.7.8",
     "moment": "^2.30.1",
+    "moment-timezone": "^0.6.0",
     "multer": "^1.4.5-lts.2",
     "mysql2": "^3.12.0",
     "nodemailer": "^7.0.5",

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-timezone';
+import * as moment from 'moment';
 
 export const ACTIVITY_CATEGORIES = {
   ASSIGN: 'ASSIGN',
@@ -15,7 +15,7 @@ export const ACTIVITY_CATEGORIES = {
   STATUS: 'STATUS',
   TASK: 'TASK',
   LEAD: 'LEAD',
-  STAGEGROUP: 'STAGE_GROUP_COMPLETED',
+  STAGEGROUP: 'STAGE_GROUP',
 } as const;
 
 export type ActivityCategoryType = keyof typeof ACTIVITY_CATEGORIES;
@@ -104,8 +104,12 @@ export class ActivityLogRepository {
 
       .getRawMany();
     return result.map((row) => {
+      const formattedLabel = row.category
+        .toLowerCase() // stage_group
+        .replace(/_/g, ' ') // stage group
+        .replace(/\b\w/g, (char) => char.toUpperCase()); // Stage Group
       return {
-        label: row.category,
+        label: formattedLabel,
         value: row.category,
       };
     });

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

@@ -64,12 +64,8 @@ export class StageGroupRepository {
     const stagesRaw = await this.dataSource.query(
       `
       SELECT
-        cr_wf_stage.*,
-        eth_user_profile.name AS created_by_name,
-        eth_user_profile.profile_image AS profile_image
+        cr_wf_stage.*
       FROM cr_wf_stage
-      LEFT JOIN eth_user_profile 
-        ON cr_wf_stage.created_by = eth_user_profile.parent_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
@@ -131,26 +127,10 @@ export class StageGroupRepository {
     );
 
     // Step 4: Add counts & profile to each stage
-    const stages = await Promise.all(
-      stagesRaw.map(async (stage) => {
-        const profileImageId = stage.profile_image;
-        let profile: any = null;
-        if (profileImageId) {
-          profile = await this.mediaDataService.getMediaDownloadUrl(
-            profileImageId,
-            loggedInUser,
-          );
-        }
-        return {
-          ...stage,
-          profile, // enriched profile object
-        };
-      }),
-    );
 
     // Step 5: Group stages by stage_group_id
     const stageMap = new Map<number, any[]>();
-    for (const stage of stages) {
+    for (const stage of stagesRaw) {
       const stageId = Number(stage.id); // ensure number
 
       stage.task_count = taskCountMap.get(stageId) || 0;

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

@@ -1,5 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { ActivityLogRepository } from '../repository/activity-log.repository';
+import {
+  ACTIVITY_CATEGORIES,
+  ActivityLogRepository,
+} from '../repository/activity-log.repository';
 import { ActivityLog } from '../entity/activity-log.entity';
 import { log } from 'console';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
@@ -7,43 +10,50 @@ import { UserData } from 'src/module/user/entity/user.entity';
 
 function enrichData(category: string, logData: any): any {
   switch (category) {
-    case 'STAGE':
-      logData.color = '#f63d68';
+    case ACTIVITY_CATEGORIES.STAGE:
+      logData.color = '#06aed4';
       logData.icon = 'stage';
       break;
-    case 'INTERACTION':
+    case ACTIVITY_CATEGORIES.INTERACTION:
       logData.color = '#7a5af8';
       logData.icon = 'interaction';
       break;
-    case 'FORM':
+    case ACTIVITY_CATEGORIES.FORM:
       logData.color = '#eaaa08';
       logData.icon = 'form';
       break;
-    case 'ASSIGN':
+    case ACTIVITY_CATEGORIES.ASSIGN:
       logData.color = '#16b364';
       logData.icon = 'assign';
       break;
-    case 'MEETING':
-      logData.color = '#f63d68';
+    case ACTIVITY_CATEGORIES.MEETING:
+      logData.color = '#7a5af8';
       logData.icon = 'meeting';
       break;
-    case 'PROCESS':
-      logData.color = '#f63d68';
+    case ACTIVITY_CATEGORIES.PROCESS:
+      logData.color = '#06aed4';
       logData.icon = 'process';
       break;
-    case 'STATUS':
-      logData.color = '#f63d68';
+    case ACTIVITY_CATEGORIES.STATUS:
+      logData.color = '#06aed4';
       logData.icon = 'status';
       break;
-    case 'TASK':
-      logData.color = '#06aed4';
+    case ACTIVITY_CATEGORIES.TASK:
+      logData.color = '#f63d68';
       logData.icon = 'task';
       break;
-    case 'LEAD':
-      logData.color = '#f63d68';
+    case ACTIVITY_CATEGORIES.LEAD:
+      logData.color = '#16b364';
       logData.icon = 'lead';
       break;
-
+    case ACTIVITY_CATEGORIES.ASSESSMENT:
+      logData.color = '#f63d68';
+      logData.icon = 'assessment';
+      break;
+    case ACTIVITY_CATEGORIES.STAGEGROUP:
+      logData.color = '#06aed4';
+      logData.icon = 'stage_group';
+      break;
     default:
       logData.color = '#ff0000';
       logData.icon = 'DEFAULT';

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

@@ -8,7 +8,8 @@ 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-timezone';
+import * as moment from 'moment';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -21,6 +22,7 @@ export class StageGroupService extends EntityServiceImpl {
     private readonly workflowLevelMappingRepo: Repository<WorkflowLevelMappingEntity>,
     @InjectRepository(StageMovementData)
     private readonly stageMovementRepo: Repository<StageMovementData>,
+    private readonly mediaDataService: MediaDataService,
   ) {
     super();
   }
@@ -55,22 +57,21 @@ export class StageGroupService extends EntityServiceImpl {
 
     if (!workflowLevelMapping) return null;
 
-    // 3. Get lead status
+    // 3) Lead status (parameterized)
     let leadStatus: string | null = null;
     const leadData = await this.dataSource.query(
-      `SELECT lead_status FROM crm_lead WHERE id = ${lead_id}`,
+      `SELECT lead_status FROM crm_lead WHERE id = ?`,
+      [lead_id],
     );
-
-    if (leadData.length > 0) {
+    if (leadData.length > 0 && leadData[0].lead_status != null) {
       const leadStatusResolved = await this.dataSource.query(
-        `SELECT name FROM cr_list_master_items WHERE id = ${leadData[0].lead_status} and organization_id = ${loggedInUser.organization_id}`,
+        `SELECT name FROM cr_list_master_items WHERE id = ? AND organization_id = ?`,
+        [leadData[0].lead_status, loggedInUser.organization_id],
       );
-
       if (leadStatusResolved.length > 0) {
         leadStatus = leadStatusResolved[0].name;
       }
     }
-
     // 4. Fetch stage groups & hierarchy
     const stageGroupAndStageHierarchy =
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
@@ -108,9 +109,14 @@ export class StageGroupService extends EntityServiceImpl {
 
     let foundInProgressGroup = false;
 
+    const userCache = new Map<
+      number,
+      { created_by_name: string | null; profile: any }
+    >();
+
     // 7. Loop & apply IST conversions
     for (const group of stageGroupAndStageHierarchy) {
-      for (const stage of group.stages || []) {
+      const stagePromises = (group.stages || []).map(async (stage) => {
         const movement = stageMovementMap.get(Number(stage.id));
 
         if (movement) {
@@ -129,6 +135,17 @@ export class StageGroupService extends EntityServiceImpl {
             movement.start_date,
             movement.end_date ?? new Date(),
           );
+
+          if (movement.current_user_id) {
+            if (!userCache.has(movement.current_user_id)) {
+              const user = await this.getUserNameAndProfilePic(
+                movement.current_user_id,
+                loggedInUser,
+              );
+              userCache.set(movement.current_user_id, user);
+            }
+            Object.assign(stage, userCache.get(movement.current_user_id));
+          }
         } else {
           stage.is_current = false;
           stage.is_done = false;
@@ -136,12 +153,15 @@ export class StageGroupService extends EntityServiceImpl {
           stage.end_time = null;
           stage.time_spent = null;
           stage.created_by_name = null;
+          stage.profile = null;
         }
 
         if (leadStatus) {
           stage.lead_status = leadStatus;
         }
-      }
+      });
+
+      await Promise.all(stagePromises);
 
       if (group.stages.length === 0) {
         group.stage_group_status = 'TODO';
@@ -166,6 +186,36 @@ export class StageGroupService extends EntityServiceImpl {
     return stageGroupAndStageHierarchy;
   }
 
+  async getUserNameAndProfilePic(
+    userId: number,
+    loggedInUser: UserData,
+  ): Promise<any> {
+    const user = await this.dataSource.query(
+      `SELECT eth_user_profile.name AS created_by_name,
+        eth_user_profile.profile_image AS profile_image
+      FROM eth_user_profile
+      WHERE eth_user_profile.id = ?;`,
+      [userId],
+    );
+
+    if (user.length === 0) return null;
+
+    let profileImageId = user[0].profile_image;
+    let profile: any = null;
+
+    if (profileImageId) {
+      profile = await this.mediaDataService.getMediaDownloadUrl(
+        profileImageId,
+        loggedInUser,
+      );
+    }
+
+    return {
+      created_by_name: user[0].created_by_name,
+      profile: profile,
+    };
+  }
+
   async calculateTimeSpent(
     start: Date | string,
     end?: Date | string,

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

@@ -85,8 +85,17 @@ export class TaskService extends EntityServiceImpl {
     entityData.is_completed = isCompletedStatus;
     entityData.is_done = isCompletedStatus;
 
+    const isMandatory =
+      String(entityData.is_mandatory).toLowerCase() === 'true' ||
+      entityData.is_mandatory === true ||
+      entityData.is_mandatory === 1 ||
+      entityData.is_mandatory === '1';
+
     const updatedEntity = await super.updateEntity(
-      entityData,
+      {
+        ...entityData,
+        is_mandatory: isMandatory,
+      },
       loggedInUser,
       appcode,
     );
@@ -213,33 +222,36 @@ export class TaskService extends EntityServiceImpl {
     LEFT JOIN cr_user u ON t.created_by = u.id
     LEFT JOIN cr_user u2 ON t.task_owner = u2.id
     WHERE ${whereClauses.join(' AND ')}
-    ORDER BY t.due_date ASC, t.due_time ASC
+    ORDER BY t.created_date DESC
   `;
 
     const taskData = await this.dataSource.query(sql, params);
 
-    // Loop through each task and resolve task_status
-    for (const task of taskData) {
-      if (!task.status) {
-        task.task_status = null;
-        continue;
-      }
+    if (taskData.length === 0) {
+      return [];
+    }
+
+    //  Fetch all TKST statuses in a single query
+    const taskStatusQuery = `
+  SELECT id, name 
+  FROM cr_list_master_items 
+  WHERE organization_id = ? 
+    AND listtype = 'TKST'
+`;
+    const taskAllStatus = await this.dataSource.query(taskStatusQuery, [
+      loggedInUser.organization_id,
+    ]);
 
-      const taskStatusQuery = `
-      SELECT name 
-      FROM cr_list_master_items 
-      WHERE id = ? 
-        AND organization_id = ? 
-        AND listtype = 'TKST'
-      LIMIT 1;
-    `;
-
-      const [statusRow] = await this.dataSource.query(taskStatusQuery, [
-        task.status,
-        loggedInUser.organization_id,
-      ]);
-
-      task.task_status = statusRow?.name || null;
+    //  Build a hash map { id → name }
+    const statusMap = new Map(
+      taskAllStatus.map((row) => [String(row.id), row.name]),
+    );
+
+    //  Assign task_status using the map
+    for (const task of taskData) {
+      task.task_status = task.status
+        ? statusMap.get(String(task.status)) || null
+        : null;
     }
 
     // Normalize is_mandatory to '0'/'1' as string