rez_core 3.1.197 → 3.1.198

package/dist/module/mapper/service/field-mapper.service.js

@@ -100,10 +100,10 @@ let FieldMapperService = class FieldMapperService extends entity_service_impl_se
                             await super.getResolvedEntityDataByDataSource(entityType, parent_id, userData);
                     }
                     else {
-                        const relations = await this.datasource.query(`SELECT target_entity_id
-             FROM cr_entity_relation_data
-             WHERE source_entity_type = ?
-               AND source_entity_id = ?
+                        const relations = await this.datasource.query(`SELECT target_entity_id
+             FROM cr_entity_relation_data
+             WHERE source_entity_type = ?
+               AND source_entity_id = ?
                AND target_entity_type = ?`, [parent_type, parent_id, field.mapped_entity_type]);
                         const targetEntityIds = relations.map((r) => r.target_entity_id);
                         this.loggingService.log('package', 'fieldMapperService', 'targetEntityIds', targetEntityIds);

package/dist/module/mapper/service/mapper.service.js

@@ -27,11 +27,9 @@ let MapperService = class MapperService extends entity_service_impl_service_1.En
     async getByMappedEntityType(mappedEntityType, filter, status) {
         if (!mappedEntityType)
             return [];
-        const mappers = await this.dataSource.query(`SELECT id, name, code, status
-       FROM cr_mapper_master
-       WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?) 
-       AND (-1 = ? OR status = ?)
-       `, [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`, status || -1, status]);
+        const mappers = await this.dataSource.query(`SELECT id, name, code, status
+       FROM cr_mapper_master
+       WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`, [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`]);
         const distinctStatuses = [
             ...new Set(mappers.map((m) => m.status).filter((s) => s !== null)),
         ];
@@ -42,13 +40,17 @@ let MapperService = class MapperService extends entity_service_impl_service_1.En
                 statusMap.set(status.id, status.name);
             });
         }
-        return mappers.map((m) => ({
+        let mappersResolved = mappers.map((m) => ({
             id: m.id,
             label: m.name,
             value: m.id,
             code: m.code,
             status: statusMap.get(m.status) || null,
         }));
+        if (status) {
+            mappersResolved = mappersResolved.filter((m) => m.status && m.status.toLowerCase() === status.toLowerCase());
+        }
+        return mappersResolved;
     }
     async deleteEntity(entityType, entityId, loggedInUser) {
         let fieldMappers = await this.fieldMapperRepository.findByMapperId(entityId);

package/dist/module/mapper/service/mapper.service.js.map

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

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

@@ -43,8 +43,8 @@ let EntityDynamicService = class EntityDynamicService {
                 entityData.entity_type = entityType;
         }
         if (!entityData.code && loggedInUser) {
-            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM ${tableName}
+            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM ${tableName}
      WHERE entity_type = ?`, [entityData.entity_type]);
             let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
             maxSeqNo += 1;
@@ -149,7 +149,7 @@ let EntityDynamicService = class EntityDynamicService {
     }
     async getEntityWithRelation(entityType, id, loggedInUser) {
         const mainEntity = await this.getEntity(entityType, id, loggedInUser);
-        const relatedEntities = await this.dataSource.query(`SELECT * FROM cr_entity_relation_data WHERE  source_entity_id = ? AND target_entity_type IN (
+        const relatedEntities = await this.dataSource.query(`SELECT * FROM cr_entity_relation_data WHERE  source_entity_id = ? AND target_entity_type IN (
       SELECT target_entity_type FROM cr_entity_relation WHERE source_entity_type = ?)`, [id, entityType]);
         const response = {
             entity_type: entityType,
@@ -207,8 +207,8 @@ let EntityDynamicService = class EntityDynamicService {
                         targetEntityId = createdEntity.insertId || createdEntity.id;
                         entityData = await this.getEntity(targetEntityType, targetEntityId, loggedInUser);
                     }
-                    await this.dataSource.query(`INSERT INTO cr_entity_relation_data 
-          (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
+                    await this.dataSource.query(`INSERT INTO cr_entity_relation_data 
+          (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
           VALUES (?, ?, ?, ?, ?,?)`, [
                         organizationId,
                         id,
@@ -253,8 +253,8 @@ let EntityDynamicService = class EntityDynamicService {
                 entityData.enterprise_id = loggedInUser.enterprise_id;
         }
         if (!entityData.code && loggedInUser) {
-            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM ${tableName}
+            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM ${tableName}
      WHERE entity_type = ?`, [entityData.entity_type]);
             let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
             maxSeqNo += 1;
@@ -365,13 +365,13 @@ let EntityDynamicService = class EntityDynamicService {
         return result[0].db_table_name;
     }
     async getAttributeCodes(entityType, organizationId) {
-        const result = await this.dataSource.query(`SELECT attribute_key,  
-    MAX(db_datatype) AS db_datatype,
-    MAX(element_type) AS element_type,
-    MAX(is_hidden) AS is_hidden
-     FROM cr_entity_attribute
-     WHERE mapped_entity_type = ? AND organization_id = ? 
-     and (is_hidden IS NULL OR is_hidden = 0)  -- Exclude hidden attributes
+        const result = await this.dataSource.query(`SELECT attribute_key,  
+    MAX(db_datatype) AS db_datatype,
+    MAX(element_type) AS element_type,
+    MAX(is_hidden) AS is_hidden
+     FROM cr_entity_attribute
+     WHERE mapped_entity_type = ? AND organization_id = ? 
+     and (is_hidden IS NULL OR is_hidden = 0)  -- Exclude hidden attributes
      GROUP BY attribute_key`, [entityType, organizationId]);
         if (!result.length) {
             console.log(`No attributes found for entity '${entityType}' and org '${organizationId}'`);
@@ -403,15 +403,15 @@ let EntityDynamicService = class EntityDynamicService {
     }
     async getCode(entityType, loggedInUser) {
         const organizationId = loggedInUser.organization_id;
-        const result = await this.dataSource.query(`SELECT db_table_name 
-     FROM cr_entity_master 
+        const result = await this.dataSource.query(`SELECT db_table_name 
+     FROM cr_entity_master 
      WHERE mapped_entity_type = ? AND organization_id = ?`, [entityType, organizationId]);
         if (!result.length) {
             throw new Error(`Entity type '${entityType}' not found in cr_entity_master for org '${organizationId}'`);
         }
         const tableName = result[0].db_table_name;
-        const seqResult = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM \`${tableName}\`
+        const seqResult = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM \`${tableName}\`
      WHERE entity_type = ?`, [entityType]);
         let maxSeqNo = seqResult?.[0]?.max_seq_no
             ? Number(seqResult[0].max_seq_no)

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.js

@@ -125,12 +125,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;
@@ -145,7 +145,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;
         }

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

@@ -66,11 +66,11 @@ let NotificationsService = class NotificationsService {
             const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
             isReadFilter = isReadBool ? 1 : 0;
         }
-        let query = `
-    SELECT
-      n.*
-    FROM cr_notification n
-    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
+        let query = `
+    SELECT
+      n.*
+    FROM cr_notification n
+    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
   `;
         const params = [id, level_id, level_type];
         if (isReadFilter !== undefined) {
@@ -104,10 +104,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;
     }

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

@@ -62,14 +62,14 @@ let StageRepository = class StageRepository {
         if (!stageGroup) {
             return [];
         }
-        const rows = await this.dataSource.query(`
-    SELECT 
-      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
-      s.*
-    FROM cr_wf_stage_group g
-    INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
-    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
-    ORDER BY g.id, s.id
+        const rows = await this.dataSource.query(`
+    SELECT 
+      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+      s.*
+    FROM cr_wf_stage_group g
+    INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
+    ORDER BY g.id, s.id
     `, [stageGroup.workflow_id, organization_id, stage_group_id]);
         if (!rows || rows.length === 0) {
             return [];