rez_core 5.0.33 → 5.0.35

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/linked_attributes/controller/linked_attributes.controller.d.ts

@@ -3,5 +3,5 @@ export declare class LinkedAttributesController {
     private readonly linkedAttributesService;
     constructor(linkedAttributesService: LinkedAttributesService);
     getAll(req: any): Promise<import("../entity/linked_attribute.entity").LinkedAttributes[]>;
-    upsertLinkedAttributes(req: any, payload: any): Promise<any[]>;
+    upsertLinkedAttributes(req: any, payload: any): Promise<import("../entity/linked_attribute.entity").LinkedAttributes[]>;
 }

package/dist/module/linked_attributes/controller/linked_attributes.controller.js

@@ -26,7 +26,7 @@ let LinkedAttributesController = class LinkedAttributesController {
     }
     async upsertLinkedAttributes(req, payload) {
         const loggedInUser = req.user?.userData;
-        return this.linkedAttributesService.upsert(payload, loggedInUser);
+        return this.linkedAttributesService.upsertLinkedAttributes(payload, loggedInUser);
     }
 };
 exports.LinkedAttributesController = LinkedAttributesController;

package/dist/module/linked_attributes/controller/linked_attributes.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"linked_attributes.controller.js","sourceRoot":"","sources":["../../../../src/module/linked_attributes/controller/linked_attributes.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,oFAA+E;AAC/E,2DAAgE;AAGzD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACrC,YAEmB,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;IAChE,CAAC;IAIE,AAAN,KAAK,CAAC,MAAM,CAAQ,GAAQ;QAC1B,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QAExC,OAAO,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAIK,AAAN,KAAK,CAAC,sBAAsB,CAAQ,GAAQ,EAAU,OAAY;QAChE,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QACxC,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AApBY,gEAA0B;AAQ/B;IAFL,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACV,WAAA,IAAA,YAAG,GAAE,CAAA;;;;wDAIlB;AAIK;IAFL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACd,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACM,WAAA,IAAA,YAAG,GAAE,CAAA;IAAY,WAAA,IAAA,aAAI,GAAE,CAAA;;;;wEAGpD;qCAnBU,0BAA0B;IADtC,IAAA,mBAAU,EAAC,mBAAmB,CAAC;IAG3B,WAAA,IAAA,eAAM,EAAC,yBAAyB,CAAC,CAAA;qCACQ,mDAAuB;GAHxD,0BAA0B,CAoBtC"}
+{"version":3,"file":"linked_attributes.controller.js","sourceRoot":"","sources":["../../../../src/module/linked_attributes/controller/linked_attributes.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,oFAA+E;AAC/E,2DAAgE;AAGzD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACrC,YAEmB,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;IAChE,CAAC;IAIE,AAAN,KAAK,CAAC,MAAM,CAAQ,GAAQ;QAC1B,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QAExC,OAAO,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAIK,AAAN,KAAK,CAAC,sBAAsB,CAAQ,GAAQ,EAAU,OAAY;QAChE,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QACxC,OAAO,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CACxD,OAAO,EACP,YAAY,CACb,CAAC;IACJ,CAAC;CACF,CAAA;AAvBY,gEAA0B;AAQ/B;IAFL,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACV,WAAA,IAAA,YAAG,GAAE,CAAA;;;;wDAIlB;AAIK;IAFL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACd,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACM,WAAA,IAAA,YAAG,GAAE,CAAA;IAAY,WAAA,IAAA,aAAI,GAAE,CAAA;;;;wEAMpD;qCAtBU,0BAA0B;IADtC,IAAA,mBAAU,EAAC,mBAAmB,CAAC;IAG3B,WAAA,IAAA,eAAM,EAAC,yBAAyB,CAAC,CAAA;qCACQ,mDAAuB;GAHxD,0BAA0B,CAuBtC"}

package/dist/module/linked_attributes/service/linked_attributes.service.d.ts

@@ -6,5 +6,5 @@ export declare class LinkedAttributesService extends EntityServiceImpl {
     constructor(dataSource: DataSource);
     createEntity(payload: any, loggedInUser: any): Promise<any>;
     getAllLinkedAttributes(loggedInUser: any): Promise<LinkedAttributes[]>;
-    upsert(payloadList: any[], loggedInUser: any): Promise<any[]>;
+    upsertLinkedAttributes(payloadList: any[], loggedInUser: any): Promise<LinkedAttributes[]>;
 }

package/dist/module/linked_attributes/service/linked_attributes.service.js

@@ -36,53 +36,35 @@ let LinkedAttributesService = class LinkedAttributesService extends entity_servi
             .where('fla.organization_id = :orgId', { orgId })
             .getMany();
     }
