rez_core 4.0.200 → 4.0.202

package/dist/module/entity_json/service/entity_json.service.js

@@ -30,7 +30,7 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
         const mainAttributes = await this.dataSource
             .getRepository(attribute_master_entity_1.AttributeMaster)
             .createQueryBuilder('attr')
-            .select(['attr.id', 'attr.name', 'attr.attribute_key'])
+            .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.attribute_key'])
             .where('attr.mapped_entity_type = :entityType', { entityType })
             .andWhere('attr.organization_id = :orgId', { orgId })
             .getMany();
@@ -41,16 +41,26 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
             .select(['rel.target_entity_type'])
             .where('rel.source_entity_type = :entityType', { entityType })
             .andWhere('rel.organization_id = :orgId', { orgId })
-            .andWhere('rel.relation_type = :relationType', { relationType: 'ONE_TO_ONE' })
+            .andWhere('rel.relation_type = :relationType', {
+            relationType: 'ONE_TO_ONE',
+        })
             .getRawMany();
-        const relatedTypesList = relatedEntityTypes.map(x => x.rel_target_entity_type);
+        const relatedTypesList = relatedEntityTypes.map((x) => x.rel_target_entity_type);
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Found ${relatedTypesList.length} ONE-TO-ONE related entity types`);
         const relatedAttributes = relatedTypesList.length
             ? await this.dataSource
                 .getRepository(attribute_master_entity_1.AttributeMaster)
                 .createQueryBuilder('attr')
-                .select(['attr.id', 'attr.name', 'attr.attribute_key', 'attr.mapped_entity_type'])
-                .where('attr.mapped_entity_type IN (:...types)', { types: relatedTypesList })
+                .select([
+                'attr.id',
+                'attr.name',
+                'attr.flat_json_key',
+                'attr.mapped_entity_type',
+                'attr.attribute_key',
+            ])
+                .where('attr.mapped_entity_type IN (:...types)', {
+                types: relatedTypesList,
+            })
                 .andWhere('attr.organization_id = :orgId', { orgId })
                 .getMany()
             : [];
@@ -68,75 +78,106 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
             .where('attr.organization_id = :orgId', { orgId })
             .getRawMany();
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Loaded ${linkedAttributes.length} linked attributes`);
-        if (flag === 'flat_json') {
+        if (flag === 'flat_json' || flag === 'all') {
             const result = {};
-            mainAttributes.forEach(attr => { if (attr.attribute_key)
-                result[attr.attribute_key] = null; });
-            relatedAttributes.forEach(attr => { if (attr.attribute_key)
-                result[attr.attribute_key] = null; });
-            linkedAttributes.forEach(link => { if (link.applicable_attribute_key)
-                result[link.applicable_attribute_key] = null; });
+            mainAttributes.forEach((attr) => {
+                if (attr.flat_json_key)
+                    result[attr.flat_json_key] = null;
+            });
+            relatedAttributes.forEach((attr) => {
+                if (attr.flat_json_key)
+                    result[attr.flat_json_key] = null;
+            });
+            linkedAttributes.forEach((link) => {
+                if (link.applicable_attribute_key)
+                    result[link.applicable_attribute_key] = null;
+            });
+            if (flag === 'all')
+                return { flat_json: result, attributes: { mainAttributes, relatedAttributes, linkedAttributes } };
             return result;
         }
         const dropdown = [];
-        dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
-        dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
-        dropdown.push({
-            linked_attributes: linkedAttributes.map(a => ({ label: a.attr_name, value: a.attr_attribute_key })),
-        });
+        dropdown.push(...mainAttributes.map((a) => ({ label: a.name, value: a.flat_json_key })));
+        dropdown.push(...relatedAttributes.map((a) => ({
+            label: a.name,
+            value: a.flat_json_key,
+        })));
+        if (linkedAttributes.length > 0) {
+            dropdown.push({
+                ...linkedAttributes.map((a) => ({
+                    label: a.name,
+                    value: a.attribute_key,
+                })),
+            });
+        }
         return dropdown;
     }
     async updateEntityJSON(entityType, entityId, loggedInUser) {
         await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Building flat JSON for entity: ${entityType}#${entityId}`);
-        const flatJson = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'flat_json');
+        const response = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'all');
+        if (!response ||
+            !('flat_json' in response) ||
+            !('attributes' in response) ||
+            !response.attributes) {
+            await this.loggerService.log('error', 'EntityJSONService', 'updateEntityJSON', `getAttributeForFlatJSON() did not return expected structure`);
+            return null;
+        }
+        const { flat_json: flatJson, attributes } = response;
         if (!flatJson) {
             await this.loggerService.log('error', 'EntityJSONService', 'updateEntityJSON', `Flat JSON template not found for entity: ${entityType}`);
-            throw new Error(`Flat JSON template not found for ${entityType}`);
+            return null;
         }
