rez_core 5.0.17 → 5.0.19

package/package.json

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

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

@@ -15,6 +15,7 @@ import axios from 'axios';
 import { ConfigService } from '@nestjs/config';
 import { ListMasterData } from 'src/module/listmaster/entity/list-master.entity';
 import { StageGroup } from '../entity/stage-group.entity';
+import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -110,7 +111,11 @@ export class StageGroupService extends EntityServiceImpl {
     // 3) Lead status (parameterized)
     let leadStatus: string | null = null;
 
-    const leadData = await this.getEntityData('LEAD', lead_id, loggedInUser);
+    const leadData = await super.getEntityData(
+      'LEAD',
+      lead_id,
+      loggedInUser,
+    );
     console.log('leadData', leadData);
     const leadRecord = Array.isArray(leadData) ? leadData[0] : null;
 
@@ -130,7 +135,7 @@ export class StageGroupService extends EntityServiceImpl {
     // 4. Fetch stage groups & hierarchy
     const stageGroupAndStageHierarchy =
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
-        stageGroupData[0].workflow_id,
+        stageGroupData.workflow_id,
         loggedInUser,
         lead_id,
       )) as Array<{

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

@@ -283,26 +283,27 @@ export class TaskService extends EntityServiceImpl {
     const params: any[] = [];
     let idx = 1;
 
-    // Required conditions
+    // Required filters
     whereClauses.push(`t.mapped_entity_type = $${idx++}`);
     params.push(mapped_entity_type);
 
-    whereClauses.push(`t.mapped_entity_id = $${idx++}`);
+    whereClauses.push(`t.mapped_entity_id::text = $${idx++}`);
     params.push(String(mapped_entity_id));
 
-    // Optional filters
+    // Optional: status (stored as varchar)
     if (status) {
-      whereClauses.push(`t.status = $${idx++}`);
-      params.push(Number(status));
+      whereClauses.push(`t.status::text = $${idx++}`);
+      params.push(String(status));
     }
 
+    // Optional: mandatory (stored as varchar '0' / '1')
     if (mandatory !== undefined) {
-      whereClauses.push(`t.is_mandatory = $${idx++}`);
-      params.push(mandatory ? true : false);
+      whereClauses.push(`t.is_mandatory::text = $${idx++}`);
+      params.push(mandatory ? "1" : "0");
     }
 
+    // Optional: overdue
     if (overdue) {
-      // Use PostgreSQL CURRENT_DATE + CURRENT_TIME
       whereClauses.push(`
       (
         t.due_date < CURRENT_DATE
@@ -310,11 +311,12 @@ export class TaskService extends EntityServiceImpl {
       )
     `);
 
-      // Only if not done
-      whereClauses.push(`t.is_done = $${idx++}`);
-      params.push(false);
+      // Only include tasks NOT done
+      whereClauses.push(`t.is_done::text = $${idx++}`);
+      params.push("0"); // varchar field
     }
 
+    // Final SQL
     const sql = `
         SELECT
             t.*,
@@ -322,29 +324,30 @@ export class TaskService extends EntityServiceImpl {
             s.name AS stage_name,
             a.name AS action_name
         FROM frm_wf_task_data t
-                 LEFT JOIN frm_wf_stage s ON t.stage_id = s.id
-                 LEFT JOIN frm_wf_stage_group sg ON s.stage_group_id = sg.id
-                 LEFT JOIN frm_wf_action a ON t.action_id = a.id
+                 LEFT JOIN frm_wf_stage s ON t.stage_id::text = s.id::text
+        LEFT JOIN frm_wf_stage_group sg ON s.stage_group_id = sg.id
+            LEFT JOIN frm_wf_action a ON t.action_id::text = a.id::text
         WHERE ${whereClauses.join(" AND ")}
         ORDER BY t.created_date DESC
     `;
 
     const taskData = await this.dataSource.query(sql, params);
 
-    // ------------------------------------------------------
-    // Resolve user profile
-    // ------------------------------------------------------
+    // -------------------------------
+    // PROFILE IMAGE MAPPING
+    // -------------------------------
     if (taskData?.length) {
       for (const task of taskData) {
         try {
-          const baseUrl = this.configService.get<string>("REDIRECT_BE_URL");
+          const baseUrl =
+            this.configService.get<string>("REDIRECT_BE_URL");
 
           const queryParams = new URLSearchParams({
             loggedInUser: JSON.stringify(loggedInUser),
           }).toString();
 
           const response = await axios.get(
-            `${baseUrl}/users/profile-image-url/${task?.task_owner}?entity_type=USR&${queryParams}`,
+            `${baseUrl}/users/profile-image-url/${task.task_owner}?entity_type=USR&${queryParams}`,
             { headers: { "Content-Type": "application/json" } },
           );
 
@@ -359,15 +362,15 @@ export class TaskService extends EntityServiceImpl {
 
     if (!taskData.length) return [];
 
-    // ------------------------------------------------------
-    // Load All TKST Statuses
-    // ------------------------------------------------------
+    // -------------------------------
+    // FETCH TKST STATUS LABELS
+    // -------------------------------
     const statusSql = `
-    SELECT id, name
-    FROM frm_list_master_items
-    WHERE organization_id = $1
-      AND listtype = 'TKST'
-  `;
+        SELECT id, name
+        FROM frm_list_master_items
+        WHERE organization_id = $1
+          AND listtype = 'TKST'
+    `;
 
     const allStatuses = await this.dataSource.query(statusSql, [
       loggedInUser.organization_id,
@@ -377,17 +380,17 @@ export class TaskService extends EntityServiceImpl {
       allStatuses.map((row) => [String(row.id), row.name]),
     );
 
-    // ------------------------------------------------------
-    // Normalize & decorate tasks
-    // ------------------------------------------------------
+    // -------------------------------
+    // FINAL MAPPING
+    // -------------------------------
     return taskData.map((task) => ({
       ...task,
       task_status: statusMap.get(String(task.status)) || null,
       action_name:
-        task.action_id === 0 || task.action_id === "0"
+        task.action_id === "0" || task.action_id === 0
           ? "Generic"
           : task.action_name,
-      is_mandatory: task.is_mandatory ? "1" : "0",
+      is_mandatory: task.is_mandatory === "1" ? "1" : "0",
     }));
   }