rez_core 3.1.13 → 3.1.15

package/package.json

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

package/src/module/filter/controller/filter.controller.ts

@@ -48,6 +48,8 @@ export class FilterController {
       sortby,
     } = body;
 
+    
+
     return this.filterService.applyFilterWrapper({
       entity_type,
       quickFilter,

package/src/module/filter/dto/filter-request.dto.ts

@@ -9,6 +9,7 @@ export interface FilterCondition {
   filter_attribute_name?: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
   filter_attribute_data_type?: string;
   filter_entity_name?: string;  
+  datasource_list?: string; // NEW - for attributes from different datasource
 }
 
 export interface TabsConfig {

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

@@ -80,6 +80,8 @@ export class FilterService {
       attributeFilter = [],
     } = dto;
 
+    console.log(dto,"APPLY FILTER WRAPPER DTO");
+
     // 🔹 Step 1: Collect all filters (from body + savedFilter)
     const savedFilters = await this.getSavedFilters(
       savedFilterCode ?? undefined,
@@ -90,6 +92,8 @@ export class FilterService {
       ...savedFilters,
     ].filter((f) => f.filter_value !== '');
 
+    console.log(allFilters,"STEP 1: ALL FILTERS");
+
     // 🔹 Step 2: Group filters by filter_entity_type
     const grouped = allFilters.reduce(
       (acc, f) => {
@@ -100,6 +104,8 @@ export class FilterService {
       {} as Record<string, any[]>,
     );
 
+    console.log(grouped,"STEP 2: GROUPED FILTERS BY ENTITY TYPE");
+
     // 🔹 Step 3: Handle sub-entities first
     let intersectionIds: number[] | null = null;
     for (const [subEntityType, filters] of Object.entries(grouped)) {
@@ -150,6 +156,8 @@ export class FilterService {
       }
     }
 
+    console.log(intersectionIds,"STEP 3: INTERSECTION IDS FOR MAIN ENTITY");
+
     // 🔹 Step 4: Call applyFilter for main entity
     const mainFilters = grouped[entity_type] || [];
     const mainDto: FilterRequestDto = {
@@ -253,6 +261,8 @@ export class FilterService {
       ),
     ];
 
+    console.log(baseFilters,"STEP 1B: BASE FILTERS FOR MAIN ENTITY");
+
     // Build where clauses
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);