rez_core 6.5.59 → 6.5.61

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

@@ -8,18 +8,32 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkedAttributesService = void 0;
 const common_1 = require("@nestjs/common");
 const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
 const typeorm_1 = require("typeorm");
 const linked_attribute_entity_1 = require("../entity/linked_attribute.entity");
+const entity_master_service_1 = require("../../meta/service/entity-master.service");
+const attribute_master_service_1 = require("../../meta/service/attribute-master.service");
+const saved_filter_service_1 = require("../../filter/service/saved-filter.service");
+const entity_json_service_1 = require("../../entity_json/service/entity_json.service");
+const entityJson_entity_1 = require("../../entity_json/entity/entityJson.entity");
+const filter_service_1 = require("../../filter/service/filter.service");
 let LinkedAttributesService = class LinkedAttributesService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(dataSource) {
+    constructor(dataSource, entityMasterService, attributeMasterService, savedFilterService, entityJsonService, filterService) {
         super();
         this.dataSource = dataSource;
+        this.attributeMasterService = attributeMasterService;
+        this.savedFilterService = savedFilterService;
+        this.entityJsonService = entityJsonService;
+        this.filterService = filterService;
     }
     async createEntity(payload, loggedInUser) {
+        console.warn('[DEPRECATED] Use createLinkedAttributeSmart() instead of createEntity()');
         if (!payload.attribute_key || payload.attribute_key.trim() === '') {
             payload.attribute_key = payload.field_name
                 .trim()
@@ -65,10 +79,281 @@ let LinkedAttributesService = class LinkedAttributesService extends entity_servi
             .andWhere('la.enterprise_id = :entId', { entId })
             .getMany();
     }
+    async getEntityListing(entity_type, loggedInUser) {
+        const entId = loggedInUser.enterprise_id;
+        const entityMasterRepo = this.reflectionHelper.getRepoService('EntityMaster');
+        const isFlagJson = await entityMasterRepo.findOne({
+            where: {
+                mapped_entity_type: entity_type,
+                enterprise_id: entId,
+                is_flag_json: true,
+            },
+        });
+        if (isFlagJson?.is_flag_json) {
+            return await this.getAllLinkedAttributes(loggedInUser);
+        }
+        return await this.filterService.applyFilterWrapper({
+            entity_type,
+            loggedInUser,
+        });
+    }
+    async generateNextSequence(mapped_entity_type, applicable_entity_type, applicable_attribute_key, organization_id) {
+        const result = await this.dataSource
+            .getRepository(linked_attribute_entity_1.LinkedAttributes)
+            .createQueryBuilder('fla')
+            .select('MAX(fla.sequence)', 'max_sequence')
+            .where('fla.mapped_entity_type = :mapped_entity_type', {
+            mapped_entity_type,
+        })
+            .andWhere('fla.applicable_entity_type = :applicable_entity_type', {
+            applicable_entity_type,
+        })
+            .andWhere('fla.applicable_attribute_key = :applicable_attribute_key', {
+            applicable_attribute_key,
+        })
+            .andWhere('fla.organization_id = :organization_id', { organization_id })
+            .getRawOne();
+        const maxSequence = result?.max_sequence;
+        return maxSequence ? maxSequence + 1 : 1;
+    }
+    generateAttributeKey(applicable_entity_type, applicable_attribute_key, sequence) {
+        if (!applicable_entity_type || applicable_entity_type.trim() === '') {
+            throw new Error('applicable_entity_type is required and cannot be empty');
+        }
+        if (!applicable_attribute_key || applicable_attribute_key.trim() === '') {
+            throw new Error('applicable_attribute_key is required and cannot be empty');
+        }
+        if (!sequence || sequence < 1 || !Number.isInteger(sequence)) {
+            throw new Error('sequence must be a positive integer greater than 0');
+        }
+        return `${applicable_entity_type}__${applicable_attribute_key}__${sequence}`;
+    }
+    async createFilterForLinkedAttribute(entity_type, conditions, attribute_key, loggedInUser) {
+        return await this.dataSource.transaction(async (transactionManager) => {
+            const timestamp = Date.now();
+            const filterCode = `LA_${entity_type}_${attribute_key}_${timestamp}`;
+            const filterMasterData = {
+                name: `Auto Filter - ${attribute_key}`,
+                code: filterCode,
+                mapped_entity_type: entity_type,
+                filter_scope: 'FILTER',
+                organization_id: loggedInUser.organization_id,
+                level_type: loggedInUser.level_type,
+                level_id: loggedInUser.level_id,
+                user_id: loggedInUser.id,
+            };
+            const filterMaster = await this.savedFilterService.createEntity(filterMasterData, loggedInUser);
+            const detailPromises = conditions.map((condition) => {
+                const detailData = {
+                    mapped_filter_code: filterMaster.code,
+                    filter_entity_type: entity_type,
+                    filter_attribute: condition.filter_attribute,
+                    filter_operator: condition.filter_operator,
+                    filter_value: String(condition.filter_value),
+                    organization_id: loggedInUser.organization_id,
+                    level_type: loggedInUser.level_type,
+                    level_id: loggedInUser.level_id,
+                };
+                return transactionManager.save('SavedFilterDetail', detailData);
+            });
+            await Promise.all(detailPromises);
+            return filterMaster.code;
+        });
+    }
+    async createLinkedAttributeSmart(payload, loggedInUser) {
+        const validation = await this.validateLinkedAttribute({
+            field_name: payload.field_name,
+            mapped_entity_type: payload.mapped_entity_type,
+            applicable_entity_type: payload.applicable_entity_type,
+            applicable_attribute_key: payload.applicable_attribute_key,
+            organization_id: loggedInUser.organization_id,
+        }, loggedInUser);
+        if (!validation.valid) {
+            throw new common_1.BadRequestException(validation.errors.join(', '));
+        }
+        const sequence = await this.generateNextSequence(payload.mapped_entity_type, payload.applicable_entity_type, payload.applicable_attribute_key, loggedInUser.organization_id);
+        const attribute_key = this.generateAttributeKey(payload.applicable_entity_type, payload.applicable_attribute_key, sequence);
+        let saved_filter_code = payload.saved_filter_code || null;
+        let linkedAttrData = {
+            field_name: payload.field_name,
+            attribute_key,
+            applicable_entity_type: payload.applicable_entity_type,
+            applicable_attribute_key: payload.applicable_attribute_key,
+            mapped_entity_type: payload.mapped_entity_type,
+            saved_filter_code,
+            sequence,
+            organization_id: loggedInUser.organization_id,
+            level_type: loggedInUser.level_type,
+            level_id: loggedInUser.level_id,
+            entity_type: 'LNATR'
+        };
+        const linkedAttribute = (await super.createEntity(linkedAttrData, loggedInUser));
+        if (payload.backfill) {
+            this.backfillLinkedAttribute(linkedAttribute.id, loggedInUser).catch((err) => console.error(`Backfill failed for linked attribute ${linkedAttribute.id}:`, err));
+        }
+        return linkedAttribute;
+    }
+    async validateLinkedAttribute(payload, loggedInUser) {
+        const errors = [];
+        const [duplicateError, mappedEntityError, applicableEntityError, attributeError,] = await Promise.all([
+            this.checkDuplicateAttributeKey(payload.attribute_key, payload.organization_id),
+            this.validateEntityTypeExists(payload.mapped_entity_type, loggedInUser),
+            this.validateEntityTypeExists(payload.applicable_entity_type, loggedInUser),
+            this.validateAttributeKeyExists(payload.applicable_entity_type, payload.applicable_attribute_key, loggedInUser),
+        ]);
+        if (duplicateError)
+            errors.push(duplicateError);
+        if (mappedEntityError)
+            errors.push(mappedEntityError);
+        if (applicableEntityError)
+            errors.push(applicableEntityError);
+        if (attributeError)
+            errors.push(attributeError);
+        this.validateRequiredFields(payload, errors);
+        return { valid: errors.length === 0, errors };
+    }
+    validateRequiredFields(payload, errors) {
+        const requiredFields = [
+            { field: 'field_name', value: payload.field_name },
+            { field: 'mapped_entity_type', value: payload.mapped_entity_type },
+            { field: 'applicable_entity_type', value: payload.applicable_entity_type },
+            { field: 'applicable_attribute_key', value: payload.applicable_attribute_key },
+        ];
+        for (const { field, value } of requiredFields) {
+            if (!value || (typeof value === 'string' && value.trim() === '')) {
+                errors.push(`Required field '${field}' is missing or empty`);
+            }
+        }
+    }
+    async checkDuplicateAttributeKey(attribute_key, organization_id) {
+        if (!attribute_key || attribute_key.trim() === '') {
+            return null;
+        }
+        const existing = await this.dataSource
+            .getRepository(linked_attribute_entity_1.LinkedAttributes)
+            .createQueryBuilder('fla')
+            .where('fla.attribute_key = :attribute_key', { attribute_key })
+            .andWhere('fla.organization_id = :organization_id', { organization_id })
+            .getOne();
+        if (existing) {
+            return `Attribute key '${attribute_key}' already exists for this organization`;
+        }
+        return null;
+    }
+    async validateEntityTypeExists(entity_type, loggedInUser) {
+        if (!entity_type || entity_type.trim() === '') {
+            return null;
+        }
+        try {
+            await this.entityMasterService.getEntityData(entity_type, loggedInUser);
+            return null;
+        }
+        catch (error) {
+            return `Entity type '${entity_type}' does not exist`;
+        }
+    }
+    async validateAttributeKeyExists(entity_type, attribute_key, loggedInUser) {
+        if (!entity_type || !attribute_key) {
+            return null;
+        }
+        try {
+            const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entity_type, loggedInUser);
+            const attributeExists = attributes.some((attr) => attr.attribute_key === attribute_key);
+            if (!attributeExists) {
+                return `Attribute '${attribute_key}' does not exist in entity '${entity_type}'`;
+            }
+            return null;
+        }
+        catch (error) {
+            return `Error validating attribute '${attribute_key}' in entity '${entity_type}': ${error.message}`;
+        }
+    }
+    async backfillLinkedAttribute(linked_attribute_id, loggedInUser) {
+        const linkedAttr = await this.dataSource
+            .getRepository(linked_attribute_entity_1.LinkedAttributes)
+            .findOne({ where: { id: linked_attribute_id } });
+        if (!linkedAttr) {
+            throw new common_1.NotFoundException(`LinkedAttribute with ID ${linked_attribute_id} not found`);
+        }
+        const entityJsonRecords = await this.dataSource
+            .getRepository(entityJson_entity_1.EntityJson)
+            .createQueryBuilder('ej')
+            .select(['ej.entity_id'])
+            .where('ej.entity_type = :entityType', {
+            entityType: linkedAttr.mapped_entity_type,
+        })
+            .andWhere('ej.organization_id = :orgId', {
+            orgId: loggedInUser.organization_id,
+        })
+            .getMany();
+        const batchSize = 100;
+        const results = {
+            total: entityJsonRecords.length,
+            updated: 0,
+            failed: 0,
+            errors: [],
+        };
+        for (let i = 0; i < entityJsonRecords.length; i += batchSize) {
+            const batch = entityJsonRecords.slice(i, i + batchSize);
+            for (const record of batch) {
+                try {
+                    await this.entityJsonService.updateEntityJSON(linkedAttr.mapped_entity_type, record.entity_id, loggedInUser);
+                    results.updated++;
+                }
+                catch (error) {
+                    results.failed++;
+                    results.errors.push({
+                        entity_id: record.entity_id,
+                        error: error.message,
+                    });
+                    console.error(`Failed to update entity ${record.entity_id}:`, error);
+                }
+            }
+            console.log(`Backfill progress: ${Math.min(i + batchSize, results.total)}/${results.total}`);
+        }
+        return results;
+    }
+    async backfillAllForEntity(mapped_entity_type, loggedInUser) {
+        const entityJsonRecords = await this.dataSource
+            .getRepository(entityJson_entity_1.EntityJson)
+            .createQueryBuilder('ej')
+            .select(['ej.entity_id'])
+            .where('ej.entity_type = :entityType', { entityType: mapped_entity_type })
+            .andWhere('ej.organization_id = :orgId', {
+            orgId: loggedInUser.organization_id,
+        })
+            .getMany();
+        const batchSize = 100;
+        const results = {
+            updated: 0,
+            failed: 0,
+        };
+        for (let i = 0; i < entityJsonRecords.length; i += batchSize) {
+            const batch = entityJsonRecords.slice(i, i + batchSize);
+            for (const record of batch) {
+                try {
+                    await this.entityJsonService.updateEntityJSON(mapped_entity_type, record.entity_id, loggedInUser);
+                    results.updated++;
+                }
+                catch (error) {
+                    results.failed++;
+                    console.error(`Failed to update entity ${record.entity_id}:`, error);
+                }
+            }
+            console.log(`Backfill all progress: ${Math.min(i + batchSize, entityJsonRecords.length)}/${entityJsonRecords.length}`);
+        }
+        return results;
+    }
 };
 exports.LinkedAttributesService = LinkedAttributesService;
 exports.LinkedAttributesService = LinkedAttributesService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __param(3, (0, common_1.Inject)('SavedFilterService')),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
