rez_core 5.0.33 → 5.0.34

package/package.json

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

package/src/module/meta/service/entity-master.service.ts

@@ -5,13 +5,14 @@ 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';
 
 @Injectable()
 export class EntityMasterService {
   constructor(
     @InjectRepository(EntityMaster)
     private entityMasterRepository: Repository<EntityMaster>,
-
+    private attributeMasterRepo: AttributeMasterRepository,
     private entityMasterRepo: EntityMasterRepository,
     private readonly dataSource: DataSource,
     @Inject('ListMasterService')
@@ -92,13 +93,8 @@ export class EntityMasterService {
     }
 
     // Step 2: Get attribute_master (instead of entity_table_column)
-    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);
 
     // Step 3: Attach column_list from attribute_master
     entityMasterData['attribute_list'] = attributes;