rez_core 3.1.0 → 3.1.1

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -8,6 +8,7 @@ import { FilterCondition, FilterRequestDto } from '../dto/filter-request.dto';
 import { SavedFilterService } from './saved-filter.service';
 
 import * as moment from 'moment';
+import { EntityRelationService } from 'src/module/meta/service/entity-relation.service';
 
 @Injectable()
 export class FilterService {
@@ -17,6 +18,8 @@ export class FilterService {
     private readonly entityMasterService: EntityMasterService,
     @Inject('SavedFilterService')
     private readonly savedFilterService: SavedFilterService,
+    @Inject('EntityRelationService')
+    private readonly entityRelationService: EntityRelationService,
   ) {}
   private readonly skipAppCodeFilterEntities = ['ORGP'];
   private readonly skipOrgFilterEntities = ['ORGP'];
@@ -114,14 +117,29 @@ export class FilterService {
 
       const subResult = await this.applyFilter(subDto);
 
-      // extract parent ids from sub entity result
-      const parentIds = subResult.data.entity_list.map((row) => row.parent_id);
+      // ✅ new way (fetch source entity IDs via relation mapping)
+      const subEntityIds = subResult.data.entity_list.map((row) => row.id);
+
+      if (!subEntityIds.length) {
+        return {
+          success: true,
+          data: { entity_tabs: [], entity_list: [], pagination: {} },
+        };
+      }
+      
+
+      const relatedIds = await this.entityRelationService.getRelatedEntityIds(
+        entity_type,
+        subEntityType, 
+        subEntityIds, 
+        dto.loggedInUser.organization_id,
+      );
 
       // keep intersection
       intersectionIds =
         intersectionIds === null
-          ? parentIds
-          : intersectionIds.filter((id) => parentIds.includes(id));
+          ? relatedIds
+          : intersectionIds.filter((id) => relatedIds.includes(id));
 
       // early exit if no intersection
       if (intersectionIds.length === 0) {

package/src/module/meta/entity.module.ts

@@ -138,6 +138,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     ResolverService,
     EntityDynamicService,
     'CommonService',
+    'EntityRelationService'
   ],
   controllers: [
     EntityController,

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

@@ -19,4 +19,31 @@ export class EntityRelationService extends EntityServiceImpl {
 
     return relations;
   }
+
+  async getRelatedEntityIds(
+    sourceEntity: string,   
+    targetEntity: string,   
+    targetIds: number[],    
+    orgId: number,
+  ): Promise<number[]> {
+  
+    if (!targetIds.length) return []; // <--- safe guard
+  
+    const result = await this.dataSource.query(
+      `
+      SELECT DISTINCT source_entity_id
+      FROM cr_entity_relation_data
+      WHERE source_entity_type = ?
+        AND target_entity_type = ?
+        AND target_entity_id IN (?)
+        AND organization_id = ?
+      `,
+      [sourceEntity, targetEntity, targetIds, orgId],
+    );
+  
+    return result.map((r) => r.source_entity_id);
+  }
+  
+  
+  
 }