+        entity_master_service_1.EntityMasterService,
+        attribute_master_service_1.AttributeMasterService,
+        saved_filter_service_1.SavedFilterService,
+        entity_json_service_1.EntityJSONService,
+        filter_service_1.FilterService])
 ], LinkedAttributesService);
 //# sourceMappingURL=linked_attributes.service.js.map

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":";;;;;;;;;;;;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,aAAa,CAAC;QAEzC,OAAO,IAAI,CAAC,UAAU;aACnB,aAAa,CAAC,0CAAgB,CAAC;aAC/B,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,CAAC;aAC9C,OAAO,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAkB,EAAE,YAAiB;QAChE,MAAM,KAAK,GAAG,YAAY,CAAC,aAAa,CAAC;QAGzC,MAAM,IAAI,CAAC,UAAU;aAClB,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,0CAAgB,CAAC;aACtB,KAAK,CAAC,wBAAwB,EAAE,EAAE,KAAK,EAAE,CAAC;aAC1C,OAAO,EAAE,CAAC;QAGb,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,GAAG,IAAI;YACP,aAAa,EAAE,KAAK;YACpB,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,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,aAAa,CAAC,0CAAgB,CAAC;aAC/B,kBAAkB,CAAC,IAAI,CAAC;aACxB,KAAK,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,CAAC;aACpC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,CAAC;aAChD,OAAO,EAAE,CAAC;IACf,CAAC;CACF,CAAA;AAlEY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,uBAAuB,CAkEnC"}
+{"version":3,"file":"linked_attributes.service.js","sourceRoot":"","sources":["../../../../src/module/linked_attributes/service/linked_attributes.service.ts"],"names":[],"mappings":"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"}