+        const safeAttributes = {
+            mainAttributes: attributes.mainAttributes || [],
+            relatedAttributes: attributes.relatedAttributes || [],
+            linkedAttributes: attributes.linkedAttributes || [],
+        };
+        const attrMap = {};
+        const allAttrs = [
+            ...safeAttributes.mainAttributes,
+            ...safeAttributes.relatedAttributes,
+            ...safeAttributes.linkedAttributes,
+        ];
+        allAttrs.forEach(attr => {
+            if (attr.attribute_key) {
+                attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
+            }
+        });
         const mainData = await this.getResolvedEntityData(entityType, entityId, loggedInUser);
-        this.mergeIntoFlatJson(flatJson, mainData);
-        await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', 'Merged main entity data into flat JSON');
+        this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
         const relations = await this.dataSource
             .getRepository('frm_entity_relation_data')
             .createQueryBuilder('erd')
-            .select(['erd.target_entity_id AS target_entity_id', 'erd.target_entity_type AS target_entity_type'])
+            .select([
+            'erd.target_entity_id AS target_entity_id',
+            'erd.target_entity_type AS target_entity_type',
+        ])
             .where('erd.source_entity_type = :entityType', { entityType })
             .andWhere('erd.source_entity_id = :entityId', { entityId })
             .andWhere('erd.relation_type = :rt', { rt: 'ONE_TO_ONE' })
             .getRawMany();
-        await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Found ${relations.length} ONE-TO-ONE relations`);
         for (const rel of relations) {
-            const related = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
-            this.mergeIntoFlatJson(flatJson, related);
-            await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Merged related entity ${rel.target_entity_type}#${rel.target_entity_id}`);
+            const relatedData = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
+            this.mergeEntityDataIntoFlatJson(flatJson, relatedData, attrMap);
         }
-        const linkedAttrs = await this.dataSource
-            .getRepository('frm_linked_attributes_table')
-            .createQueryBuilder('la')
-            .where('la.entity_type = :entityType', { entityType })
-            .getMany();
-        await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Found ${linkedAttrs.length} linked attributes`);
-        for (const la of linkedAttrs) {
-            const mappingValue = flatJson[la.mapping_attribute];
-            const result = await this.applyLinkedFilterUsingSavedFilter(la.child_entity_type, la.saved_filter_code, la.filter_attribute, mappingValue, la.target_attribute, loggedInUser);
-            flatJson[la.target_attribute] = result;
-            await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Linked attribute ${la.target_attribute} set from child entity ${la.child_entity_type}`);
-        }
-        await this.dataSource.query(`INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)
-       VALUES (?, ?, ?, ?)
-       ON DUPLICATE KEY UPDATE json_data = VALUES(json_data), updated_by = VALUES(created_by)`, [entityType, entityId, JSON.stringify(flatJson), loggedInUser.id]);
-        await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Flat JSON saved for entity: ${entityType}#${entityId}`);
+        await this.dataSource.query(`INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)
+        VALUES (?, ?, ?, ?)
+        ON DUPLICATE KEY UPDATE json_data = VALUES(json_data), updated_by = VALUES(created_by)`, [entityType, entityId, JSON.stringify(flatJson), loggedInUser.id]);
         return flatJson;
     }
