rez_core 7.1.52 → 7.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "7.1.52",
+  "version": "7.1.53",
   "description": "",
   "author": "",
   "private": false,

package/src/module/entity/data/service/resolver.service.ts

@@ -3,16 +3,16 @@ import * as moment from 'moment';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { ModuleRef } from '@nestjs/core';
 import { AttributeMasterRepository } from '../../meta/meta/repository/attribute-master.repository';
+import { EntityDataService } from './entity-data.service';
 
 @Injectable()
 export class ResolverService {
   private mediaDataService: any;
 
   constructor(
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
     private readonly moduleRef: ModuleRef,
     private readonly attributeMasterRepo: AttributeMasterRepository,
+    private readonly entityDataService: EntityDataService
   ) {
   }
 
@@ -48,12 +48,13 @@ export class ResolverService {
       if (attr.ds_category) {
         const params = {}; // you can pass any additional filters here
         let options: any = [];
-        options = await this.listMasterService.getDropDownData(
+        options = await this.entityDataService.getDropDownData(
           attr.mapped_entity_type,
           attr.attribute_key,
-          loggedInUser,
-          params,
+          'ALL',
           Array.isArray(codeValue) ? codeValue : [codeValue],
+          true,
+          loggedInUser,
         );
 
         const item = options.find(

package/src/module/listmaster/service/list-master.service.ts

@@ -309,63 +309,6 @@ export class ListMasterService extends EntityServiceImpl {
     );
   }
 
-  async getDropDownData(
-    entity_type: string,
-    attribute_key: string,
-    loggedInUser: UserData,
-    body: Record<string, any>,
-    values?: any[],
-    inactiveIdsArray?: any[],
-  ) {
-    try {
-      // Extract inactiveIds from body
-      const { ...params } = body;
-
-      // Fetch Attribute Master to get data source configuration
-      const attributeMaster =
-        await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(
-          entity_type,
-          attribute_key,
-          loggedInUser,
-        );
-
-      if (!attributeMaster) {
-        throw new BadRequestException(
-          `Attribute '${attribute_key}' not found for entity '${entity_type}'`,
-        );
-      }
-
-      // Extract data source configuration from AttributeMaster
-      const {
-        ds_category, // ENT_LIST | LM | CAPI | CK | EXTAPI
-        ds_entitytype, // Entity type or list code
-        ds_filtercode, // Additional filter code
-        ds_appcode, // Target app code
-      } = attributeMaster;
-
-      if (!ds_category) {
-        throw new BadRequestException(
-          `Data source category not configured for attribute '${attribute_key}'`,
-        );
-      }
-
-      return this.processDropdown(
-        ds_category,
-        ds_entitytype,
-        ds_appcode,
-        ds_filtercode,
-        params,
-        loggedInUser,
-        values,
-        inactiveIdsArray,
-      );
-    } catch (error) {
-      // TODO: Return blank array on error instead of throwing
-      console.error('❌ Error in getDropDownData:', error.message);
-      return [];
-    }
-  }
-
   /**
    * Process dropdown data locally (SELF APP)
    */