package/dist/module/listmaster/service/list-master.service.d.ts

@@ -36,18 +36,5 @@ export declare class ListMasterService {
     updateEntity(entityData: any, loggedInUser: UserData): Promise<any>;
     getEntityData(entity_type: string, id: number, loggedInUser: any): Promise<any>;
     getAllListMasterByOrganization(enterprise_id: number, search?: string): Promise<any[]>;
-    getDropDownData(entity_type: string, attribute_key: string, loggedInUser: UserData, body: Record<string, any>): Promise<any>;
-    private processLocalDropdown;
-    private fetchFromListMaster;
-    private fetchFromCustomInternalService;
-    private fetchFromCustomKey;
-    private fetchFromExternalAPI;
-    private applyFilterCode;
-    private formatDropdownResponse;
-    private processCrossAppDropdown;
-    private getUserRolesDropdown;
-    private getDepartmentsDropdown;
-    private getFinancialYearsDropdown;
-    private getOperatorsDropdown;
-    private parseFilterCode;
+    getDropDownData(entity_type: string, attribute_key: string, loggedInUser: UserData, body: Record<string, string>): Promise<any>;
 }

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

@@ -134,6 +134,13 @@ let ListMasterService = class ListMasterService {
                     enterprise_id: loggedInUser?.enterprise_id,
                 });
             }
