rez_core 2.1.57 → 2.1.59

package/package.json

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

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

@@ -49,10 +49,7 @@ export class FilterController {
       sortby,
       page,
       size,
-      user_id: userData.id,
-      level_type: userData.level_type,
-      level_id: userData.level_id,
-      appcode: userData.appcode,
+      loggedInUser: userData,
     });
   }
 

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

@@ -23,8 +23,11 @@ export interface FilterRequestDto {
   tabs?: TabsConfig;
   page?: number;
   size?: number;
-  user_id?: string | null;
-  level_type?: string | null;
-  level_id?: string | null;
-  appcode?: string | null;
+  loggedInUser?: {
+    id: string;
+    level_type: string;
+    level_id: string;
+    appcode: string;
+    organization_id?: number; // Optional, if applicable
+  };
 }

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

@@ -20,7 +20,8 @@ export class FilterService {
     @Inject('SavedFilterService')
     private readonly savedFilterService: SavedFilterService,
   ) {}
-  private readonly skipLevelFilterEntities = ['ROL'];
+  private readonly skipAppCodeFilterEntities = ['ORGP'];
+  private readonly skipOrgFilterEntities = ['ORGP'];
 
   private async gettab_value_counts(
     tableName: string,
@@ -78,11 +79,16 @@ export class FilterService {
       attributeFilter,
       tabs,
       sortby,
-      user_id,
+      loggedInUser,
+    } = dto;
+
+    const {
       level_type,
       level_id,
+      id: user_id,
       appcode,
-    } = dto;
+      organization_id,
+    } = loggedInUser || {};
 
     // Fetch meta
     const entityMeta = await this.entityTableService.getEntityData(entity_type);
@@ -133,23 +139,28 @@ export class FilterService {
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
     // check level_id and level_type
-    if (level_type && level_id) {
+    if (entity_type != 'ORGP' && level_type && level_id && organization_id) {
       baseWhere.push({
-        query: 'e.level_type = :level_type AND e.level_id = :level_id',
+        query:
+          'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
         params: {
+          organization_id,
           level_type,
           level_id,
         },
       });
     }
 
-    if (this.skipLevelFilterEntities.includes(entity_type)) {
-      baseWhere.push({
-        query: 'e.appcode = :appcode',
-        params: { appcode },
-      });
+    if (user_id === '1') {
     }
 
+    // if (!this.skipAppCodeFilterEntities.includes(entity_type)) {
+    //   baseWhere.push({
+    //     query: 'e.appcode = :appcode',
+    //     params: { appcode },
+    //   });
+    // }
+
     // layout preference query
     const layoutPreference = await this.dataSource.query(
       `SELECT layout_json

package/src/module/listmaster/repository/list-master-items.repository.ts

@@ -25,7 +25,7 @@ export class ListMasterItemsRepository {
       where: { listtype: type, status: 'active' },
       order: { sortindex: 'ASC' },
     });
-    return items.map((i) => ({ label: i.name, value: i.value }));
+    return items.map((i) => ({ label: i.name, value: i.id }));
   }
 
   async findAllItemsByListType(