-    async upsert(payloadList, loggedInUser) {
+    async upsertLinkedAttributes(payloadList, loggedInUser) {
         const orgId = loggedInUser.organization_id;
-        const output = [];
-        for (const payload of payloadList) {
-            payload.organization_id = orgId;
-            if (payload.id) {
-                const existing = await this.dataSource
-                    .getRepository(linked_attribute_entity_1.LinkedAttributes)
-                    .createQueryBuilder('la')
-                    .where('la.id = :id', { id: payload.id })
-                    .andWhere('la.organization_id = :orgId', { orgId })
-                    .getOne();
-                if (!existing) {
-                    continue;
-                }
-                await this.dataSource
-                    .createQueryBuilder()
-                    .update(linked_attribute_entity_1.LinkedAttributes)
-                    .set(payload)
-                    .where('id = :id', { id: payload.id })
-                    .andWhere('organization_id = :orgId', { orgId })
-                    .execute();
-                const updated = await this.dataSource
-                    .getRepository(linked_attribute_entity_1.LinkedAttributes)
-                    .createQueryBuilder('la')
-                    .where('la.id = :id', { id: payload.id })
-                    .andWhere('la.organization_id = :orgId', { orgId })
-                    .getOne();
-                output.push(updated);
-                continue;
-            }
-            const insertResult = await this.dataSource
-                .createQueryBuilder()
-                .insert()
-                .into(linked_attribute_entity_1.LinkedAttributes)
-                .values(payload)
-                .execute();
-            const newId = insertResult.identifiers[0].id;
-            const created = await this.dataSource
-                .getRepository(linked_attribute_entity_1.LinkedAttributes)
-                .createQueryBuilder('la')
-                .where('la.id = :id', { id: newId })
-                .andWhere('la.organization_id = :orgId', { orgId })
-                .getOne();
-            output.push(created);
-        }
-        return output;
+        await this.dataSource
+            .createQueryBuilder()
+            .delete()
+            .from(linked_attribute_entity_1.LinkedAttributes)
+            .where('organization_id = :orgId', { orgId })
+            .execute();
+        const newPayloads = payloadList.map((item) => ({
+            ...item,
+            organization_id: orgId,
+            attribute_key: item.attribute_key
+                ? item.attribute_key.trim().toLowerCase().replace(/\s+/g, '_')
+                : item.field_name.trim().toLowerCase().replace(/\s+/g, '_'),
+        }));
+        const insertResult = await this.dataSource
+            .createQueryBuilder()
+            .insert()
+            .into(linked_attribute_entity_1.LinkedAttributes)
+            .values(newPayloads)
+            .execute();
+        const ids = insertResult.identifiers.map((i) => i.id);
+        const newlyCreated = await this.dataSource
+            .getRepository(linked_attribute_entity_1.LinkedAttributes)
+            .createQueryBuilder('la')
+            .where('la.id IN (:...ids)', { ids })
+            .andWhere('la.organization_id = :orgId', { orgId })
+            .getMany();
+        return newlyCreated;
     }
 };
 exports.LinkedAttributesService = LinkedAttributesService;

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

@@ -1 +1 @@
-{"version":3,"file":"linked_attributes.service.js","sourceRoot":"","sources":["../../../../src/module/linked_attributes/service/linked_attributes.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"linked_attributes.service.js","sourceRoot":"","sources":["../../../../src/module/linked_attributes/service/linked_attributes.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,gGAAwF;AACxF,qCAAqC;AACrC,+EAAqE;AAG9D,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,+CAAiB;IAC5D,YAA6B,UAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAY,EAAE,YAAiB;QAEhD,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAClE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,UAAU;iBACvC,IAAI,EAAE;iBACN,WAAW,EAAE;iBACb,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1B,CAAC;QAGD,OAAO,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,YAAiB;QAC5C,MAAM,KAAK,GAAG,YAAY,CAAC,eAAe,CAAC;QAE3C,OAAO,IAAI,CAAC,UAAU;aACnB,aAAa,CAAC,0CAAgB,CAAC;aAC/B,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC;aAChD,OAAO,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAkB,EAAE,YAAiB;QAChE,MAAM,KAAK,GAAG,YAAY,CAAC,eAAe,CAAC;QAG3C,MAAM,IAAI,CAAC,UAAU;aAClB,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,0CAAgB,CAAC;aACtB,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC;aAC5C,OAAO,EAAE,CAAC;QAGb,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,GAAG,IAAI;YACP,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,IAAI,CAAC,aAAa;gBAC/B,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;gBAC9D,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SAC9D,CAAC,CAAC,CAAC;QAGJ,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU;aACvC,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,0CAAgB,CAAC;aACtB,MAAM,CAAC,WAAW,CAAC;aACnB,OAAO,EAAE,CAAC;QAGb,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEtD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU;aACvC,aAAa,CAAC,0CAAgB,CAAC;aAC/B,kBAAkB,CAAC,IAAI,CAAC;aACxB,KAAK,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,CAAC;aACpC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC;aAClD,OAAO,EAAE,CAAC;QAEb,OAAO,YAAY,CAAC;IACtB,CAAC;CACF,CAAA;AApEY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,uBAAuB,CAoEnC"}

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++;
@@ -97,18 +97,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);
@@ -129,8 +129,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,
@@ -152,9 +152,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,
@@ -184,9 +184,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);
@@ -196,10 +196,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) {
@@ -214,9 +214,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,
@@ -300,10 +300,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);
     }
