rez_core 5.0.145 → 5.0.150

package/src/module/entity_json/entity_json.module.ts

@@ -13,6 +13,6 @@ import { EntityJSONRepository } from './service/entityJson.repository';
   imports: [EntityModule, TypeOrmModule.forFeature([EntityJson]),FilterModule,UtilsModule],
   controllers: [EntityJSONController],
   providers: [EntityJSONService,EntityJSONRepository],
-  exports: [],
+  exports: [EntityJSONService],
 })
 export class EntityJSONModule {}

package/src/module/entity_json/service/entity_json.service.ts

@@ -107,7 +107,7 @@ export class EntityJSONService extends EntityServiceImpl {
     dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
     dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
     if (linkedAttributes.length > 0) {
-      dropdown.push(...linkedAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
+      dropdown.push(...linkedAttributes.map(a => ({ label: a.name, value: a.target_attribute_key })));
     }
 
     return dropdown;

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

@@ -48,9 +48,7 @@ export class FilterController {
       sortby,
     } = body;
 
-    
-
-    return this.filterService.applyFilterWrapper({
+    return this.filterService.applyFilterWithRouting({
       entity_type,
       quickFilter,
       savedFilterCode,

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

@@ -9,11 +9,16 @@ import { FilterService } from './service/filter.service';
 import { FilterController } from './controller/filter.controller';
 import { FilterEvaluatorService } from './service/filter-evaluator.service';
 import { SavedFilterDetailRepository } from './repository/saved.filter-detail.repository';
+import { FlatjsonFilterService } from './service/flatjson-filter.service';
+import { ConfigModule } from '@nestjs/config';
+import { UtilsModule } from 'src/utils/utils.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([SavedFilterDetail, SavedFilterMaster]),
-    forwardRef(() => EntityModule)
+    forwardRef(() => EntityModule),
+    ConfigModule,
+    UtilsModule,
   ],
   controllers: [FilterController],
   providers: [
@@ -21,13 +26,15 @@ import { SavedFilterDetailRepository } from './repository/saved.filter-detail.re
     SavedFilterRepositoryService,
     FilterService,
     FilterEvaluatorService,
-    SavedFilterDetailRepository
+    SavedFilterDetailRepository,
+    FlatjsonFilterService,
   ],
   exports: [
     'SavedFilterService',
     SavedFilterRepositoryService,
     FilterService,
     FilterEvaluatorService,
+    FlatjsonFilterService,
   ],
 })
 export class FilterModule {}

package/src/module/filter/repository/saved-filter.repository.ts

@@ -127,14 +127,11 @@ export class SavedFilterRepositoryService {
       },
     });
 
-    return filters;
-
-    // return filters.map((filter) => ({
-    //   label: filter.name,
-    //   value: filter.id,
-    //   code: filter.code,
-
-    // }));
+    return filters.map((filter) => ({
+      label: filter.name,
+      value: filter.id,
+      code: filter.code,
+    }));
   }
 
   async getFilterById(id: number): Promise<

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

@@ -11,6 +11,7 @@ import { LoggingService } from 'src/utils/service/loggingUtil.service';
 import { ConfigService } from '@nestjs/config';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { EntityManager } from 'typeorm';
+import { FlatjsonFilterService } from './flatjson-filter.service';
 
 @Injectable()
 export class FilterService {
@@ -26,6 +27,7 @@ export class FilterService {
     @Inject() protected readonly loggingService: LoggingService,
     private readonly configService: ConfigService,
     private readonly reflectionHelper: ReflectionHelper,
+    private readonly flatjsonFilterService: FlatjsonFilterService,
   ) {}
 
   private async gettab_value_counts(
@@ -96,6 +98,53 @@ export class FilterService {
     ];
   }
 
+  /**
+   * Route to flatjson or traditional filtering based on configuration
+   */
+  async applyFilterWithRouting(dto: FilterRequestDto) {
+    // Check if flatjson filtering is enabled via config or query param
+    const useFlatjson =
+      this.configService.get<string>('ENABLE_FLATJSON_FILTER') === 'true' ||
+      dto.queryParams?.use_flatjson === 'true';
+
+    if (useFlatjson) {
+      await this.loggingService.log(
+        'info',
+        'FilterService',
+        'applyFilterWithRouting',
+        `Using FLATJSON filtering for ${dto.entity_type}`,
+      );
+
+      // Use new flatjson filtering service
+      const result = await this.flatjsonFilterService.applyFlatjsonFilter(dto);
+
+      // Transform to match existing response format
+      return {
+        success: true,
+        data: {
+          entity_tabs: result.tabCounts || [],
+          entity_list: result.data,
+          pagination: {
+            total: result.total,
+            page: result.page,
+            size: result.size,
+            totalPages: result.totalPages,
+          },
+        },
+      };
+    } else {
+      await this.loggingService.log(
+        'info',
+        'FilterService',
+        'applyFilterWithRouting',
+        `Using TRADITIONAL filtering for ${dto.entity_type}`,
+      );
+
+      // Use traditional filtering
+      return this.applyFilterWrapper(dto);
+    }
+  }
+
   async applyFilterWrapper(dto: FilterRequestDto) {
     const {
       entity_type,