-    mergeIntoFlatJson(flatJson, entityData) {
-        for (const key of Object.keys(entityData)) {
-            if (flatJson.hasOwnProperty(key)) {
-                flatJson[key] = entityData[key];
+    mergeEntityDataIntoFlatJson(flatJson, entityData, attrMap) {
+        for (const record of entityData) {
+            for (const key of Object.keys(record)) {
+                const flatKey = attrMap[key] || key;
+                if (flatJson.hasOwnProperty(flatKey)) {
+                    flatJson[flatKey] = record[key];
+                }
             }
         }
     }
     async applyLinkedFilterUsingSavedFilter(childEntityType, savedFilterCode, childFilterAttribute, mappingValue, targetAttribute, loggedInUser) {
-        if (!savedFilterCode && (mappingValue === null || mappingValue === undefined))
+        if (!savedFilterCode &&
+            (mappingValue === null || mappingValue === undefined))
             return null;
         const dto = {
             entity_type: childEntityType,
@@ -145,18 +186,20 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
             page: 1,
             size: 1,
         };
-        if (mappingValue !== null && mappingValue !== undefined && mappingValue !== '') {
+        if (mappingValue !== null &&
+            mappingValue !== undefined &&
+            mappingValue !== '') {
             dto.quickFilter = [
                 {
                     filter_attribute: childFilterAttribute,
                     filter_operator: 'equal',
                     filter_value: mappingValue,
-                }
+                },
             ];
         }
         const result = await this.filterService.applyFilter(dto);
         const rows = result?.data?.entity_list || [];
-        return rows.length ? rows[0][targetAttribute] ?? null : null;
+        return rows.length ? (rows[0][targetAttribute] ?? null) : null;
     }
 };
 exports.EntityJSONService = EntityJSONService;

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

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

package/dist/module/filter/repository/saved-filter.repository.js

@@ -117,10 +117,10 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
         }));
     }
     async getSavedFilterByCode(code, loggedInUser) {
-        const [filterMaster] = await this.dataSource.query(`SELECT id, name, code 
-     FROM frm_saved_filter_master 
-     WHERE code = $1 AND organization_id = $2 
-     LIMIT 1
+        const [filterMaster] = await this.dataSource.query(`SELECT id, name, code 
+     FROM frm_saved_filter_master 
+     WHERE code = ? AND organization_id = ? 
+     LIMIT 1
 `, [code, loggedInUser.organization_id]);
         if (!filterMaster) {
             return null;

package/dist/module/filter/service/filter-evaluator.service.js

@@ -20,9 +20,9 @@ let FilterEvaluatorService = class FilterEvaluatorService {
     }
     async evaluateTriggerAttributes(oldEntity, newEntity, savedFilterCode) {
         console.log('IN FILTER EVALUATOR SERVICE');
-        const triggerFilters = await this.dataSource.query(`SELECT * 
-       FROM frm_saved_filter_detail 
-       WHERE mapped_filter_code = $1`, [savedFilterCode]);
+        const triggerFilters = await this.dataSource.query(`SELECT * 
+       FROM frm_saved_filter_detail 
+       WHERE mapped_filter_code = ?`, [savedFilterCode]);
         if (!triggerFilters || triggerFilters.length === 0) {
             return true;
         }

package/dist/module/filter/service/filter-evaluator.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-evaluator.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter-evaluator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AAErC,qDAAiD;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAAsB,EACtB,aAA4B;QAD5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;IAC5C,CAAC;IASJ,KAAK,CAAC,yBAAyB,CAC7B,SAAqC,EACrC,SAA8B,EAC9B,eAAuB;QAGvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAwB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACrE;;qCAE+B,EAC/B,CAAC,eAAe,CAAC,CAClB,CAAC;QAGF,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,IAAI,EAAE,CAAC;QAGjC,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;YACrC,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;YAE1C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,aAAa,IAAI,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAGD,OAAO,KAAK,CAAC;IACf,CAAC;IASD,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,kBAA0B,EAC1B,QAAgB,EAChB,YAAiB;QAEjB,IAAI,CAAC,kBAAkB;YAAE,OAAO,IAAI,CAAC;QAErC,MAAM,aAAa,GAAG;YACpB,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;YAC7B,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,CAAC;YACP,YAAY,EAAE,YAAY,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE;SACjD,CAAC;QAET,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAE1E,OAAO,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AA/EY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAGoB,oBAAU;QACP,8BAAa;GAHpC,sBAAsB,CA+ElC"}
+{"version":3,"file":"filter-evaluator.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter-evaluator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AAErC,qDAAiD;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAAsB,EACtB,aAA4B;QAD5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;IAC5C,CAAC;IASJ,KAAK,CAAC,yBAAyB,CAC7B,SAAqC,EACrC,SAA8B,EAC9B,eAAuB;QAGvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAwB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACrE;;oCAE8B,EAC9B,CAAC,eAAe,CAAC,CAClB,CAAC;QAGF,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,IAAI,EAAE,CAAC;QAGjC,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;YACrC,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;YAE1C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,aAAa,IAAI,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAGD,OAAO,KAAK,CAAC;IACf,CAAC;IASD,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,kBAA0B,EAC1B,QAAgB,EAChB,YAAiB;QAEjB,IAAI,CAAC,kBAAkB;YAAE,OAAO,IAAI,CAAC;QAErC,MAAM,aAAa,GAAG;YACpB,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;YAC7B,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,CAAC;YACP,YAAY,EAAE,YAAY,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE;SACjD,CAAC;QAET,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAE1E,OAAO,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AA/EY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAGoB,oBAAU;QACP,8BAAa;GAHpC,sBAAsB,CA+ElC"}

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

@@ -6,7 +6,6 @@ import { SavedFilterService } from './saved-filter.service';
 import { EntityRelationService } from 'src/module/meta/service/entity-relation.service';
 import { ResolverService } from 'src/module/meta/service/resolver.service';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
-import { ConfigService } from '@nestjs/config';
 export declare class FilterService {
     private dataSource;
     private readonly attributeMasterService;
@@ -15,8 +14,7 @@ export declare class FilterService {
     private readonly entityRelationService;
     private readonly resolverService;
     protected readonly loggingService: LoggingService;
-    private readonly configService;
-    constructor(dataSource: DataSource, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService, configService: ConfigService);
+    constructor(dataSource: DataSource, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService);
     private readonly skipAppCodeFilterEntities;
     private readonly skipOrgFilterEntities;
     private gettab_value_counts;
@@ -69,5 +67,4 @@ export declare class FilterService {
     private buildSelectCondition;
     private buildMultiSelectCondition;
     private buildYearCondition;
-    queryWithSchema(sql: string, params?: any[]): Promise<any>;
 }

package/dist/module/filter/service/filter.service.js

@@ -22,9 +22,8 @@ const moment = require("moment");
 const entity_relation_service_1 = require("../../meta/service/entity-relation.service");
 const resolver_service_1 = require("../../meta/service/resolver.service");
 const loggingUtil_service_1 = require("../../../utils/service/loggingUtil.service");
-const config_1 = require("@nestjs/config");
 let FilterService = class FilterService {
-    constructor(dataSource, attributeMasterService, entityMasterService, savedFilterService, entityRelationService, resolverService, loggingService, configService) {
+    constructor(dataSource, attributeMasterService, entityMasterService, savedFilterService, entityRelationService, resolverService, loggingService) {
         this.dataSource = dataSource;
         this.attributeMasterService = attributeMasterService;
         this.entityMasterService = entityMasterService;
@@ -32,7 +31,6 @@ let FilterService = class FilterService {
         this.entityRelationService = entityRelationService;
         this.resolverService = resolverService;
         this.loggingService = loggingService;
-        this.configService = configService;
         this.skipAppCodeFilterEntities = ['ORGP'];
         this.skipOrgFilterEntities = ['ORGP'];
     }
@@ -41,35 +39,31 @@ let FilterService = class FilterService {
             return [];
         let whereSQL = '';
         const values = [];
-        let paramIndex = 1;
         if (whereClauses.length > 0) {
             const clauseParts = whereClauses.map((clause) => {
                 let parsedQuery = clause.query.replace(/\be\./g, '');
                 Object.entries(clause.params).forEach(([key, val]) => {
                     if (Array.isArray(val)) {
-                        const placeholders = val
-                            .map(() => `$${paramIndex++}`)
-                            .join(', ');
+                        const placeholders = val.map(() => '?').join(', ');
                         parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
-                        values.push(...val.map((v) => String(v)));
+                        values.push(...val);
                     }
                     else {
-                        const placeholder = `$${paramIndex++}`;
-                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), placeholder);
-                        values.push(String(val));
+                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
+                        values.push(val);
                     }
                 });
                 return parsedQuery;
             });
             whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
         }
-        const rawSQL = `
-    SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
-    FROM ${tableName}
-    ${whereSQL}
-    GROUP BY ${column}
-  `;
-        const rows = await this.queryWithSchema(rawSQL, values);
+        const rawSQL = `
+      SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
+      FROM ${tableName}
+      ${whereSQL}
+      GROUP BY ${column}
+    `;
+        const rows = await this.dataSource.query(rawSQL, values);
         const total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count, 10), 0);
         return [
             { tab_value: 'All', tab_value_count: total },
@@ -176,27 +170,27 @@ let FilterService = class FilterService {
             const templateTable = entityMeta?.data_source || 'frm_wf_comm_template';
             if (level_type === 'ORG') {
                 baseWhere.push({
-                    query: `  ((e.level_type = 'ORG' AND e.level_id = '${loggedInUser.organization_id}' AND e.organization_id = '${loggedInUser.organization_id}'))`,
+                    query: `  ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
                     params: {},
                 });
             }
             else if (level_type === 'SCH') {
                 baseWhere.push({
-                    query: `
-        (
-          (e.level_type = 'SCH' AND e.level_id = '${loggedInUser.level_id}' AND e.organization_id = '${loggedInUser.organization_id}')
-          OR 
-          (
-            e.level_type = 'ORG'
-            AND e.level_id = '${loggedInUser.organization_id}'
-            AND e.organization_id = '${loggedInUser.organization_id}'
-            AND e.code NOT IN (
-              SELECT sub.code 
-              FROM frm_wf_comm_template AS sub 
-              WHERE sub.level_type = 'SCH' AND sub.level_id = '${loggedInUser.level_id}'
-            )
-          )
-        )
+                    query: `
+        (
+          (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
+          OR 
+          (
+            e.level_type = 'ORG'
+            AND e.level_id = ${loggedInUser.organization_id}
+            AND e.organization_id = ${loggedInUser.organization_id}
+            AND e.code NOT IN (
+              SELECT sub.code 
+              FROM frm_wf_comm_template AS sub 
+              WHERE sub.level_type = 'SCH' AND sub.level_id = ${loggedInUser.level_id}
+            )
+          )
+        )
       `,
                     params: {},
                 });
@@ -212,7 +206,7 @@ let FilterService = class FilterService {
             !customLevelId) {
             baseWhere.push({
                 query: 'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
-                params: { organization_id: String(organization_id), level_type, level_id },
+                params: { organization_id, level_type, level_id },
             });
         }
         if (entity_type == 'USR' || entity_type == 'UPR') {
@@ -225,9 +219,9 @@ let FilterService = class FilterService {
             baseWhere.push({
                 query: 'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
                 params: {
-                    organization_id: String(organization_id),
+                    organization_id,
                     customLevelType,
-                    customLevelId: String(customLevelId),
+                    customLevelId,
                     customAppCode,
                 },
             });
@@ -236,10 +230,9 @@ let FilterService = class FilterService {
             Object.entries(queryParams).forEach(([key, value]) => {
                 if (!value)
                     return;
-                const strValue = String(value);
                 if (key === 'attributeName' && queryParams['attributeValue']) {
-                    const attrName = strValue;
-                    const attrValue = String(queryParams['attributeValue']);
+                    const attrName = value;
+                    const attrValue = queryParams['attributeValue'];
                     baseWhere.push({
                         query: `e.${attrName} = :${attrName}`,
                         params: { [attrName]: attrValue },
@@ -248,15 +241,15 @@ let FilterService = class FilterService {
                 else if (key !== 'attributeValue') {
                     baseWhere.push({
                         query: `e.${key} = :${key}`,
-                        params: { [key]: strValue },
+                        params: { [key]: value },
                     });
                 }
             });
         }
         console.log('🟠 [FilterService] Constructed baseWhere clauses:', baseWhere);
-        const layoutPreference = await this.dataSource.query(`SELECT mapped_json 
-       FROM frm_entity_layout_pref
-       WHERE user_id = $1 AND mapped_entity_type = $2 AND mapped_level_id = $3 AND mapped_level_type = $4 AND type = 'layout'`, [user_id, entity_type, level_id, level_type]);
+        const layoutPreference = await this.dataSource.query(`SELECT mapped_json 
+       FROM frm_entity_layout_pref
+       WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`, [user_id, entity_type, level_id, level_type]);
         const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
         const showList = layout?.show_list?.map((val) => {
             if (typeof val === 'string') {
@@ -315,10 +308,6 @@ let FilterService = class FilterService {
         const page = dto.page && dto.page > 0 ? dto.page : 1;
         const size = dto.size && dto.size > 0 ? dto.size : 10;
         qb.skip((page - 1) * size).take(size);
-        let query = await qb.getQuery();
-        console.log('------------------------------------------------------\n');
-        console.log(query);
-        console.log('\n------------------------------------------------------');
         const entity_list = await qb.getRawMany();
         console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
         const dateAttributes = Object.entries(attributeMetaMap)
@@ -491,17 +480,7 @@ let FilterService = class FilterService {
     }
     buildWhereClauses(filters, attributeMeta) {
         return filters
-            .map((f) => {
-            const clause = this.buildCondition(f, attributeMeta[f.filter_attribute]);
-            if (!clause)
-                return null;
-            if (clause.params) {
-                Object.keys(clause.params).forEach((k) => {
-                    clause.params[k] = String(clause.params[k]);
-                });
-            }
-            return clause;
-        })
+            .map((f) => this.buildCondition(f, attributeMeta[f.filter_attribute]))
             .filter((clause) => clause !== null);
     }
     buildCondition(filter, meta) {
@@ -713,14 +692,6 @@ let FilterService = class FilterService {
                 throw new common_1.BadRequestException(`Unsupported operator for year: ${op}`);
         }
     }
-    async queryWithSchema(sql, params = []) {
-        await this.dataSource.query('BEGIN');
-        const schema = this.configService.get('DB_SCHEMA');
-        await this.dataSource.query(`SET LOCAL search_path TO ${schema}`);
-        const result = await this.dataSource.query(sql, params);
-        await this.dataSource.query('COMMIT');
-        return result;
-    }
 };
 exports.FilterService = FilterService;
 exports.FilterService = FilterService = __decorate([
@@ -734,7 +705,6 @@ exports.FilterService = FilterService = __decorate([
         saved_filter_service_1.SavedFilterService,
         entity_relation_service_1.EntityRelationService,
         resolver_service_1.ResolverService,
-        loggingUtil_service_1.LoggingService,
-        config_1.ConfigService])
+        loggingUtil_service_1.LoggingService])
 ], FilterService);
 //# sourceMappingURL=filter.service.js.map