rez_core 2.1.88 → 2.1.89

package/package.json

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

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

@@ -1,3 +1,5 @@
+import { UserData } from 'src/module/user/entity/user.entity';
+
 // src/module/filter/dto/filter-request.dto.ts
 export interface FilterCondition {
   filter_attribute: string;
@@ -23,11 +25,5 @@ export interface FilterRequestDto {
   tabs?: TabsConfig;
   page?: number;
   size?: number;
-  loggedInUser?: {
-    id: string;
-    level_type: string;
-    level_id: string;
-    appcode: string;
-    organization_id?: number; // Optional, if applicable
-  };
+  loggedInUser: UserData;
 }

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

@@ -153,9 +153,6 @@ export class FilterService {
       });
     }
 
-    if (user_id === '1') {
-    }
-
     // if (!this.skipAppCodeFilterEntities.includes(entity_type)) {
     //   baseWhere.push({
     //     query: 'e.appcode = :appcode',

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

@@ -246,14 +246,18 @@ export class EntityController {
     @Query('sample_export') sampleExport: boolean,
     @Query() filterCriteria: Record<string, any>,
     @Res() res: Response, // Express Response for file handling
+    @Req() req: Request & { user: any },
   ) {
     try {
+      const loggedInUser = req.user.userData;
+
       const filePath = await this.entityService.generateExcelReport(
         entityType,
         filterCriteria,
         listEntityType,
         displayType,
         sampleExport,
+        loggedInUser,
       );
 
       if (!filePath || !fs.existsSync(filePath)) {

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

@@ -34,16 +34,14 @@ export class EntityTableRepository {
     entityType: string,
     listType: string,
     displayType: string,
-    organization_id: number | null = null,
+    organization_id: number,
   ) {
     const whereCondition: any = {
       mapped_entity_type: entityType,
       list_type: listType,
       display_type: displayType,
+      organization_id: organization_id,
     };
-    if (organization_id !== null) {
-      whereCondition.organization_id = organization_id;
-    }
 
     return await this.entityTableRepository.findOne({
       where: {

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

@@ -282,6 +282,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     listEntityType: string,
     displayType: string,
     sampleExport: boolean,
+    loggedInUser: UserData,
   ): Promise<string | null> {
     let fileName: string;
     try {
@@ -293,6 +294,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         listEntityType,
         displayType,
         sampleExport,
+        loggedInUser,
       );
 
       const modifiedDate = new Date().toISOString().replace(/[-T:.Z]/g, '');
@@ -316,12 +318,14 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     listEntityType: string,
     displayType: string,
     sampleExport: boolean,
+    loggedInUser: UserData,
   ) {
     const entityTable =
       await this.entityTableService.findByEntityTypeAndListTypeAndDisplayType(
         entityType,
         listEntityType,
         displayType,
+        loggedInUser.organization_id,
       );
     const sheet: ExcelsheetData = {
       sheetName: entityTable?.data_source || 'sheet',

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

@@ -52,13 +52,13 @@ export class EntityTableService {
     entityType: string,
     listType: string,
     displayType: string,
-    organization_id: number | null = null,
+    organization_id: number,
   ) {
     return await this.entityTableRepository.findByEntityTypeAndListTypeAndDisplayType(
       entityType,
       listType,
       displayType,
-      organization_id ? organization_id : null,
+      organization_id,
     );
   }
 

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

@@ -56,5 +56,6 @@ export interface EntityService<T extends BaseEntity> {
     listEntityType: string,
     displayType: string,
     sampleExport: boolean,
+    loggedInUser: UserData,
   ): Promise<string | null>;
 }