@@ -314,8 +314,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)
@@ -344,8 +344,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)
@@ -407,16 +407,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) {
@@ -433,8 +433,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-master.service.d.ts

@@ -3,13 +3,15 @@ import { EntityMaster } from '../entity/entity-master.entity';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 export declare class EntityMasterService {
     private entityMasterRepository;
+    private attributeMasterRepo;
     private entityMasterRepo;
     private readonly dataSource;
     private readonly listMasterService;
     private readonly savedFilterRepoService;
-    constructor(entityMasterRepository: Repository<EntityMaster>, entityMasterRepo: EntityMasterRepository, dataSource: DataSource, listMasterService: ListMasterService, savedFilterRepoService: SavedFilterRepositoryService);
+    constructor(entityMasterRepository: Repository<EntityMaster>, attributeMasterRepo: AttributeMasterRepository, entityMasterRepo: EntityMasterRepository, dataSource: DataSource, listMasterService: ListMasterService, savedFilterRepoService: SavedFilterRepositoryService);
     getEntityById(id: number): Promise<EntityMaster | null>;
     getAllEntityDropDown(entity_type: string, loggedInUser: any): Promise<{
         label: string;

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

@@ -20,9 +20,11 @@ const entity_master_entity_1 = require("../entity/entity-master.entity");
 const entity_master_repository_1 = require("../repository/entity-master.repository");
 const list_master_service_1 = require("../../listmaster/service/list-master.service");
 const saved_filter_repository_1 = require("../../filter/repository/saved-filter.repository");
+const attribute_master_repository_1 = require("../repository/attribute-master.repository");
 let EntityMasterService = class EntityMasterService {
-    constructor(entityMasterRepository, entityMasterRepo, dataSource, listMasterService, savedFilterRepoService) {
+    constructor(entityMasterRepository, attributeMasterRepo, entityMasterRepo, dataSource, listMasterService, savedFilterRepoService) {
         this.entityMasterRepository = entityMasterRepository;
+        this.attributeMasterRepo = attributeMasterRepo;
         this.entityMasterRepo = entityMasterRepo;
         this.dataSource = dataSource;
         this.listMasterService = listMasterService;
@@ -77,10 +79,7 @@ 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 frm_entity_attribute 
-     WHERE mapped_entity_type = $1 
-       AND organization_id = $2 `, [entityMasterData.mapped_entity_type, loggedInUser.organization_id]);
+        const attributes = await this.attributeMasterRepo.findAttributesByMappedEntityType(entityMasterData.mapped_entity_type, loggedInUser);
         entityMasterData['attribute_list'] = attributes;
         entityMasterData['operation_list'] = {
             text: await this.listMasterService.getDropdownOptions('OPT', {}, [], loggedInUser),
@@ -109,8 +108,9 @@ exports.EntityMasterService = EntityMasterService;
 exports.EntityMasterService = EntityMasterService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_2.InjectRepository)(entity_master_entity_1.EntityMaster)),
-    __param(3, (0, common_1.Inject)('ListMasterService')),
+    __param(4, (0, common_1.Inject)('ListMasterService')),
     __metadata("design:paramtypes", [typeorm_1.Repository,
+        attribute_master_repository_1.AttributeMasterRepository,
         entity_master_repository_1.EntityMasterRepository,
         typeorm_1.DataSource,
         list_master_service_1.ListMasterService,

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

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

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));