rez_core 2.0.0 → 2.0.2

package/package.json

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

package/src/module/enterprise/entity/enterprise.entity.ts

@@ -29,8 +29,8 @@ export class EnterpriseData {
   @Column({ name: 'modified_date', type: 'datetime', nullable: true })
   modified_date: Date;
 
-  @Column({ name: 'app_code', type: 'varchar', nullable: true, length: 50 })
-  app_code: string;
+  @Column({ name: 'appcode', type: 'varchar', nullable: true, length: 50 })
+  appcode: string;
 
   @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
   app_url_name: string;

package/src/module/enterprise/entity/organization.entity.ts

@@ -11,8 +11,8 @@ export class OrganizationData {
   @Column({ name: 'code', nullable: true })
   code: string;
 
-  @Column({ name: 'app_code', nullable: true })
-  appCode: string;
+  @Column({ name: 'appcode', nullable: true })
+  appcode: string;
 
   @Column({ name: 'name', nullable: true })
   name: string;

package/src/module/filter/entity/saved-filter-master.entity.ts

@@ -9,9 +9,6 @@ export class SavedFilterMaster extends BaseEntity {
     this.entity_type = ENTITYTYPE_SAVEDFILTERMASTER;
   }
 
-  @Column({ length: 50, type: 'varchar', nullable: true })
-  app_code: string;
-
   @Column({ length: 50, type: 'varchar', nullable: true })
   mapped_entity_type: string;
 

package/src/module/master/service/master.service.ts

@@ -257,17 +257,27 @@ export class MasterService {
               continue;
             }
 
+            const existingError = errors.find((e) => e.row === i + 1);
+
             if (refData[0].organization_id !== loggedInUser.organization_id) {
-              errors.push({
-                row: i + 1,
-                errors: [
-                  {
-                    field: attr.name,
-                    message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
-                  },
-                ],
-              });
-              continue;
+              if (existingError) {
+                existingError.errors.push({
+                  field: attr.name,
+                  message: `Reference entity not found for code: ${row[attr.attribute_key]} does not belong to the organization`,
+                });
+                continue;
+              } else {
+                errors.push({
+                  row: i + 1,
+                  errors: [
+                    {
+                      field: attr.name,
+                      message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
+                    },
+                  ],
+                });
+                continue;
+              }
             }
 
             row[attr.attribute_key] = refData[0].id;
@@ -407,11 +417,17 @@ export class MasterService {
           entityMaster,
         );
 
+      const existingError = errors.find((e) => e.row === i + 1);
+
       if (rowErrors?.length > 0) {
-        errors.push({
-          row: i + 1,
-          errors: rowErrors,
-        });
+        if (existingError) {
+          existingError.errors.push(...rowErrors);
+        } else {
+          errors.push({
+            row: i + 1,
+            errors: rowErrors,
+          });
+        }
       }
     }
 
@@ -419,7 +435,7 @@ export class MasterService {
       throw new BadRequestException({
         status: false,
         message: `Validation errors found in the uploaded data.`,
-        details: errors,
+        error: errors,
       });
     }
 

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

@@ -2,14 +2,17 @@ import {
   BadRequestException,
   Body,
   Controller,
-  Get, HttpCode,
+  Get,
+  HttpCode,
   HttpStatus,
   Param,
   Post,
   Query,
   Res,
   Req,
-  UseGuards, Inject,
+  UseGuards,
+  Inject,
+  Request,
 } from '@nestjs/common';
 import { EntityServiceImpl } from '../service/entity-service-impl.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
@@ -62,11 +65,11 @@ export class EntityController {
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
     @Res() res: Response,
-    @Req() req: Request & {user: any}
+    @Req() req: Request & { user: any },
   ) {
     let requestedUser = req.user;
+    let appcode = requestedUser.appcode;
     let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.userId);
-
     if (!entityType) {
       throw new BadRequestException(
         'Query parameter "entity_type" is required',
@@ -83,7 +86,7 @@ export class EntityController {
     if (entityService) {
       return res
         .status(HttpStatus.OK)
-        .json(await entityService.createEntity(entityData, loggedInUser as UserData));
+        .json(await entityService.createEntity(entityData, loggedInUser as UserData,null,appcode));
     }
   }
 
@@ -93,10 +96,13 @@ export class EntityController {
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
     @Res() response: Response,
-    @Req() req: Request & {user: any}
+    @Req() req: Request & { user: any },
   ) {
     let requestedUser = req.user;
-    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.userId);
+    let loggedInUser = await this.entityService.getEntityData(
+      ENTITYTYPE_USER,
+      requestedUser.userId,
+    );
     if (!entityType) {
       throw new BadRequestException(
         'Query parameter "entity_type" is required',
@@ -117,7 +123,10 @@ export class EntityController {
       }
       // let mergeEntity = JsonUtil.merge(existingEntity, entityData);
 
-      entityData = await entityService.updateEntity(entityData, loggedInUser as UserData);
+      entityData = await entityService.updateEntity(
+        entityData,
+        loggedInUser as UserData,
+      );
       return response.status(HttpStatus.OK).json(entityData);
     }
   }
@@ -127,6 +136,7 @@ export class EntityController {
     @Param('entity_type') entityType: string,
     @Query('list_type') listType: string,
     @Res() res: Response,
+    @Request() req,
     @Body() filters: Record<string, any> = {},
     @Query('sort_column') sortColumn?: string,
     @Query('sort_order') sortOrder?: string,
@@ -135,6 +145,8 @@ export class EntityController {
     @Query('tab_column') tabColumn?: string,
     @Query('tab_value') tabValue?: string,
   ) {
+    const appcode = req.user.appcode;
+
     return res
       .status(HttpStatus.OK)
       .json(
@@ -147,7 +159,8 @@ export class EntityController {
           page,
           size,
           tabColumn,
-          tabValue
+          tabValue,
+          appcode,
         ),
       );
   }
@@ -164,13 +177,12 @@ export class EntityController {
     @Res() res: Response, // Express Response for file handling
   ) {
     try {
-
       const filePath = await this.entityService.generateExcelReport(
         entityType,
         filterCriteria,
         listEntityType,
         displayType,
-        sampleExport
+        sampleExport,
       );
 
       if (!filePath || !fs.existsSync(filePath)) {
@@ -181,7 +193,10 @@ export class EntityController {
         'Content-Disposition',
         `attachment; filename=${path.basename(filePath)}`,
       );
-      res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+      res.setHeader(
+        'Content-Type',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      );
 
       const fileStream = fs.createReadStream(filePath);
       fileStream.pipe(res);

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

@@ -9,8 +9,7 @@ export class EntityTableColumn extends BaseEntity {
     this.entity_type = ENTITYTYPE_ENTITYTABLECOLUMN;
   }
 
-  @Column({ name: 'app_code', nullable: true })
-  app_code: string;
+
 
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;

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

@@ -9,8 +9,6 @@ export class EntityTable extends BaseEntity {
     this.entity_type = ENTITYTYPE_ENTITYTABLE;
   }
 
-  @Column({ name: 'app_code', nullable: true })
-  app_code: string;
 
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;

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

@@ -25,6 +25,7 @@ export class EntityListService {
     pageSize: number,
     tabColumn?: string,
     tabValue?: string,
+    appcode?: string,
   ): Promise<EntityListData> {
     let entityListData = new EntityListData();
 
@@ -35,7 +36,11 @@ export class EntityListService {
 
     if (entityTable) {
       if (1 != entityTable.is_proc) {
-        let totalCount = await this.getTotalCount(entityTable, filters);
+        let totalCount = await this.getTotalCount(
+          entityTable,
+          filters,
+          appcode,
+        );
         entityListData.entity_tabs = totalCount as EntityTab[];
 
         if (tabColumn && tabValue) {
@@ -48,6 +53,7 @@ export class EntityListService {
           sortOrder,
           pageNumber,
           pageSize,
+          appcode,
         );
       }
     }
@@ -62,7 +68,13 @@ export class EntityListService {
     sortOrder: string | undefined,
     pageNumber: number | undefined,
     pageSize: number | undefined,
+    appcode?: string,
   ) {
+    // Add appcode to filters if provided
+    if (appcode) {
+      filters = { ...filters, appcode };
+    }
+
     let query = this.getQuery(entityTable.data_source, null);
     let whereClause = await this.getWhereClause(entityTable, filters);
     if (whereClause.query) {
@@ -80,31 +92,31 @@ export class EntityListService {
   private async getTotalCount(
     entityTable: EntityTable,
     filters: Record<string, any>,
+    appcode?: string,
   ) {
     let query = this.getQuery(entityTable.data_source, entityTable.tab_column);
-    let whereClause = await this.getWhereClause(entityTable, filters);
+    let whereClause = await this.getWhereClause(entityTable, filters, appcode);
     if (whereClause.query) {
       query += whereClause.query;
     }
     query += ' GROUP BY ' + entityTable.tab_column;
-  
+
     let tabs = await this.entityManager.query(query, whereClause.argumentList);
-  
+
     let all = 0;
     for (const i in tabs) {
       let tab = tabs[i] as EntityTab;
       tab.tab_value = String(tab.tab_value).toUpperCase(); // Capitalize tab_value
       all += parseInt(String(tab.tab_value_count));
     }
-  
+
     let entityTab = new EntityTab();
     entityTab.tab_value = 'ALL';
     entityTab.tab_value_count = all;
     tabs.push(entityTab);
-  
+
     return tabs.reverse();
   }
-  
 
   private getQuery(source: string, groupByColumn: string | null) {
     if (groupByColumn) {
@@ -119,6 +131,7 @@ export class EntityListService {
   private async getWhereClause(
     entityTable: EntityTable,
     filterCriteria?: Record<string, any>,
+    appcode?: string,
   ) {
     let query = ' WHERE 1=1 ';
     const argsObjectList: any[] = [];
@@ -155,6 +168,15 @@ export class EntityListService {
       }
     }
 
+    // Explicitly check for appcode if provided
+    if (appcode) {
+      query += ` AND appcode = ?`;
+      argsObjectList.push(appcode);
+    } else if (filterCriteria && filterCriteria.appcode) {
+      query += ` AND appcode = ?`;
+      argsObjectList.push(filterCriteria.appcode);
+    }
+
     return { query, argumentList: argsObjectList };
   }
 

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

@@ -28,13 +28,13 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   @Inject() protected readonly entityListService: EntityListService;
   @Inject() protected readonly loggingService: LoggingService;
   @Inject()
-protected readonly entityValidationService: EntityValidationService;
-
+  protected readonly entityValidationService: EntityValidationService;
 
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
-    manager?: EntityManager,
+    manager?: EntityManager | null,
+    appcode?: string,
   ){
     if (!entityData.entity_type) {
       throw new BadRequestException(`EntityType is missing`);
@@ -43,14 +43,16 @@ protected readonly entityValidationService: EntityValidationService;
       entityData.entity_type,
     );
 
-    const validationErrors = await this.entityValidationService.validateEntityData(entityData,entityMaster);
+    const validationErrors =
+      await this.entityValidationService.validateEntityData(
+        entityData,
+        entityMaster,
+      );
     if (validationErrors.length > 0) {
-      
-     return {
+      return {
         success: false,
         errors: validationErrors,
       };
-     
     }
 
     const repo = manager
@@ -127,24 +129,32 @@ protected readonly entityValidationService: EntityValidationService;
     return await repoService.findOne({ where: { id: id } });
   }
 
-  async getEntityList(entityType: string, filters: Record<string, any> = {}): Promise<BaseEntity[]> {
+  async getEntityList(
+    entityType: string,
+    filters: Record<string, any> = {},
+  ): Promise<BaseEntity[]> {
     const entityData = await this.entityMasterService.getEntityData(entityType);
-    const repoService = this.reflectionHelper.getRepoService(entityData.entity_data_class);
-  
+    const repoService = this.reflectionHelper.getRepoService(
+      entityData.entity_data_class,
+    );
+
     if (!repoService) {
-      throw new Error(`Repository service not found for entityType: ${entityType}`);
+      throw new Error(
+        `Repository service not found for entityType: ${entityType}`,
+      );
     }
-  
+
     const result = await repoService.find({
       where: filters,
     });
-  
+
     return result;
   }
-  
+
   async updateEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
+    appcode?: string,
   ): Promise<BaseEntity> {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
@@ -181,6 +191,7 @@ protected readonly entityValidationService: EntityValidationService;
     pageSize: number,
     tabColumn?: string,
     tabValue?: string,
+    appcode?: string,
   ): Promise<EntityListData> {
     return await this.entityListService.getFilterDataWithTabs(
       entityType,
@@ -191,7 +202,8 @@ protected readonly entityValidationService: EntityValidationService;
       pageNumber,
       pageSize,
       tabColumn,
-      tabValue
+      tabValue,
+      appcode,
     );
   }
 
@@ -211,7 +223,7 @@ protected readonly entityValidationService: EntityValidationService;
         filterCriteria,
         listEntityType,
         displayType,
-        sampleExport
+        sampleExport,
       );
 
       const modifiedDate = new Date().toISOString().replace(/[-T:.Z]/g, '');
@@ -261,7 +273,7 @@ protected readonly entityValidationService: EntityValidationService;
       );
 
       let filteredList: any[] = [];
-      if(!sampleExport) {
+      if (!sampleExport) {
         filteredList = await this.entityListService.getFilteredList(
           entityTable,
           filterCriteria,

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

@@ -8,6 +8,7 @@ export interface EntityService<T extends BaseEntity> {
     entityData: T,
     loggedInUser: UserData,
     manager?: EntityManager,
+    appcode?: string,
   ): Promise<BaseEntity>;
 
   getEntityData(
@@ -17,7 +18,7 @@ export interface EntityService<T extends BaseEntity> {
 
   getEntityList(entityType: string): Promise<BaseEntity[]>;
 
-  updateEntity(entityData: T, loggedInUserData: UserData): Promise<BaseEntity>;
+  updateEntity(entityData: T, loggedInUserData: UserData,app_code?:string): Promise<BaseEntity>;
 
   deleteEntity(
     entityType: string,

package/src/module/module/controller/menu.controller.ts

@@ -10,6 +10,7 @@ export class MenuController {
   @Get()
   async getMenu(@Request() req) {
     const userId = req.user.userId;
-    return this.menuService.getUserMenu(userId);
+    const appcode = req.user.appcode;
+    return this.menuService.getUserMenu(userId,appcode);
   }
 }

package/src/module/module/controller/module-access.controller.ts

@@ -1,4 +1,16 @@
-import { BadRequestException, Body, Controller, Get, Inject, Param, Post, Query, Req, Request, UseGuards } from '@nestjs/common';
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Get,
+  Inject,
+  Param,
+  Post,
+  Query,
+  Req,
+  Request,
+  UseGuards,
+} from '@nestjs/common';
 import { ModuleAccessService } from '../service/module-access.service';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 import { ENTITYTYPE_USER } from '../../../constant/global.constant';
@@ -9,52 +21,67 @@ import { MenuRepository } from '../repository/menu.repository';
 @Controller('module-access')
 @UseGuards(JwtAuthGuard)
 export class ModuleAccessController {
-  constructor(private readonly moduleAccessService: ModuleAccessService,
-              private readonly menuRepository: MenuRepository
+  constructor(
+    private readonly moduleAccessService: ModuleAccessService,
+    private readonly menuRepository: MenuRepository,
   ) {}
 
   @Get('roles')
-  async getRoles() {
-    return this.moduleAccessService.getRoles();
+  async getRoles(@Request() req) {
+    const appcode = req.user.appcode;
+    return this.moduleAccessService.getRoles({ appcode });
   }
 
   @Get('modules')
-  async getModules() {
-    return this.moduleAccessService.getModules();
+  async getModules(@Request() req) {
+    const appcode = req.user.appcode;
+
+    return this.moduleAccessService.getModules({
+      appcode,
+    });
   }
 
   @Get('access-listing')
-  async getAccessListing(@Query('roles') roleIds: string) {
+  async getAccessListing(@Query('roles') roleIds: string, @Request() req) {
     const roleIdArray = roleIds.split(',').map(Number);
-    return this.moduleAccessService.getAccessListing(roleIdArray);
+    const appcode = req.user.appcode;
+    return this.moduleAccessService.getAccessListing(roleIdArray, appcode);
   }
 
   @Get('menu-listing')
-  async getMenuListing(@Query('mainmod') mainModIds: string) {
+  async getMenuListing(@Query('mainmod') mainModIds: string, @Request() req) {
     const mainModArray = mainModIds.split(',').map(String);
-    return this.moduleAccessService.getMenuListing(mainModArray);
+    const appcode = req.user.appcode;
+    return this.moduleAccessService.getMenuListing(mainModArray, appcode);
   }
 
   @Post('update')
-  async updateModuleAccess(@Body() moduleAccessData: any[]) {
-    return this.moduleAccessService.updateModuleAccess(moduleAccessData);
+  async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
+    const appcode = req.user.appcode;
+    return this.moduleAccessService.updateModuleAccess(
+      moduleAccessData,
+      appcode,
+    );
   }
 
   // src/module/module-access/controller/module-access.controller.ts
 
   @Get('ui-config')
-  async getModuleUIConfig(@Query('module_code') moduleCode: string, @Request() req) {
+  async getModuleUIConfig(
+    @Query('module_code') moduleCode: string,
+    @Request() req,
+  ) {
     const userId = req.user.userId;
-  
-    const roles = await this.menuRepository.getUserRoles(userId); // returns ['1', '4']
-  
+    const appcode = req.user.appcode;
+    const roles = await this.menuRepository.getUserRoles(userId, appcode); // returns ['1', '4']
+
     if (!roles || roles.length === 0) {
       throw new BadRequestException('User has no roles');
     }
-  
-    return this.moduleAccessService.getModuleUIConfig(moduleCode, roles.map(id => Number(id)));
-  }
-  
-  
 
+    return this.moduleAccessService.getModuleUIConfig(
+      moduleCode,
+      roles.map((id) => Number(id)),
+    );
+  }
 }

package/src/module/module/entity/menu.entity.ts

@@ -34,4 +34,7 @@ export class MenuData {
 
   @Column({ type: 'int', nullable: true })
   ui_visible: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  appcode: string;
 }

package/src/module/module/entity/module-access.entity.ts

@@ -18,5 +18,5 @@ export class ModuleAccess {
   action_type: string;
 
   @Column({type: 'varchar', length: 100, nullable: true})
-  app_code: string;
+  appcode: string;
 }

package/src/module/module/entity/module.entity.ts

@@ -40,4 +40,7 @@ export class ModuleData {
 
   @Column({ type: 'json', nullable: true })
   ui_config: JSON;
+  
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  appcode: string;
 }