+            if (loggedInUser?.appcode && sourceList === 'ROL') {
+                if (!this.skipLevelFilterEntities.includes(sourceList)) {
+                    qb.andWhere(`${tableName}.appcode = :appcode`, {
+                        appcode: loggedInUser.appcode,
+                    });
+                }
+            }
             for (const key in params) {
                 qb.andWhere(`${tableName}.${key} = :${key}`, {
                     [key]: params[key],
@@ -154,7 +161,7 @@ let ListMasterService = class ListMasterService {
         activeResults.forEach((r) => {
             result.push({ label: r.name, value: r.id });
         });
-        const resolveInactiveStatus = await this.getResolvedListCode(global_constant_1.STATUS_INACTIVE, loggedInUser?.enterprise_id || 0);
+        const resolveInactiveStatus = await this.getResolvedListCode(global_constant_1.STATUS_INACTIVE, loggedInUser?.organization_id || 0);
         if (inactiveIdsArray?.length) {
             const inactiveQuery = applyCommonFilters(this.entityManager
                 .createQueryBuilder()
@@ -253,178 +260,47 @@ let ListMasterService = class ListMasterService {
         return await this.listMasterRepo.findAllItems(enterprise_id, search);
     }
     async getDropDownData(entity_type, attribute_key, loggedInUser, body) {
-        try {
-            const { inactiveIds, ...params } = body;
-            const inactiveIdsArray = inactiveIds
-                ? inactiveIds.split(',').map((id) => parseInt(id, 10))
-                : [];
-            const attributeMaster = await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(entity_type, attribute_key, loggedInUser);
-            if (!attributeMaster) {
-                throw new common_1.BadRequestException(`Attribute '${attribute_key}' not found for entity '${entity_type}'`);
-            }
-            const { ds_category, ds_entitytype, ds_filtercode, ds_appcode, } = attributeMaster;
-            if (!ds_category) {
-                throw new common_1.BadRequestException(`Data source category not configured for attribute '${attribute_key}'`);
-            }
-            const currentAppCode = this.configService.get('appcode');
-            const isSelfApp = !ds_appcode ||
-                ds_appcode.toUpperCase() === 'SELF' ||
-                currentAppCode === ds_appcode;
-            if (isSelfApp) {
-                return this.processLocalDropdown(ds_category, ds_entitytype, ds_filtercode, params, inactiveIdsArray, loggedInUser);
-            }
-            else {
-                return this.processCrossAppDropdown(ds_appcode, entity_type, attribute_key, loggedInUser, body);
-            }
-        }
-        catch (error) {
-            console.error('❌ Error in getDropDownData:', error.message);
-            throw error;
-        }
-    }
-    async processLocalDropdown(ds_category, ds_entitytype, ds_filtercode, params, inactiveIdsArray, loggedInUser) {
-        switch (ds_category.toUpperCase()) {
-            case 'ENT_LIST':
-            case 'ENTITY':
-                const mergedParams = { ...params };
-                if (ds_filtercode) {
-                    const filterParams = this.parseFilterCode(ds_filtercode);
-                    Object.assign(mergedParams, filterParams);
-                }
-                return this.fetchFromEntity(ds_entitytype, mergedParams, inactiveIdsArray, loggedInUser);
-            case 'LM':
-            case 'LIST_MASTER':
-                return this.fetchFromListMaster(ds_entitytype, ds_filtercode, params, inactiveIdsArray, loggedInUser);
-            case 'CAPI':
-            case 'CUSTOM_API':
-                return this.fetchFromCustomInternalService(ds_entitytype, ds_filtercode, params, loggedInUser);
-            case 'CK':
-            case 'CUSTOM_KEY':
-                return this.fetchFromCustomKey(ds_entitytype, ds_filtercode, params, loggedInUser);
-            case 'EXTAPI':
-            case 'EXTERNAL_API':
-                return this.fetchFromExternalAPI(ds_entitytype, ds_filtercode, params, loggedInUser);
-            default:
-                throw new common_1.BadRequestException(`Unsupported data source category: ${ds_category}`);
-        }
-    }
-    async fetchFromListMaster(lmCode, filterCode, params, inactiveIdsArray, loggedInUser) {
-        try {
-            const listMaster = await this.listMasterRepo.findByType(lmCode, loggedInUser.enterprise_id);
-            if (!listMaster) {
-                throw new common_1.BadRequestException(`List Master '${lmCode}' not found`);
-            }
-            return this.listItemsRepo.findItemsByType(lmCode, listMaster.sort_by, inactiveIdsArray, loggedInUser.enterprise_id, params);
-        }
-        catch (error) {
-            console.error(`❌ Error fetching from List Master '${lmCode}':`, error.message);
-            throw new common_1.BadRequestException(`Failed to fetch from List Master: ${error.message}`);
-        }
-    }
-    async fetchFromCustomInternalService(serviceName, filterCode, params, loggedInUser) {
-        try {
-            const client = this.factory.getClient('INTERNAL_SERVICE');
-            if (!client) {
-                throw new common_1.BadRequestException('Internal service client not available');
-            }
-            const response = await client
-                .send(serviceName, {
-                filterCode,
-                params,
-                loggedInUser,
-            })
-                .toPromise();
-            return response;
-        }
-        catch (error) {
-            console.error(`❌ Error calling custom internal service '${serviceName}':`, error.message);
-            throw new common_1.BadRequestException(`Failed to call custom internal service: ${error.message}`);
-        }
-    }
-    async fetchFromCustomKey(customKey, filterCode, params, loggedInUser) {
-        try {
-            switch (customKey.toUpperCase()) {
-                case 'USER_ROLES':
-                    return this.getUserRolesDropdown(filterCode, params, loggedInUser);
-                case 'DEPARTMENTS':
-                    return this.getDepartmentsDropdown(filterCode, params, loggedInUser);
-                case 'FINANCIAL_YEARS':
-                    return this.getFinancialYearsDropdown(filterCode, params, loggedInUser);
-                case 'OPERATORS':
-                    return this.getOperatorsDropdown(filterCode, params, loggedInUser);
-                default:
-                    throw new common_1.BadRequestException(`Unknown custom key: ${customKey}`);
-            }
-        }
-        catch (error) {
-            console.error(`❌ Error fetching custom key '${customKey}':`, error.message);
-            throw new common_1.BadRequestException(`Failed to fetch custom key: ${error.message}`);
-        }
-    }
-    async fetchFromExternalAPI(apiUrl, filterCode, params, loggedInUser) {
-        try {
-            const fullUrl = filterCode ? `${apiUrl}/${filterCode}` : apiUrl;
-            const response = await axios_2.default.get(fullUrl, {
-                params: {
-                    ...params,
-                    enterprise_id: loggedInUser.enterprise_id,
-                },
-                timeout: 10000,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${this.configService.get('EXTERNAL_API_TOKEN')}`,
-                },
-            });
-            return response.data;
-        }
-        catch (error) {
-            console.error(`❌ Error calling external API '${apiUrl}':`, error.message);
-            if (error.response) {
-                throw new common_1.BadRequestException(`External API error: ${error.response.status} - ${error.response.statusText}`);
-            }
-            else if (error.request) {
-                throw new common_1.BadRequestException('External API is not responding');
-            }
-            else {
-                throw new common_1.BadRequestException(`Failed to call external API: ${error.message}`);
-            }
-        }
-    }
-    applyFilterCode(query, tableName, filterCode, loggedInUser) {
-        const filters = filterCode.split('|');
-        filters.forEach((filter) => {
-            const [key, value] = filter.split('=');
-            if (key && value) {
-                let filterValue = value;
-                if (value === '{USER_ID}') {
-                    filterValue = loggedInUser.id;
+        let entityMaster = await this.entityMasterService.getEntityData(entity_type, loggedInUser);
+        let appCode = entityMaster.appcode;
+        const { inactiveIds, ...params } = body;
+        const inactiveIdsArray = inactiveIds
+            ? inactiveIds.split(',').map((id) => parseInt(id, 10))
+            : [];
+        const currentAppCode = this.configService.get('appcode');
+        if (currentAppCode === appCode || !currentAppCode) {
+            const entityAttribute = await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(entity_type, attribute_key, loggedInUser);
+            if (entityAttribute && entityAttribute.data_source_type) {
+                const listMaster = await this.listMasterRepo.findByType(entityAttribute.datasource_list, loggedInUser?.enterprise_id);
+                if (!listMaster) {
+                    return;
                 }
-                else if (value === '{ENTERPRISE_ID}') {
-                    filterValue = loggedInUser.enterprise_id;
+                switch (listMaster.source) {
+                    case 'entity':
+                        return this.fetchFromEntity(listMaster.type, params, inactiveIdsArray, loggedInUser);
+                    case 'master':
+                        return this.listItemsRepo.findItemsByType(listMaster.type, listMaster.sort_by, inactiveIdsArray, loggedInUser.enterprise_id, params);
+                    case 'operator':
+                        return this.listItemsRepo.findOperatorsByType(listMaster?.type, loggedInUser?.enterprise_id);
+                    case 'custom':
+                        try {
+                            const response = await axios_2.default.get(`https://external-source.com/${listMaster.custom_source_id}`, { params });
+                            return response.data;
+                        }
+                        catch (error) {
+                            console.error('⚠️ Custom source fetch failed:', error.message);
+                            throw new common_1.BadRequestException('Failed to fetch custom source');
+                        }
+                    default:
+                        throw new common_1.BadRequestException(`Unknown source: ${listMaster.source}`);
                 }
-                query = query.andWhere(`${tableName}.${key} = :${key}`, {
-                    [key]: filterValue,
-                });
             }
-        });
-        return query;
-    }
-    formatDropdownResponse(data, config) {
-        return data.map((item) => ({
-            id: item.id,
-            value: item.value || item.name || item.title,
-            label: item.label || item.display_name || item.name || item.title,
-            code: item.code,
-            ...item,
-        }));
-    }
-    async processCrossAppDropdown(targetAppCode, entity_type, attribute_key, loggedInUser, body) {
-        try {
-            const client = this.factory.getClient(targetAppCode);
+        }
+        else {
+            const client = this.factory.getClient(appCode);
             if (!client) {
-                throw new common_1.BadRequestException(`Microservice client for app '${targetAppCode}' not available`);
+                return;
             }
-            const response = await client
+            return client
                 .send('getDropdownData', {
                 entity_type,
                 attribute_key,
@@ -432,56 +308,7 @@ let ListMasterService = class ListMasterService {
                 body,
             })
                 .toPromise();
-            return response;
-        }
-        catch (error) {
-            console.error(`❌ Error calling cross-app microservice '${targetAppCode}':`, error.message);
-            throw new common_1.BadRequestException(`Failed to fetch dropdown from app '${targetAppCode}': ${error.message}`);
-        }
-    }
-    async getUserRolesDropdown(filterCode, params, loggedInUser) {
-        throw new common_1.BadRequestException('USER_ROLES handler not implemented yet');
-    }
-    async getDepartmentsDropdown(filterCode, params, loggedInUser) {
-        throw new common_1.BadRequestException('DEPARTMENTS handler not implemented yet');
-    }
-    async getFinancialYearsDropdown(filterCode, params, loggedInUser) {
-        const currentYear = new Date().getFullYear();
-        const years = [];
-        for (let i = -5; i <= 5; i++) {
-            const year = currentYear + i;
-            years.push({
-                id: year,
-                value: `FY${year}-${year + 1}`,
-                label: `FY ${year}-${year + 1}`,
-            });
         }
-        return years;
-    }
-    async getOperatorsDropdown(filterCode, params, loggedInUser) {
-        return [
-            { id: 1, value: '=', label: 'Equals' },
-            { id: 2, value: '!=', label: 'Not Equals' },
-            { id: 3, value: '>', label: 'Greater Than' },
-            { id: 4, value: '<', label: 'Less Than' },
-            { id: 5, value: '>=', label: 'Greater Than or Equal' },
-            { id: 6, value: '<=', label: 'Less Than or Equal' },
-            { id: 7, value: 'LIKE', label: 'Contains' },
-            { id: 8, value: 'IN', label: 'In List' },
-        ];
-    }
-    parseFilterCode(filterCode) {
-        if (!filterCode)
-            return {};
-        const params = {};
-        const filters = filterCode.split('|');
-        filters.forEach((filter) => {
-            const [key, value] = filter.split('=');
-            if (key && value) {
-                params[key.trim()] = value.trim();
-            }
-        });
-        return params;
     }
 };
 exports.ListMasterService = ListMasterService;