rez_core 3.1.200 → 3.1.201

package/dist/module/workflow/service/task.service.js

@@ -39,10 +39,10 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
     async execute(payload) {
         const { entity, user, config } = payload;
         let toValue = null;
-        const stageRow = await this.dataSource.query(`SELECT stage_id
-       FROM cr_wf_stage_movement_data
-      WHERE mapped_entity_id = ? 
-        AND is_current = 'Y'
+        const stageRow = await this.dataSource.query(`SELECT stage_id
+       FROM cr_wf_stage_movement_data
+      WHERE mapped_entity_id = ? 
+        AND is_current = 'Y'
       LIMIT 1`, [entity.id]);
         const stageId = stageRow.length > 0 ? stageRow[0].stage_id : null;
         if (!stageId) {
@@ -107,13 +107,13 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
         return createdEntity;
     }
     async updateEntity(entityData, loggedInUser, appcode) {
-        const taskStatusQuery = `
-    SELECT name 
-    FROM cr_list_master_items 
-    WHERE id = ? 
-      AND organization_id = ? 
-      AND listtype = 'TKST'
-    LIMIT 1;
+        const taskStatusQuery = `
+    SELECT name 
+    FROM cr_list_master_items 
+    WHERE id = ? 
+      AND organization_id = ? 
+      AND listtype = 'TKST'
+    LIMIT 1;
   `;
         const statusRows = await this.dataSource.query(taskStatusQuery, [
             entityData.status,
@@ -201,18 +201,18 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
             whereClauses.push(`t.is_done = ?`);
             params.push(0);
         }
-        const sql = `
-    SELECT
-      t.*,
-      sg.name AS stage_group_name,
-      s.name AS stage_name,
-      a.name AS action_name
-    FROM cr_wf_task_data t
-    LEFT JOIN cr_wf_stage s ON t.stage_id = s.id
-    LEFT JOIN cr_wf_stage_group sg ON s.stage_group_id = sg.id
-    LEFT JOIN cr_wf_action a ON t.action_id = a.id
-    WHERE ${whereClauses.join(' AND ')}
-    ORDER BY t.created_date DESC
+        const sql = `
+    SELECT
+      t.*,
+      sg.name AS stage_group_name,
+      s.name AS stage_name,
+      a.name AS action_name
+    FROM cr_wf_task_data t
+    LEFT JOIN cr_wf_stage s ON t.stage_id = s.id
+    LEFT JOIN cr_wf_stage_group sg ON s.stage_group_id = sg.id
+    LEFT JOIN cr_wf_action a ON t.action_id = a.id
+    WHERE ${whereClauses.join(' AND ')}
+    ORDER BY t.created_date DESC
   `;
         const taskData = await this.dataSource.query(sql, params);
         if (taskData) {
@@ -223,7 +223,7 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
                     const queryParams = new URLSearchParams({
                         loggedInUser: JSON.stringify(loggedInUser),
                     }).toString();
-                    const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.task_owner}?entity_type=UPR&${queryParams}`, {
+                    const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.task_owner}?entity_type=USR&${queryParams}`, {
                         headers: {
                             'Content-Type': 'application/json',
                         },
@@ -242,11 +242,11 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
         if (taskData.length === 0) {
             return [];
         }
-        const taskStatusQuery = `
-  SELECT id, name 
-  FROM cr_list_master_items 
-  WHERE organization_id = ? 
-    AND listtype = 'TKST'
+        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,

package/dist/module/workflow/service/workflow-list-master.service.js

@@ -19,16 +19,16 @@ let WorkflowListMasterService = class WorkflowListMasterService extends entity_s
         this.dataSource = dataSource;
     }
     async getActionCategoryListByStageId(stageId) {
-        const results = await this.dataSource.query(`
-      SELECT 
-      ac.name AS name,
-      ac.logo AS logo,
-        ac.modalName AS modalName,
-        a.action_requirement AS actionRequirement
-      FROM cr_wf_stage_action_mapping sam
-      JOIN cr_wf_action a ON sam.action_id = a.id
-      JOIN cr_wf_action_category ac ON a.action_category = ac.id
-      WHERE sam.stage_id = ?
+        const results = await this.dataSource.query(`
+      SELECT 
+      ac.name AS name,
+      ac.logo AS logo,
+        ac.modalName AS modalName,
+        a.action_requirement AS actionRequirement
+      FROM cr_wf_stage_action_mapping sam
+      JOIN cr_wf_action a ON sam.action_id = a.id
+      JOIN cr_wf_action_category ac ON a.action_category = ac.id
+      WHERE sam.stage_id = ?
       `, [stageId]);
         return results.map((item) => ({
             name: item.name,
@@ -44,11 +44,11 @@ let WorkflowListMasterService = class WorkflowListMasterService extends entity_s
     }
     async getModes(loggedInUser) {
         const { organization_id } = loggedInUser;
-        const modes = await this.dataSource.query(`
-    SELECT id, name
-    FROM cr_list_master_items
-    WHERE listtype = 'MOD'
-      AND organization_id = ?
+        const modes = await this.dataSource.query(`
+    SELECT id, name
+    FROM cr_list_master_items
+    WHERE listtype = 'MOD'
+      AND organization_id = ?
     `, [organization_id]);
         return modes;
     }

package/dist/module/workflow/service/workflow-meta.service.js

@@ -211,9 +211,9 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             action_id: entityData.action_id,
         }, loggedInUser);
         const leadData = await this.getEntityData('LEAD', lead_id, loggedInUser);
-        const unassignedListMasterItemData = await this.dataSource.query(`SELECT name, id 
-   FROM cr_list_master_items 
-   WHERE listtype = "LEST" AND organization_id = ? 
+        const unassignedListMasterItemData = await this.dataSource.query(`SELECT name, id 
+   FROM cr_list_master_items 
+   WHERE listtype = "LEST" AND organization_id = ? 
      AND value IN (?, ?)`, [loggedInUser.organization_id, 'unassigned', 'active']);
         const unassignedId = unassignedListMasterItemData.find((item) => item.name.toLowerCase() === 'unassigned')?.id;
         const activeId = unassignedListMasterItemData.find((item) => item.name.toLowerCase() === 'active')?.id;
@@ -225,24 +225,24 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             status: leadData?.lead_status,
             lead_status: leadData?.lead_status,
         }, loggedInUser);
-        await this.dataSource.query(`UPDATE cr_wf_action_data SET user_id =? 
-      WHERE mapped_entity_id=?
-      AND mapped_entity_type = ?
-      AND stage_id = ?
-      AND (is_current = 'Y' OR is_current IS NULL)
+        await this.dataSource.query(`UPDATE cr_wf_action_data SET user_id =? 
+      WHERE mapped_entity_id=?
+      AND mapped_entity_type = ?
+      AND stage_id = ?
+      AND (is_current = 'Y' OR is_current IS NULL)
       `, [lead_owner, lead_id, entity_type, stage_id]);
-        await this.dataSource.query(`UPDATE crm_lead_meeting SET user_id=?
-      WHERE stage_id = ? 
-      AND mapped_entity_id = ?
-      AND mapped_entity_type = "LEAD" 
-      AND (status='scheduled' OR status='rescheduled')
+        await this.dataSource.query(`UPDATE crm_lead_meeting SET user_id=?
+      WHERE stage_id = ? 
+      AND mapped_entity_id = ?
+      AND mapped_entity_type = "LEAD" 
+      AND (status='scheduled' OR status='rescheduled')
       `, [lead_owner, stage_id, lead_id]);
-        const taskRows = await this.dataSource.query(`SELECT id,status FROM cr_wf_task_data
-      WHERE mapped_entity_id = ?
-      AND mapped_entity_type = ?
+        const taskRows = await this.dataSource.query(`SELECT id,status FROM cr_wf_task_data
+      WHERE mapped_entity_id = ?
+      AND mapped_entity_type = ?
       AND stage_id = ?`, [lead_id, entity_type, stage_id]);
         for (const task of taskRows) {
-            const statusRows = await this.dataSource.query(`SELECT value FROM cr_list_master_items
+            const statusRows = await this.dataSource.query(`SELECT value FROM cr_list_master_items
         WHERE id = ? AND organization_id = ?`, [task.status, loggedInUser.organization_id]);
             const statusName = statusRows[0]?.value?.toLowerCase() || '';
             if (['todo', 'in_progress'].includes(statusName) ||
@@ -272,49 +272,49 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
     }
     async assignLead(loggedInUser, mapped_entity_id, mapped_entity_type, stage_id, actions) {
         const { organization_id, level_id, level_type } = loggedInUser;
-        const owners = await this.dataSource.query(`
-    SELECT DISTINCT u.id
-    FROM sso_user u
-    JOIN sso_user_role_mapping urm   ON u.id = urm.user_id
-    JOIN sso_role r                  ON urm.role_id = r.id
-    JOIN sso_module_access ma        ON ma.role_code = r.code
-    WHERE urm.organization_id = ?
-      AND urm.level_id = ?
-      AND urm.level_type = ?
-      AND urm.appcode = 'CRM'
-      AND ma.appcode = 'CRM'
-      AND ma.module_code = 'lead_crm_sch'
-      AND ma.access_flag = 1
-      AND ma.action_type = 'LEAD_OWNER'
-    ORDER BY u.id ASC
+        const owners = await this.dataSource.query(`
+    SELECT DISTINCT u.id
+    FROM sso_user u
+    JOIN sso_user_role_mapping urm   ON u.id = urm.user_id
+    JOIN sso_role r                  ON urm.role_id = r.id
+    JOIN sso_module_access ma        ON ma.role_code = r.code
+    WHERE urm.organization_id = ?
+      AND urm.level_id = ?
+      AND urm.level_type = ?
+      AND urm.appcode = 'CRM'
+      AND ma.appcode = 'CRM'
+      AND ma.module_code = 'lead_crm_sch'
+      AND ma.access_flag = 1
+      AND ma.action_type = 'LEAD_OWNER'
+    ORDER BY u.id ASC
     `, [organization_id, Number(level_id), level_type]);
         if (!owners?.length)
             throw new Error('No eligible users found');
         const userIds = owners.map((o) => Number(o.id));
         const placeholders = userIds.map(() => '?').join(',');
-        const lastRow = await this.dataSource.query(`
-    SELECT lead_owner
-    FROM crm_lead
-    WHERE organization_id = ?
-      AND level_id = ?
-      AND level_type = ?
-      AND lead_owner IN (${placeholders})
-    ORDER BY created_date DESC
-    LIMIT 1
+        const lastRow = await this.dataSource.query(`
+    SELECT lead_owner
+    FROM crm_lead
+    WHERE organization_id = ?
+      AND level_id = ?
+      AND level_type = ?
+      AND lead_owner IN (${placeholders})
+    ORDER BY created_date DESC
+    LIMIT 1
     `, [organization_id, Number(level_id), level_type, ...userIds]);
         const lastAssigned = lastRow.length ? Number(lastRow[0].lead_owner) : null;
         const lastIdx = lastAssigned != null ? userIds.indexOf(lastAssigned) : -1;
         const nextIdx = (lastIdx + 1) % userIds.length;
         const nextUser = userIds[nextIdx];
-        await this.dataSource.query(`
-    UPDATE crm_lead
-    SET lead_owner = ?
-    WHERE organization_id = ?
-      AND level_id = ?
-      AND level_type = ?
-      AND lead_owner IS NULL
-    ORDER BY created_date ASC
-    LIMIT 1
+        await this.dataSource.query(`
+    UPDATE crm_lead
+    SET lead_owner = ?
+    WHERE organization_id = ?
+      AND level_id = ?
+      AND level_type = ?
+      AND lead_owner IS NULL
+    ORDER BY created_date ASC
+    LIMIT 1
     `, [nextUser, organization_id, Number(level_id), level_type]);
         console.log(`Assigning lead to user ID: ${nextUser}`);
         const firstAction = actions[0];

package/dist/module/workflow/service/workflow.service.js

@@ -72,8 +72,8 @@ let WorkflowService = class WorkflowService extends entity_service_impl_service_
                 currentId: workflowId,
             })
                 .execute();
-            await this.dataSource.query(`UPDATE cr_wf_level_mapping
-     SET workflow_id = ?
+            await this.dataSource.query(`UPDATE cr_wf_level_mapping
+     SET workflow_id = ?
      WHERE mapped_level_id = ? AND mapped_level_type = ?`, [workflowId, level_id, level_type]);
         }
         return super.updateEntity(entityData, loggedInUser);