rez_core 3.1.165 → 3.1.168

package/dist/module/meta/service/entity-list.service.js

@@ -75,11 +75,11 @@ let EntityListService = class EntityListService {
     }
     getQuery(source, groupByColumn) {
         if (groupByColumn) {
-            return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
+            return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
               FROM ${source}`;
         }
         else {
-            return `SELECT *
+            return `SELECT *
               FROM ${source}`;
         }
     }
@@ -123,7 +123,7 @@ let EntityListService = class EntityListService {
         return { query, argumentList: argsObjectList };
     }
     async getMaxSequenceNumber(tableName, parentType, parentId) {
-        const query = `SELECT COUNT(1) seq_no
+        const query = `SELECT COUNT(1) seq_no
                  FROM ${tableName} WHERE 1=1 `;
         const argsObjectList = [];
         const result = await this.entityManager.query(query, argsObjectList);

package/dist/module/meta/service/entity-master.service.js

@@ -70,9 +70,9 @@ let EntityMasterService = class EntityMasterService {
         if (!entityMasterData) {
             throw new Error(`Entity master with mapped_entity_type "${entityType}" not found.`);
         }
-        const attributes = await this.dataSource.query(`SELECT * 
-     FROM cr_entity_attribute 
-     WHERE mapped_entity_type = ? 
+        const attributes = await this.dataSource.query(`SELECT * 
+     FROM cr_entity_attribute 
+     WHERE mapped_entity_type = ? 
        AND organization_id = ? `, [entityMasterData.mapped_entity_type, loggedInUser.organization_id]);
         entityMasterData['attribute_list'] = attributes;
         entityMasterData['operation_list'] = {

package/dist/module/meta/service/entity-relation.service.js

@@ -19,12 +19,12 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
         this.dataSource = dataSource;
     }
     async getEntityRelations(entityType, loggedInUser, includeSelf = false) {
-        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
-       FROM cr_entity_relation 
+        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
+       FROM cr_entity_relation 
        WHERE source_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
         if (includeSelf) {
-            const [entity] = await this.dataSource.query(`SELECT name as label 
-         FROM cr_entity_master 
+            const [entity] = await this.dataSource.query(`SELECT name as label 
+         FROM cr_entity_master 
          WHERE mapped_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
             if (entity) {
                 relations.unshift({
@@ -39,13 +39,13 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
     async getRelatedEntityIds(sourceEntity, targetEntity, targetIds, orgId) {
         if (!targetIds.length)
             return [];
-        const result = await this.dataSource.query(`
-      SELECT DISTINCT source_entity_id
-      FROM cr_entity_relation_data
-      WHERE source_entity_type = ?
-        AND target_entity_type = ?
-        AND target_entity_id IN (?)
-        AND organization_id = ?
+        const result = await this.dataSource.query(`
+      SELECT DISTINCT source_entity_id
+      FROM cr_entity_relation_data
+      WHERE source_entity_type = ?
+        AND target_entity_type = ?
+        AND target_entity_id IN (?)
+        AND organization_id = ?
       `, [sourceEntity, targetEntity, targetIds, orgId]);
         return result.map((r) => r.source_entity_id);
     }

package/dist/module/meta/service/entity-service-impl.service.js

@@ -50,9 +50,9 @@ let EntityServiceImpl = class EntityServiceImpl {
             maxSeqNo = Number(maxSeqNo) + 1;
             entityData.code = entityData.entity_type + maxSeqNo;
         }
-        const statusList = await repo.query(`SELECT id
-       FROM cr_list_master_items
-       WHERE code = ?
+        const statusList = await repo.query(`SELECT id
+       FROM cr_list_master_items
+       WHERE code = ?
          AND organization_id = ?`, [global_constant_1.STATUS_ACTIVE, loggedInUser?.organization_id || -1]);
         console.log('Status List:', statusList);
         console.log(`status_code,${global_constant_1.STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`);

package/dist/module/meta/service/resolver.service.d.ts

@@ -1,8 +1,10 @@
-import { UserData } from 'src/module/user/entity/user.entity';
 import { DataSource } from 'typeorm';
+import { UserData } from '../../user/entity/user.entity';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 export declare class ResolverService {
     private readonly dataSource;
-    constructor(dataSource: DataSource);
+    private readonly listMasterService;
+    constructor(dataSource: DataSource, listMasterService: ListMasterService);
     getResolvedData(loggedInUser: any, entityData: any, entityType: string): Promise<any>;
     getResolvedValue(loggedInUser: UserData, attrKey: string, rawValue: any, entityType: string): Promise<any>;
     getResolvedId(loggedInUser: UserData, attrKey: string, displayValue: any, entityType: string): Promise<any>;

package/dist/module/meta/service/resolver.service.js

@@ -8,14 +8,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolverService = void 0;
-const common_1 = require("@nestjs/common");
 const typeorm_1 = require("typeorm");
+const common_1 = require("@nestjs/common");
 const moment = require("moment");
+const list_master_service_1 = require("../../listmaster/service/list-master.service");
 let ResolverService = class ResolverService {
-    constructor(dataSource) {
+    constructor(dataSource, listMasterService) {
         this.dataSource = dataSource;
+        this.listMasterService = listMasterService;
     }
     async getResolvedData(loggedInUser, entityData, entityType) {
         const attributeItems = await this.dataSource.query(`SELECT * FROM cr_entity_attribute WHERE mapped_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
@@ -25,66 +30,31 @@ let ResolverService = class ResolverService {
             const codeValue = entityData[field];
             if (!codeValue)
                 continue;
-            if (attr.data_source_type === 'entity') {
-                const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`, [attr.datasource_list, loggedInUser.organization_id]);
-                if (!entityDef) {
-                    resolvedEntityData[field] = codeValue;
-                    continue;
-                }
-                const tableName = entityDef.db_table_name;
+            if (attr.data_source_type === 'entity' || attr.data_source_type === 'master') {
+                const type = attr.data_source_type === 'entity' ? attr.datasource_list : attr.list_type;
+                const params = {};
                 if (Array.isArray(codeValue)) {
                     const resolvedValues = [];
                     for (const code of codeValue) {
-                        if (tableName == 'sso_organization') {
-                            const [item] = await this.dataSource.query(`SELECT * FROM ${tableName} WHERE code = ?`, [code]);
-                            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-                        }
-                        else {
-                            const [item] = await this.dataSource.query(`SELECT * FROM ${tableName} WHERE code = ? AND organization_id = ?`, [code, loggedInUser.organization_id]);
-                            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-                        }
-                    }
-                    resolvedEntityData[field] = resolvedValues;
-                }
-                else {
-                    if (tableName == 'sso_organization' ||
-                        tableName == 'sso_app_master') {
-                        const [item] = await this.dataSource.query(`SELECT * FROM ${tableName} WHERE id = ?`, [codeValue]);
-                        resolvedEntityData[field] =
-                            item?.[attr.data_source_attribute] ?? codeValue;
-                    }
-                    else {
-                        const [item] = await this.dataSource.query(`SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`, [codeValue, loggedInUser.organization_id]);
-                        resolvedEntityData[field] =
-                            item?.[attr.data_source_attribute] ?? codeValue;
-                    }
-                }
-            }
-            else if (attr.data_source_type === 'master') {
-                if (Array.isArray(codeValue)) {
-                    const resolvedValues = [];
-                    for (const code of codeValue) {
-                        const [item] = await this.dataSource.query(`SELECT * FROM cr_list_master_items WHERE id = ? AND organization_id = ?`, [code, loggedInUser.organization_id]);
+                        const options = await this.listMasterService.getDropdownOptions(type, params, undefined, loggedInUser, true);
+                        const item = options.find(opt => opt.id === code || opt.code === code);
                         resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
                     }
                     resolvedEntityData[field] = resolvedValues;
                 }
                 else {
-                    const [item] = await this.dataSource.query(`SELECT * FROM cr_list_master_items WHERE id = ? AND organization_id = ?`, [codeValue, loggedInUser.organization_id]);
-                    resolvedEntityData[field] =
-                        item?.[attr.data_source_attribute] ?? codeValue;
+                    const options = await this.listMasterService.getDropdownOptions(type, params, undefined, loggedInUser, true);
+                    const item = options.find(opt => opt.id === codeValue || opt.code === codeValue);
+                    resolvedEntityData[field] = item?.[attr.data_source_attribute] ?? codeValue;
                 }
             }
-            else if (attr.element_type === 'date' ||
-                attr.element_type === 'datetime') {
+            else if (attr.element_type === 'date' || attr.element_type === 'datetime') {
                 const dateValue = moment(codeValue).utcOffset('+05:30');
                 if (dateValue.isValid()) {
-                    if (attr.element_type === 'date') {
-                        resolvedEntityData[field] = dateValue.format('DD-MM-YYYY');
-                    }
-                    else {
-                        resolvedEntityData[field] = dateValue.format('DD-MM-YYYY HH:mm:ss');
-                    }
+                    resolvedEntityData[field] =
+                        attr.element_type === 'date'
+                            ? dateValue.format('DD-MM-YYYY')
+                            : dateValue.format('DD-MM-YYYY HH:mm:ss');
                 }
             }
         }
@@ -149,12 +119,12 @@ let ResolverService = class ResolverService {
             displayValue === '') {
             return displayValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT * FROM cr_entity_attribute 
+        const [attr] = await this.dataSource.query(`SELECT * FROM cr_entity_attribute 
        WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`, [entityType, loggedInUser.organization_id, attrKey]);
         if (!attr)
             return displayValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master 
+            const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master 
          WHERE mapped_entity_type = ? AND organization_id = ?`, [attr.datasource_list, loggedInUser.organization_id]);
             if (!entityDef)
                 return displayValue;
@@ -169,7 +139,7 @@ let ResolverService = class ResolverService {
             return item?.id ?? displayValue;
         }
         else if (attr.data_source_type === 'master') {
-            const [item] = await this.dataSource.query(`SELECT id FROM cr_list_master_items 
+            const [item] = await this.dataSource.query(`SELECT id FROM cr_list_master_items 
          WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`, [displayValue, loggedInUser.organization_id]);
             return item?.id ?? displayValue;
         }
@@ -179,6 +149,8 @@ let ResolverService = class ResolverService {
 exports.ResolverService = ResolverService;
 exports.ResolverService = ResolverService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __param(1, (0, common_1.Inject)('ListMasterService')),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
+        list_master_service_1.ListMasterService])
 ], ResolverService);
 //# sourceMappingURL=resolver.service.js.map

package/dist/module/meta/service/resolver.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/resolver.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/resolver.service.ts"],"names":[],"mappings":"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"}

package/dist/module/module/repository/menu.repository.js

@@ -60,10 +60,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async getMenuItems(moduleCodes, appcode, levelType) {
         return await this.menuData
             .createQueryBuilder('menu')
-            .leftJoin('sso_module', 'module', `
-          menu.module_code = module.module_code
-          AND LOWER(menu.appcode) = LOWER(module.appcode)
-          AND menu.level_type = module.level_type
+            .leftJoin('sso_module', 'module', `
+          menu.module_code = module.module_code
+          AND LOWER(menu.appcode) = LOWER(module.appcode)
+          AND menu.level_type = module.level_type
         `)
             .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
             .andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
@@ -82,11 +82,11 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.dataSource.getRepository(user_role_mapping_entity_1.UserRoleMapping);
         if (userId) {
-            const getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = ?
+            const getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = ?
       `, [userId]);
-            const getUserUrm = await this.dataSource.query(`
-        SELECT * from sso_user_role_mapping where user_id = ? and appcode = ?
+            const getUserUrm = await this.dataSource.query(`
+        SELECT * from sso_user_role_mapping where user_id = ? and appcode = ?
       `, [userId, appcode]);
             if (getUserDetails.length > 0 &&
                 getUserDetails[0].organization_id === 1) {
@@ -105,10 +105,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
         if (roles.length)
             return roles.map((r) => r.urm_role_id);
         if (levelType === 'SCH') {
-            const [sch] = await this.dataSource.query(`
-        SELECT s.brand_id, s.organization_id
-        FROM eth_school_profile s
-        WHERE s.id = ?
+            const [sch] = await this.dataSource.query(`
+        SELECT s.brand_id, s.organization_id
+        FROM eth_school_profile s
+        WHERE s.id = ?
       `, [levelId]);
             const brandId = sch?.brand_id;
             const orgId = sch?.organization_id;

package/dist/module/notification/service/notification.service.js

@@ -63,14 +63,14 @@ let NotificationsService = class NotificationsService {
             const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
             isReadFilter = isReadBool ? 1 : 0;
         }
-        let query = `
-    SELECT
-      n.*,
-      u.name AS user_name,
-      u.profile_image AS user_profile
-    FROM cr_notification n
-    LEFT JOIN eth_user_profile u ON n.user_id = u.parent_id
-    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
+        let query = `
+    SELECT
+      n.*,
+      u.name AS user_name,
+      u.profile_image AS user_profile
+    FROM cr_notification n
+    LEFT JOIN eth_user_profile u ON n.user_id = u.parent_id
+    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
   `;
         const params = [id, level_id, level_type];
         if (isReadFilter !== undefined) {
@@ -97,10 +97,10 @@ let NotificationsService = class NotificationsService {
     }
     async markAllAsRead(loggedInUser) {
         const { id, level_id, level_type } = loggedInUser;
-        const query = `
-    UPDATE cr_notification
-    SET is_read = 1
-    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
+        const query = `
+    UPDATE cr_notification
+    SET is_read = 1
+    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
   `;
         const params = [id, level_id, level_type];
         const result = await this.dataSource.query(query, params);

package/dist/module/user/controller/login.controller.js

@@ -57,27 +57,27 @@ let LoginController = class LoginController {
             try {
                 const actualState = state.replace('gmail_config:', '');
                 const result = await this.integrationService.handleGmailTokensCallback(email, googleAccessToken, googleRefreshToken, actualState);
-                return res.send(`<html><body><script>
-    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
-    window.close();
+                return res.send(`<html><body><script>
+    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
+    window.close();
   </script> <p>Configuration successful. You can close this window.</p> </body></html>`);
             }
             catch (error) {
-                return res.send(`
-         <html>
-        <body>
-          <script>
-            if (window.opener) {
-              window.opener.postMessage({ 
-                type: "CONFIG_FAILED", 
-                error: "${error.message || 'Something went wrong'}" 
-              }, "*");
-            }
-            window.close();
-          </script>
-          <p>Configuration failed. Please close this window.</p>
-        </body>
-      </html>
+                return res.send(`
+         <html>
+        <body>
+          <script>
+            if (window.opener) {
+              window.opener.postMessage({ 
+                type: "CONFIG_FAILED", 
+                error: "${error.message || 'Something went wrong'}" 
+              }, "*");
+            }
+            window.close();
+          </script>
+          <p>Configuration failed. Please close this window.</p>
+        </body>
+      </html>
         `);
             }
         }

package/dist/module/user/service/role.service.js

@@ -76,10 +76,10 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
             if (!existingRole) {
                 return { success: false, error: 'Role not found' };
             }
-            const associatedUsers = await this.entityManager.query(`SELECT map.*
-                                                              FROM sso_user_role_mapping map
-                                                                     JOIN sso_user usr ON map.user_id = usr.id
-                                                              WHERE usr.status = ${resolveStatus.id}
+            const associatedUsers = await this.entityManager.query(`SELECT map.*
+                                                              FROM sso_user_role_mapping map
+                                                                     JOIN sso_user usr ON map.user_id = usr.id
+                                                              WHERE usr.status = ${resolveStatus.id}
                                                                 and map.role_id = ${existingRole?.id}`);
             if (associatedUsers.length > 0) {
                 return {

package/dist/module/user/service/user-session.service.js

@@ -71,8 +71,8 @@ let UserSessionService = class UserSessionService {
         };
         let getUserDetails;
         if (currentUser) {
-            getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = ?
+            getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = ?
       `, [currentUser.id]);
         }
         if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {

package/dist/module/workflow/repository/action.repository.js

@@ -24,10 +24,10 @@ let ActionRepository = class ActionRepository {
     }
     async getReasonCode(loggedInUser) {
         const { organization_id } = loggedInUser;
-        const result = await this.dataSource.query(`
-       SELECT name, type
-       FROM cr_list_master
-       WHERE organization_id = ? AND source = 'master'
+        const result = await this.dataSource.query(`
+       SELECT name, type
+       FROM cr_list_master
+       WHERE organization_id = ? AND source = 'master'
        `, [organization_id]);
         const formatted = result.map((item) => ({
             label: item.name,
@@ -40,10 +40,10 @@ let ActionRepository = class ActionRepository {
         if (!list_type) {
             throw new common_1.BadRequestException('list_type is required');
         }
-        const result = await this.dataSource.query(`
-    SELECT name, id 
-    FROM cr_list_master_items 
-    WHERE listtype = ? AND organization_id = ?
+        const result = await this.dataSource.query(`
+    SELECT name, id 
+    FROM cr_list_master_items 
+    WHERE listtype = ? AND organization_id = ?
     `, [list_type, organization_id]);
         return result.map((row) => ({
             label: row.name,
@@ -52,19 +52,19 @@ let ActionRepository = class ActionRepository {
     }
     async getActions(loggedInUser, stage_id) {
         const { organization_id } = loggedInUser;
-        const stageActions = await this.dataSource.query(`
-    SELECT id, action_id 
-    FROM cr_wf_stage_action_mapping 
-    WHERE stage_id = ?
+        const stageActions = await this.dataSource.query(`
+    SELECT id, action_id 
+    FROM cr_wf_stage_action_mapping 
+    WHERE stage_id = ?
     `, [stage_id]);
         if (!stageActions?.length)
             return [];
         const actionIds = stageActions.map((sa) => sa.action_id);
         const mappingIds = stageActions.map((sa) => sa.id);
-        const templateMappings = await this.dataSource.query(`
-    SELECT stg_act_mapping_id, template_code 
-    FROM cr_wf_action_template_mapping 
-    WHERE stg_act_mapping_id IN (${mappingIds.map(() => '?').join(',')})
+        const templateMappings = await this.dataSource.query(`
+    SELECT stg_act_mapping_id, template_code 
+    FROM cr_wf_action_template_mapping 
+    WHERE stg_act_mapping_id IN (${mappingIds.map(() => '?').join(',')})
     `, mappingIds);
         const templateCodes = templateMappings.map((tm) => tm.template_code);
         const templateCodeToName = {};

package/dist/module/workflow/repository/comm-template.repository.js

@@ -30,17 +30,17 @@ let CommTemplateRepository = class CommTemplateRepository {
         const { organization_id, level_id, level_type } = loggedInUser;
         let is_template;
         if (action_id) {
-            const [actionResult] = await this.dataSource.query(`SELECT is_template 
-       FROM cr_wf_action 
-       WHERE id = ? AND organization_id = ? 
+            const [actionResult] = await this.dataSource.query(`SELECT is_template 
+       FROM cr_wf_action 
+       WHERE id = ? AND organization_id = ? 
        LIMIT 1`, [action_id, organization_id]);
             if (!actionResult) {
                 throw new Error('Invalid action_id');
             }
             is_template = actionResult.is_template;
-            await this.dataSource.query(`UPDATE cr_wf_comm_template
-     SET is_template = ?
-     WHERE mapped_entity_type = ?
+            await this.dataSource.query(`UPDATE cr_wf_comm_template
+     SET is_template = ?
+     WHERE mapped_entity_type = ?
        AND organization_id = ? AND level_id = ? AND level_type=?`, [is_template, entity_type, organization_id, level_id, level_type]);
         }
         const whereCondition = {

package/dist/module/workflow/repository/form-master.repository.js

@@ -17,8 +17,8 @@ let FormMasterRepository = class FormMasterRepository {
         this.dataSource = dataSource;
     }
     async getForms(organization_id, source_entity_type) {
-        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
-       FROM cr_entity_view fm
+        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
+       FROM cr_entity_view fm
        WHERE fm.organization_id = ? AND fm.mapped_entity_type = ?`, [organization_id, source_entity_type]);
         const formatted = forms.map((form) => ({
             label: form.fm_form_name,

package/dist/module/workflow/repository/stage-group.repository.js

@@ -67,33 +67,33 @@ let StageGroupRepository = class StageGroupRepository {
         if (!stageGroups.length)
             return [];
         const stageGroupIds = stageGroups.map((sg) => sg.id);
-        const stagesRaw = await this.dataSource.query(`
-      SELECT
-        cr_wf_stage.*
-      FROM cr_wf_stage
-      WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
-        AND cr_wf_stage.organization_id = ?
-      ORDER BY cr_wf_stage.sequence ASC
+        const stagesRaw = await this.dataSource.query(`
+      SELECT
+        cr_wf_stage.*
+      FROM cr_wf_stage
+      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, loggedInUser.organization_id]);
         const stageIds = stagesRaw.map((s) => s.id);
-        const taskCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS task_count
-    FROM cr_wf_task_data
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
-    GROUP BY stage_id
+        const taskCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS task_count
+    FROM cr_wf_task_data
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
-        const meetingCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS meeting_count
-    FROM crm_lead_meeting
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
-    GROUP BY stage_id
+        const meetingCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS meeting_count
+    FROM crm_lead_meeting
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
-        const sendCommCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS send_comm_count
-    FROM crm_lead_communication
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
-    AND type IN ('SEND', 'LOG')
-    GROUP BY stage_id
+        const sendCommCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS send_comm_count
+    FROM crm_lead_communication
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
+    AND type IN ('SEND', 'LOG')
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
         const taskCountMap = new Map(taskCounts.map((row) => [Number(row.stage_id), Number(row.task_count)]));
         const meetingCountMap = new Map(meetingCounts.map((row) => [

package/dist/module/workflow/repository/stage-movement.repository.js

@@ -107,17 +107,17 @@ let StageMovementRepository = class StageMovementRepository {
         return nextStageGroupFirstStage || null;
     }
     async getAllActionByStageId(stageId) {
-        const result = await this.dataSource.query(`
-    SELECT 
-      a.*, 
-      m.stage_id, 
-      ac.code AS action_category_code,
-      arm.form_id
-    FROM cr_wf_action a
-    LEFT JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
-    LEFT JOIN cr_wf_action_category ac ON a.action_category = ac.id
-    LEFT JOIN cr_wf_action_resources_mapping arm ON m.id = arm.stg_act_mapping_id
-    WHERE m.stage_id = ?
+        const result = await this.dataSource.query(`
+    SELECT 
+      a.*, 
+      m.stage_id, 
+      ac.code AS action_category_code,
+      arm.form_id
+    FROM cr_wf_action a
+    LEFT JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
+    LEFT JOIN cr_wf_action_category ac ON a.action_category = ac.id
+    LEFT JOIN cr_wf_action_resources_mapping arm ON m.id = arm.stg_act_mapping_id
+    WHERE m.stage_id = ?
     `, [stageId]);
         return result;
     }