rez_core 5.0.55 → 5.0.56

package/dist/module/integration/service/wrapper.service.js

@@ -31,10 +31,10 @@ let WrapperService = WrapperService_1 = class WrapperService {
             this.loggingService.log('debug', 'wrapperService', 'sendMailWrapper', `sendMailWrapper called. User: ${JSON.stringify(loggedInUser)}, Payload: ${JSON.stringify(payload)}`, [], []);
             const { level_id, level_type, organization_id } = loggedInUser;
             this.loggingService.log('debug', 'wrapperService', 'sendMailWrapper', `Fetching configs for level_id=${level_id}, level_type=${level_type}`, [], []);
-            const configs = await this.datasource.query(`SELECT * FROM frm_integration_config 
-         WHERE level_id = $1
-           AND level_type = $2 
-           AND status = 1
+            const configs = await this.datasource.query(`SELECT * FROM frm_integration_config 
+         WHERE level_id = $1
+           AND level_type = $2 
+           AND status = 1
            AND integration_type = 'EMAIL'`, [level_id, level_type]);
             this.loggingService.log('debug', 'wrapperService', 'sendMailWrapper', `Configs found: ${JSON.stringify(configs)}`, [], []);
             let templateCode;
@@ -70,9 +70,9 @@ let WrapperService = WrapperService_1 = class WrapperService {
             }
             else {
                 this.loggingService.log('warn', 'wrapperService', 'sendMailWrapper', `No user-level configs found. Falling back to ORG-level`, [], []);
-                const fallbackConfigs = await this.datasource.query(`SELECT * FROM frm_integration_config 
-           WHERE level_type = 'ORG' 
-             AND integration_type = 'EMAIL'
+                const fallbackConfigs = await this.datasource.query(`SELECT * FROM frm_integration_config 
+           WHERE level_type = 'ORG' 
+             AND integration_type = 'EMAIL'
              AND status = 1`);
                 this.loggingService.log('debug', 'wrapperService', 'sendMailWrapper', `ORG-level configs: ${JSON.stringify(fallbackConfigs)}`, [], []);
                 if (!fallbackConfigs || fallbackConfigs.length === 0) {
@@ -130,17 +130,17 @@ let WrapperService = WrapperService_1 = class WrapperService {
             let resolvedTemplateId = entity?.templateId;
             if (entity.template_code) {
                 this.loggingService.log('debug', 'wrapperService', 'sendCommunicationWrapperService', `Looking up template for code=${entity.template_code}, level_id=${level_id}, level_type=${level_type}`, [], []);
-                let templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template 
-         WHERE code = $1 
-           AND level_id = $2 
-           AND level_type = $3 
+                let templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template 
+         WHERE code = $1 
+           AND level_id = $2 
+           AND level_type = $3 
          LIMIT 1`, [entity.template_code, level_id, level_type]);
                 if (!templates || templates.length === 0) {
                     this.loggingService.log('warn', 'wrapperService', 'sendCommunicationWrapperService', `No template found for ${entity.template_code} at provided level. Falling back to ORG-level.`, [], []);
-                    templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template 
-           WHERE code = $1 
-             AND level_type = 'ORG' 
-             AND organization_id = $2 
+                    templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template 
+           WHERE code = $1 
+             AND level_type = 'ORG' 
+             AND organization_id = $2 
            LIMIT 1`, [entity.template_code, organization_id]);
                 }
                 if (templates && templates.length > 0) {
@@ -206,11 +206,11 @@ let WrapperService = WrapperService_1 = class WrapperService {
                 };
             }
             this.loggingService.log('log', 'wrapperService', 'scheduleMeetingWrapper', `No user-level config found, checking ORG-level...`, [], []);
-            const orgConfigs = await this.datasource.query(`SELECT * FROM frm_integration_config 
-       WHERE level_id = 1
-         AND level_type = 'ORG' 
-         AND integration_type = 'EMAIL'
-         AND app_code ='DEFAULT'
+            const orgConfigs = await this.datasource.query(`SELECT * FROM frm_integration_config 
+       WHERE level_id = 1
+         AND level_type = 'ORG' 
+         AND integration_type = 'EMAIL'
+         AND app_code ='DEFAULT'
          AND status = 1`, []);
             integrationConfig = await this.integrationService.getSingleActiveConfig(1, 'ORG', 'DEFAULT', 'EMAIL');
             this.loggingService.log('debug', 'wrapperService', 'scheduleMeetingWrapper', `ORG configs found: ${JSON.stringify(orgConfigs)}`, [], []);
@@ -228,8 +228,8 @@ let WrapperService = WrapperService_1 = class WrapperService {
     }
     async getConfigCred(configId) {
         this.loggingService.log('debug', 'wrapperService', 'getConfigCred', `Fetching config JSON for configId=${configId}`, [], []);
-        const configRes = await this.datasource.query(`SELECT config_json 
-       FROM frm_integration_config 
+        const configRes = await this.datasource.query(`SELECT config_json 
+       FROM frm_integration_config 
        WHERE id = $1`, [configId]);
         this.loggingService.log('debug', 'wrapperService', 'getConfigCred', `Config fetch result: ${JSON.stringify(configRes)}`, [], []);
         return configRes?.[0]?.config_json || null;
@@ -237,10 +237,10 @@ let WrapperService = WrapperService_1 = class WrapperService {
     async sendIcsInvite(payload, levelId, levelType, appCode, organizationId, mapped_entities) {
         this.loggingService.log('log', 'wrapperService', 'sendIcsInvite', `Generating ICS file. Payload: ${JSON.stringify(payload)}`, [], []);
         if (payload.template_code) {
-            let templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template 
-         WHERE code = $1 
-           AND level_id = $2 
-           AND level_type = $3 
+            let templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template 
+         WHERE code = $1 
+           AND level_id = $2 
+           AND level_type = $3 
          LIMIT 1`, [payload.template_code, levelId, levelType]);
             this.logger.log(`template by code  ${JSON.stringify(payload)}`);
             if (templates && templates.length > 0) {

package/dist/module/listmaster/service/list-master-item.service.js

@@ -132,8 +132,8 @@ let ListMasterItemService = class ListMasterItemService extends entity_service_i
         return `Item with name ${code} deleted successfully from type ${listType}`;
     }
     async getListSourceType(loggedInUser, source) {
-        const data = await this.dataSource.query(`SELECT name AS label, type AS value
-     FROM frm_list_master
+        const data = await this.dataSource.query(`SELECT name AS label, type AS value
+     FROM frm_list_master
      WHERE organization_id = $1 AND source = $2`, [loggedInUser.organization_id, source]);
         return data;
     }

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

@@ -107,10 +107,10 @@ let FieldMapperService = class FieldMapperService extends entity_service_impl_se
                                 entity_data[field.mapped_entity_type];
                         }
                         else {
-                            const relations = await this.datasource.query(`SELECT target_entity_id
-                 FROM frm_entity_relation_data
-                 WHERE source_entity_type = $1
-                   AND source_entity_id = $2
+                            const relations = await this.datasource.query(`SELECT target_entity_id
+                 FROM frm_entity_relation_data
+                 WHERE source_entity_type = $1
+                   AND source_entity_id = $2
                    AND target_entity_type = $3`, [parent_type, parent_id, field.mapped_entity_type]);
                             const targetEntityIds = relations.map((r) => r.target_entity_id);
                             this.loggingService.log('debug', 'fieldMapperService', 'resolveData', `Resolved targetEntityIds: ${targetEntityIds} for entityType: ${entityType}`, [parent_type, parent_id, field.mapped_entity_type], []);

package/dist/module/meta/repository/entity-attribute-update.repository.js

@@ -18,9 +18,9 @@ let EntityUpdateRepository = class EntityUpdateRepository {
     }
     async updateEntityAttribute(entity, config) {
         const { entityType, organization_id } = entity;
-        const result = await this.dataSource.query(`SELECT db_table_name 
-     FROM frm_entity_master 
-     WHERE mapped_entity_type = ?
+        const result = await this.dataSource.query(`SELECT db_table_name 
+     FROM frm_entity_master 
+     WHERE mapped_entity_type = ?
      and organization_id = ?`, [config.entity_type, organization_id]);
         if (!result.length) {
             throw new Error("Entity table not found");

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

@@ -29,8 +29,8 @@ let EntityMasterRepository = class EntityMasterRepository {
     async getEntityById(id) {
         let data = await this.entityMasterRepository.findOne({ where: { id } });
         if (data) {
-            let listMasterData = await this.entityMasterRepository.query(`SELECT *
-         FROM frm_list_master_items
+            let listMasterData = await this.entityMasterRepository.query(`SELECT *
+         FROM frm_list_master_items
          where id = $1`, [data?.status]);
             data.status = listMasterData?.[0].name;
         }
@@ -81,10 +81,10 @@ let EntityMasterRepository = class EntityMasterRepository {
     }
     async getAttributesOfTypeDate(entity_type, loggedInUser) {
         const organization_id = loggedInUser.organization_id;
-        const attributes = await this.dataSource.query(`SELECT *
-       FROM frm_entity_attribute
-       WHERE mapped_entity_type = $1
-         AND data_type = 'DATE'
+        const attributes = await this.dataSource.query(`SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND data_type = 'DATE'
          AND organization_id = $2`, [entity_type, organization_id]);
         const attributeList = attributes.map((attr) => ({
             label: attr.name,

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

@@ -43,19 +43,19 @@ let EntityDynamicService = class EntityDynamicService {
             if (!entityData.entity_type)
                 entityData.entity_type = entityType;
         }
-        const statusList = await this.dataSource.query(`
-          SELECT id
-          FROM frm_list_master_items
-          WHERE code = $1
-            AND organization_id = $2
+        const statusList = await this.dataSource.query(`
+          SELECT id
+          FROM frm_list_master_items
+          WHERE code = $1
+            AND organization_id = $2
       `, [global_constant_1.STATUS_ACTIVE, organizationId]);
         if (!entityData.status)
             entityData.status = statusList[0]?.id;
         if (!entityData.code && entityData.entity_type) {
-            const result = await this.dataSource.query(`
-            SELECT MAX(id) AS max_seq_no
-            FROM ${tableName}
-            WHERE entity_type = $1
+            const result = await this.dataSource.query(`
+            SELECT MAX(id) AS max_seq_no
+            FROM ${tableName}
+            WHERE entity_type = $1
         `, [entityData.entity_type]);
             let maxSeq = Number(result?.[0]?.max_seq_no) || 0;
             maxSeq++;
@@ -99,18 +99,18 @@ let EntityDynamicService = class EntityDynamicService {
         }
         const colList = columns.map((c) => `"${c}"`).join(', ');
         const placeholderList = placeholders.join(', ');
-        const sql = `
-        INSERT INTO ${tableName} (${colList})
-        VALUES (${placeholderList}) RETURNING id
+        const sql = `
+        INSERT INTO ${tableName} (${colList})
+        VALUES (${placeholderList}) RETURNING id
     `;
         const result = await this.dataSource.query(sql, values);
         return result[0];
     }
     async createEntityWithRelation(entityType, data, loggedInUser) {
         const organizationId = loggedInUser.organization_id;
-        const getRelation = await this.dataSource.query(`SELECT *
-       FROM frm_entity_relation
-       WHERE organization_id = $1
+        const getRelation = await this.dataSource.query(`SELECT *
+       FROM frm_entity_relation
+       WHERE organization_id = $1
          AND source_entity_type = $2`, [organizationId, entityType]);
         const { mappedEntities, ...mainData } = data;
         const createdEntityData = await this.createEntity(entityType, mainData, loggedInUser);
@@ -131,8 +131,8 @@ let EntityDynamicService = class EntityDynamicService {
                         entity_type: targetEntityType,
                     };
                     const createdRelatedEntity = await this.createEntity(targetEntityType, itemWithRef, loggedInUser, mainID);
-                    await this.dataSource.query(`INSERT INTO frm_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 frm_entity_relation_data (organization_id, source_entity_id, source_entity_type,
+                                                   target_entity_id, target_entity_type, relation_type)
              VALUES ($1, $2, $3, $4, $5, $6)`, [
                         organizationId,
                         mainID,
@@ -154,9 +154,9 @@ let EntityDynamicService = class EntityDynamicService {
     }
     async getEntityWithRelation(entityType, id, loggedInUser) {
         const mainEntity = await this.getEntityByDataSource(entityType, id, loggedInUser);
-        const relatedEntities = await this.dataSource.query(`SELECT *
-       FROM frm_entity_relation_data
-       WHERE source_entity_id = $1
+        const relatedEntities = await this.dataSource.query(`SELECT *
+       FROM frm_entity_relation_data
+       WHERE source_entity_id = $1
          AND target_entity_type IN (SELECT target_entity_type FROM frm_entity_relation WHERE source_entity_type = $2)`, [id, entityType]);
         const response = {
             entity_type: entityType,
@@ -186,9 +186,9 @@ let EntityDynamicService = class EntityDynamicService {
         const updatedMainEntity = await this.updateEntity(entityType, id, mainData, loggedInUser);
         const updatedRelations = {};
         if (mappedEntities) {
-            const getRelationDefs = await this.dataSource.query(`SELECT *
-         FROM frm_entity_relation
-         WHERE organization_id = $1
+            const getRelationDefs = await this.dataSource.query(`SELECT *
+         FROM frm_entity_relation
+         WHERE organization_id = $1
            AND source_entity_type = $2`, [organizationId, entityType]);
             for (const [targetEntityType, rawEntityData] of Object.entries(mappedEntities)) {
                 const relationDef = getRelationDefs.find((r) => r.target_entity_type === targetEntityType);
@@ -198,10 +198,10 @@ let EntityDynamicService = class EntityDynamicService {
                 const entityArray = Array.isArray(rawEntityData)
                     ? rawEntityData
                     : [rawEntityData];
-                const existingRelationsForType = await this.dataSource.query(`SELECT *
-           FROM frm_entity_relation_data
-           WHERE source_entity_type = $1
-             AND source_entity_id = $2
+                const existingRelationsForType = await this.dataSource.query(`SELECT *
+           FROM frm_entity_relation_data
+           WHERE source_entity_type = $1
+             AND source_entity_id = $2
              AND target_entity_type = $3`, [entityType, id, targetEntityType]);
                 const updatedEntities = [];
                 for (const item of entityArray) {
@@ -216,9 +216,9 @@ let EntityDynamicService = class EntityDynamicService {
                         const createdEntity = await this.createEntity(targetEntityType, item, loggedInUser, Number(id));
                         targetEntityId = createdEntity.insertId || createdEntity.id;
                         entityData = await this.getEntity(targetEntityType, targetEntityId, loggedInUser);
-                        await this.dataSource.query(`INSERT INTO frm_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 frm_entity_relation_data
+               (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type,
+                relation_type)
                VALUES ($1, $2, $3, $4, $5, $6)`, [
                             organizationId,
                             id,
@@ -302,10 +302,10 @@ let EntityDynamicService = class EntityDynamicService {
         }
         const idPlaceholder = `$${idx}`;
         values.push(id);
-        const updateQuery = `
-        UPDATE ${tableName}
-        SET ${updates.join(', ')}
-        WHERE id = ${idPlaceholder}
+        const updateQuery = `
+        UPDATE ${tableName}
+        SET ${updates.join(', ')}
+        WHERE id = ${idPlaceholder}
     `;
         return await this.dataSource.query(updateQuery, values);
     }
@@ -316,8 +316,8 @@ let EntityDynamicService = class EntityDynamicService {
         const columns = validAttributes
             .map((attr) => `${attr.attribute_key}`)
             .join(', ');
-        const selectQuery = `SELECT ${columns}
-                         FROM ${dataSource}
+        const selectQuery = `SELECT ${columns}
+                         FROM ${dataSource}
                          WHERE id = $1`;
         const result = await this.dataSource.query(selectQuery, [id]);
         if (!result.length)
@@ -346,8 +346,8 @@ let EntityDynamicService = class EntityDynamicService {
         const columns = validAttributes
             .map((attr) => `t.${attr.attribute_key}`)
             .join(', ');
-        const selectQuery = `SELECT ${columns}
-                         FROM ${tableName} t
+        const selectQuery = `SELECT ${columns}
+                         FROM ${tableName} t
                          WHERE id = $1`;
         const result = await this.dataSource.query(selectQuery, [id]);
         if (!result.length)
@@ -409,16 +409,16 @@ let EntityDynamicService = class EntityDynamicService {
     async deleteEntity(entityType, id, loggedInUser) {
         const organizationId = loggedInUser.organization_id;
         const tableName = await this.getTableName(entityType, organizationId);
-        const deleteQuery = `DELETE
-                         FROM \`${tableName}\`
+        const deleteQuery = `DELETE
+                         FROM \`${tableName}\`
                          WHERE id = $1`;
         const result = await this.dataSource.query(deleteQuery, [id]);
         return result;
     }
     async getEntitiesDropdownList(loggedInUser, appcode) {
         const organizationId = loggedInUser.organization_id;
-        let query = `SELECT name as label, mapped_entity_type as value
-                 FROM frm_entity_master
+        let query = `SELECT name as label, mapped_entity_type as value
+                 FROM frm_entity_master
                  WHERE organization_id = $1`;
         const params = [organizationId];
         if (appcode) {
@@ -435,8 +435,8 @@ let EntityDynamicService = class EntityDynamicService {
             throw new Error(`Entity type '${entityType}' not found in frm_entity_master for org '${organizationId}'`);
         }
         const tableName = result.db_table_name;
-        const seqResult = await this.dataSource.query(`SELECT MAX(id) AS max_seq_no
-       FROM ${tableName}
+        const seqResult = await this.dataSource.query(`SELECT MAX(id) AS max_seq_no
+       FROM ${tableName}
        WHERE entity_type = $1`, [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 max(id) as seq_no
+        const query = `SELECT max(id) as seq_no
                  FROM ${tableName} WHERE 1=1 `;
         const argsObjectList = [];
         const result = await this.entityManager.query(query, argsObjectList);

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

@@ -21,8 +21,8 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
         this.entityMasterRepo = entityMasterRepo;
     }
     async getEntityRelations(entityType, loggedInUser, includeSelf = false) {
-        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
-       FROM frm_entity_relation 
+        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
+       FROM frm_entity_relation 
        WHERE source_entity_type = $1 AND organization_id = $2`, [entityType, loggedInUser.organization_id]);
         if (includeSelf) {
             const entity = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id);
@@ -53,13 +53,13 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
             .join(", ");
         params.push(Number(orgId));
         const orgPlaceholder = `$${paramIndex}`;
-        const sql = `
-        SELECT DISTINCT source_entity_id
-        FROM frm_entity_relation_data
-        WHERE source_entity_type = ${sourceEntityParam}
-          AND target_entity_type = ${targetEntityParam}
-          AND target_entity_id IN (${idPlaceholders})
-          AND organization_id = ${orgPlaceholder}
+        const sql = `
+        SELECT DISTINCT source_entity_id
+        FROM frm_entity_relation_data
+        WHERE source_entity_type = ${sourceEntityParam}
+          AND target_entity_type = ${targetEntityParam}
+          AND target_entity_id IN (${idPlaceholders})
+          AND organization_id = ${orgPlaceholder}
     `;
         const rows = await this.dataSource.query(sql, params);
         return rows.map((r) => Number(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 frm_list_master_items
-       WHERE code = $1
+        const statusList = await repo.query(`SELECT id
+       FROM frm_list_master_items
+       WHERE code = $1
          AND organization_id = $2`, [global_constant_1.STATUS_ACTIVE, loggedInUser?.organization_id || 0]);
         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

@@ -94,11 +94,18 @@ let ResolverService = class ResolverService {
         if (rawValue === null || rawValue === undefined || rawValue === '') {
             return rawValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`, [entityType, loggedInUser.organization_id, attrKey]);
+        const [attr] = await this.dataSource.query(`SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2
+         AND attribute_key = $3`, [entityType, loggedInUser.organization_id, attrKey]);
         if (!attr)
             return rawValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT * FROM frm_entity_master WHERE mapped_entity_type = $1 AND organization_id = $2`, [attr.datasource_list, loggedInUser.organization_id]);
+            const [entityDef] = await this.dataSource.query(`SELECT *
+         FROM frm_entity_master
+         WHERE mapped_entity_type = $1
+           AND organization_id = $2`, [attr.datasource_list, loggedInUser.organization_id]);
             if (!entityDef)
                 return rawValue;
             const tableName = entityDef.db_table_name;
@@ -106,8 +113,13 @@ let ResolverService = class ResolverService {
                 const resolvedValues = [];
                 for (const code of rawValue) {
                     const query = tableName === 'sso_organization'
-                        ? `SELECT * FROM ${tableName} WHERE code = $1`
-                        : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+                        ? `SELECT *
+                 FROM ${tableName}
+                 WHERE code = $1`
+                        : `SELECT *
+                 FROM ${tableName}
+                 WHERE id = $1
+                   AND organization_id = $2`;
                     const params = tableName === 'sso_organization'
                         ? [code]
                         : [code, loggedInUser.organization_id];
@@ -118,8 +130,13 @@ let ResolverService = class ResolverService {
             }
             else {
                 const query = tableName === 'sso_organization'
-                    ? `SELECT * FROM ${tableName} WHERE id = $1`
-                    : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+                    ? `SELECT *
+               FROM ${tableName}
+               WHERE id = $1`
+                    : `SELECT *
+               FROM ${tableName}
+               WHERE id = $1
+                 AND organization_id = $2`;
                 const params = tableName === 'sso_organization'
                     ? [rawValue]
                     : [rawValue, loggedInUser.organization_id];
@@ -132,7 +149,7 @@ let ResolverService = class ResolverService {
                 const resolvedValues = [];
                 for (const code of rawValue) {
                     const repo = await this.reflectionHelper.getRepoService('ListMasterItems');
-                    let item = await repo.findOne({
+                    let item = repo.findOne({
                         where: {
                             id: code,
                             organization_id: loggedInUser.organization_id,
@@ -144,9 +161,9 @@ let ResolverService = class ResolverService {
             }
             else {
                 const repo = await this.reflectionHelper.getRepoService('ListMasterItems');
-                let item = await repo.findOne({
+                let item = repo.findOne({
                     where: {
-                        id: rawValue,
+                        id: Number(rawValue),
                         organization_id: loggedInUser.organization_id,
                     },
                 });
@@ -161,19 +178,29 @@ let ResolverService = class ResolverService {
             displayValue === '') {
             return displayValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT * FROM frm_entity_attribute 
-       WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`, [entityType, loggedInUser.organization_id, attrKey]);
+        const [attr] = await this.dataSource.query(`SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2
+         AND attribute_key = $3`, [entityType, loggedInUser.organization_id, attrKey]);
         if (!attr)
             return displayValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT * FROM frm_entity_master 
-         WHERE mapped_entity_type = $1 AND organization_id = $2`, [attr.datasource_list, loggedInUser.organization_id]);
+            const [entityDef] = await this.dataSource.query(`SELECT *
+         FROM frm_entity_master
+         WHERE mapped_entity_type = $1
+           AND organization_id = $2`, [attr.datasource_list, loggedInUser.organization_id]);
             if (!entityDef)
                 return displayValue;
             const tableName = entityDef.db_table_name;
             const query = tableName === 'sso_organization'
-                ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1`
-                : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2`;
+                ? `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1`
+                : `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1
+               AND organization_id = $2`;
             const params = tableName === 'sso_organization'
                 ? [displayValue]
                 : [displayValue, loggedInUser.organization_id];
@@ -181,8 +208,11 @@ let ResolverService = class ResolverService {
             return item?.id ?? displayValue;
         }
         else if (attr.data_source_type === 'master') {
-            const [item] = await this.dataSource.query(`SELECT id FROM frm_list_master_items 
-         WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2 AND listtype = $3`, [displayValue, loggedInUser.organization_id, attr.datasource_list]);
+            const [item] = await this.dataSource.query(`SELECT id
+         FROM frm_list_master_items
+         WHERE ${attr.data_source_attribute} = $1
+           AND organization_id = $2
+           AND listtype = $3`, [displayValue, loggedInUser.organization_id, attr.datasource_list]);
             return item?.id ?? displayValue;
         }
         return displayValue;

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

@@ -62,10 +62,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 })
@@ -84,16 +84,16 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
         if (userId) {
-            const getUserDetails = await this.dataSource.query(`
-            SELECT *
-            from sso_user
-            where id = $1
+            const getUserDetails = await this.dataSource.query(`
+            SELECT *
+            from sso_user
+            where id = $1
         `, [userId]);
-            const getUserUrm = await this.dataSource.query(`
-            SELECT *
-            from sso_user_role_mapping
-            where user_id = $1
-              and appcode = $2
+            const getUserUrm = await this.dataSource.query(`
+            SELECT *
+            from sso_user_role_mapping
+            where user_id = $1
+              and appcode = $2
         `, [userId, appcode]);
             if (getUserDetails.length > 0 &&
                 getUserDetails[0].organization_id === 1) {
@@ -112,10 +112,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 sso_school s
-            WHERE s.id = $1
+            const [sch] = await this.dataSource.query(`
+            SELECT s.brand_id, s.organization_id
+            FROM sso_school s
+            WHERE s.id = $1
         `, [levelId]);
             const brandId = sch?.brand_id;
             const orgId = sch?.organization_id;