rez_core 1.0.89 → 1.0.95

package/package.json

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

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

@@ -1,9 +1,23 @@
-import { Controller, Post, Body, Query, ParseIntPipe } from '@nestjs/common';
+import {
+  Controller,
+  Post,
+  Body,
+  Query,
+  ParseIntPipe,
+  Get,
+  Param,
+  Inject,
+} from '@nestjs/common';
 import { FilterService } from '../service/filter.service';
+import { SavedFilterService } from '../service/saved-filter.service';
 
 @Controller('filter')
 export class FilterController {
-  constructor(private readonly filterService: FilterService) {}
+  constructor(
+    private readonly filterService: FilterService,
+    @Inject('SavedFilterService')
+    private readonly savedFilterService: SavedFilterService,
+  ) {}
 
   @Post()
   async applyFilter(
@@ -31,4 +45,9 @@ export class FilterController {
       size,
     });
   }
+
+  @Get(':id')
+  async getFilterById(@Param('id') id: string) {
+    return this.savedFilterService.getFilterById(Number(id));
+  }
 }

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

@@ -50,22 +50,24 @@ export class SavedFilterRepositoryService {
   async updateCode(id: number, code: string): Promise<void> {
     await this.savedFilterMasterRepo.update(id, { code });
   }
-  
-  async getDefaultFilterByEntityType(entityType: string): Promise<{ label: string; value: number } | null> {
+
+  async getDefaultFilterByEntityType(
+    entityType: string,
+  ): Promise<{ label: string; value: number } | null> {
     const filter = await this.savedFilterMasterRepo.findOne({
       where: {
         mapped_entity_type: entityType,
         is_default: true,
       },
     });
-  
+
     return filter ? { label: filter.name, value: filter.id } : null;
   }
-  
+
   async getSavedFiltersByUserIdAndEntityType(
     userId: number,
-    entityType: string
-  ){
+    entityType: string,
+  ) {
     const filters = await this.savedFilterMasterRepo.find({
       where: {
         user_id: userId,
@@ -75,13 +77,36 @@ export class SavedFilterRepositoryService {
         modified_date: 'DESC',
       },
     });
-  
-    return filters.map(filter => ({
+
+    return filters.map((filter) => ({
       label: filter.name,
       value: filter.id,
     }));
   }
-  
-  
-  
+
+  async getFilterById(
+    id: number,
+  ): Promise<
+    {
+      filter_attribute: string;
+      filter_operator: string;
+      filter_value: string;
+    }[]
+  > {
+    const saveFilterMasterData = await this.savedFilterMasterRepo.findOne({
+      where: { id },
+    });
+
+    if (!saveFilterMasterData) return [];
+
+    const filterDetails = await this.savedFilterDetailRepo.find({
+      where: { mapped_filter_code: saveFilterMasterData.code },
+    });
+
+    return filterDetails.map((detail) => ({
+      filter_attribute: detail.filter_attribute,
+      filter_operator: detail.filter_operator,
+      filter_value: detail.filter_value,
+    }));
+  }
 }

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

@@ -18,27 +18,27 @@ export class SavedFilterService extends EntityServiceImpl {
     loggedInUser: UserData | null,
   ): Promise<BaseEntity> {
     const master = entityData as SavedFilterMaster;
-  
+
     const exists = await this.savedFilterRepo.isFilterNameExists(
       master.name,
       master.organization_id,
       master.enterprise_id,
     );
-  
+
     if (exists) {
       throw new BadRequestException('Saved filter name already exists.');
     }
-  
+
     // Save the master record without code
     const savedMaster = await super.createEntity(master, loggedInUser);
-  
+
     // Generate the code like SFM00001 using the saved ID
     const code = `SFM${savedMaster.id.toString().padStart(5, '0')}`;
-  
+
     // Update the code
     savedMaster.code = code;
     await this.savedFilterRepo.updateCode(savedMaster.id, code);
-  
+
     // Save filter details using generated code
     const details = (entityData as any).filterDetails ?? [];
     if (details.length) {
@@ -46,10 +46,10 @@ export class SavedFilterService extends EntityServiceImpl {
         ...detail,
         mapped_filter_code: savedMaster.code,
       }));
-  
+
       await this.savedFilterRepo.saveDetails(prepared);
     }
-  
+
     return savedMaster;
   }
 
@@ -99,5 +99,7 @@ export class SavedFilterService extends EntityServiceImpl {
     return this.savedFilterRepo.getDetailsByCode(code);
   }
 
- 
+  async getFilterById(id: number) {
+    return this.savedFilterRepo.getFilterById(id);
+  }
 }

package/src/module/listmaster/service/list-master.service.ts

@@ -13,7 +13,7 @@ import { EntityManager } from 'typeorm';
 import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
 
 @Injectable()
-export class ListMasterService  {
+export class ListMasterService {
   constructor(
     private readonly entityManager: EntityManager,
     private readonly entityMasterService: EntityMasterService,
@@ -21,8 +21,7 @@ export class ListMasterService  {
     private readonly listItemsRepo: ListMasterItemsRepository,
     private readonly apiRegistryService: ApiRegistryService,
     private readonly httpService: HttpService,
-  ) {
-  }
+  ) {}
 
   async getDropdownOptions(type: string, params: Record<string, string>) {
     const config = await this.listMasterRepo.findByType(type);
@@ -31,7 +30,7 @@ export class ListMasterService  {
 
     switch (config.source) {
       case 'entity':
-        return this.fetchFromEntity(type,params);
+        return this.fetchFromEntity(type, params);
 
       case 'master':
         return this.listItemsRepo.findItemsByType(type);
@@ -44,7 +43,10 @@ export class ListMasterService  {
     }
   }
 
-  private async fetchFromEntity(sourceList: string,params: Record<string, any>) {
+  private async fetchFromEntity(
+    sourceList: string,
+    params: Record<string, any>,
+  ) {
     let result: { label: string; value: number }[] = [];
     const argsObjectList: any[] = [];
     if (sourceList) {
@@ -58,11 +60,10 @@ export class ListMasterService  {
         argsObjectList.push(params[paramsKey]);
       }
 
-
       let results = await this.entityManager.query(query, argsObjectList);
-      results.forEach(r => {
-        result.push({ label: r['name'], value: r['id']});
-      })
+      results.forEach((r) => {
+        result.push({ label: r['name'], value: r['id'] });
+      });
     }
     return result;
   }
@@ -75,7 +76,11 @@ export class ListMasterService  {
     if (!apiRegistry) return [];
 
     const url = `${apiRegistry.base_url}${apiRegistry.endpoint.replace(/{{(.*?)}}/g, (_, key) => params?.[key.trim()] || '')}`;
-    const payload = this.injectDynamicParams(apiRegistry.request_payload_schema, params);
+    console.log(url);
+    const payload = this.injectDynamicParams(
+      apiRegistry.request_payload_schema,
+      params,
+    );
 
     const response = await firstValueFrom(
       this.httpService.request({
@@ -86,7 +91,10 @@ export class ListMasterService  {
       }),
     );
 
-    const data = this.extractByPath(response.data, apiRegistry.response_data_path);
+    const data = this.extractByPath(
+      response.data,
+      apiRegistry.response_data_path,
+    );
 
     if (!Array.isArray(data)) {
       return [{ label: data, value: data }];
@@ -100,13 +108,18 @@ export class ListMasterService  {
       label: item[apiRegistry?.label],
       value: item[apiRegistry?.value],
     }));
-
   }
 
-  private injectDynamicParams(payload: any, params?: Record<string, string>): any {
-    if(params) {
+  private injectDynamicParams(
+    payload: any,
+    params?: Record<string, string>,
+  ): any {
+    if (params) {
       const stringified = JSON.stringify(payload);
-      const replaced = stringified.replace(/{{(.*?)}}/g, (_, key) => params[key.trim()] || '');
+      const replaced = stringified.replace(
+        /{{(.*?)}}/g,
+        (_, key) => params[key.trim()] || '',
+      );
       return JSON.parse(replaced);
     }
   }
@@ -126,6 +139,4 @@ export class ListMasterService  {
       return acc[key];
     }, obj);
   }
-
-
 }

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

@@ -62,7 +62,11 @@ export class EntityTableService {
           entityTable.entity_type,
         );
         entityTableDto.operation_list = {
-          "text": await this.listMasterService.getDropdownOptions("OPT",{})
+          "text": await this.listMasterService.getDropdownOptions("OPT",{}),
+          "number": await this.listMasterService.getDropdownOptions("OPN",{}),
+          "date": await this.listMasterService.getDropdownOptions("OPD",{}),
+          "select": await this.listMasterService.getDropdownOptions("OPS",{}),
+          "multiselect": await this.listMasterService.getDropdownOptions("OPM",{})
           // Add any other operations you want to include
         };
         entityTableDto.default_filter= await this.savedFilterRepoService.getDefaultFilterByEntityType(entityTable.list_type);  

package/src/module/meta/service/media-data.service.ts

@@ -124,7 +124,7 @@ export class MediaDataService extends EntityServiceImpl {
         Key: mediaData.media_url,
         Expires: 60 * 5, // URL valid for 5 mins
       });
-      return {signedUrl,name: mediaData.file_name,id:mediaData.id};
+      return {signedUrl,fileName: mediaData.file_name,id:mediaData.id};
     } catch (error) {
       console.error('Error generating signed URL for media:', error);
       throw new Error('Failed to generate signed URL');

package/src/module/module/repository/menu.repository.ts

@@ -55,12 +55,18 @@ export class MenuRepository extends Repository<MenuData> {
     return modules.map((module) => module.module_code);
   }
 
-  /**
-   * Get menu items based on accessible modules.
-   */
   async getMenuItems(moduleCodes: string[]): Promise<MenuData[]> {
-    return this.createQueryBuilder('menu')
+    const menuItems = await this.createQueryBuilder('menu')
+      .leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
       .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
-      .getMany();
+      .select([
+        'menu.*',
+        'module.component_name AS component',
+        'module.title AS title',
+        'module.entity_type AS entity_type',
+      ])
+      .getRawMany();
+
+    return menuItems;
   }
 }

package/src/module/user/service/role.service.ts

@@ -98,7 +98,7 @@ export class RoleService extends EntityServiceImpl {
     }
 
     if (
-      await this.roleRepository.isRoleNameExists(entityData.name, {excludeRoleId:entityData.id})
+      await this.roleRepository.isRoleNameExists(entityData.name, {excludeRoleId:entityData.id,organization_id:loggedInUser?.organization_id})
     ) {
       throw new BadRequestException('Role name already exists.');
     }