rez_core 2.0.28 → 2.0.30

package/package.json

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

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

@@ -110,6 +110,7 @@ export class EntityController {
     @Req() req: Request & { user: any },
   ) {
     let loggedInUser = req.user.userData;
+    console.log(loggedInUser," loggedInUser");
     // let loggedInUser = await this.entityService.getEntityData(
     //   ENTITYTYPE_USER,
     //   requestedUser.userId,
@@ -120,16 +121,18 @@ export class EntityController {
       );
     }
 
+    console.log(entityType,"entityType");
     const entityMaster =
       await this.entityMasterService.getEntityData(entityType);
-
+    console.log(entityMaster, "entityMaster");
     const entityService =
       await this.reflectionHelper.getBean<EntityServiceImpl>(
         entityMaster.entity_service,
       );
-
+console.log(entityService, "entityService");``
     if (entityService) {
       let existingEntity = await entityService.getEntityData(entityType, id);
+      console.log(existingEntity, "existingEntity");
       if (!existingEntity) {
       }
       // let mergeEntity = JsonUtil.merge(existingEntity, entityData);

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

@@ -117,10 +117,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     id: number,
   ): Promise<BaseEntity | null> {
     const entityData = await this.entityMasterService.getEntityData(entityType);
+    console.log(entityData, 'entityData in getEntityData');
 
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entity_data_class,
     );
+    console.log(repoService, 'repoService in getEntityData');
     if (!repoService) {
       throw new Error(
         `Repository service not found for entityType: ${entityType}`,

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

@@ -17,13 +17,14 @@ import { ENTITYTYPE_USER } from '../../../constant/global.constant';
 import { UserService } from '../../user/service/user.service';
 import { UserData } from '../../user/entity/user.entity';
 import { MenuRepository } from '../repository/menu.repository';
+import { MenuService } from '../service/menu.service';
 
 @Controller('module-access')
 @UseGuards(JwtAuthGuard)
 export class ModuleAccessController {
   constructor(
     private readonly moduleAccessService: ModuleAccessService,
-    private readonly menuRepository: MenuRepository,
+    private readonly menuService: MenuService,
   ) {}
 
   @Get('roles')
@@ -73,7 +74,7 @@ export class ModuleAccessController {
   ) {
     const userId = req.user.userData?.id;
     const appcode = req.user.userData?.appcode;
-    const roles = await this.menuRepository.getUserRoles(userId, appcode); // returns ['1', '4']
+    const roles = await this.menuService.getUserRoles(userId, appcode); // returns ['1', '4']
 
     if (!roles || roles.length === 0) {
       throw new BadRequestException('User has no roles');

package/src/module/module/service/menu.service.ts

@@ -9,22 +9,27 @@ export class MenuService {
   /**
    * Fetch and construct menu hierarchy for a given user.
    */
-  async getUserMenu(userId: number,appcode:string): Promise<{ menu: any[] }> {
+  async getUserMenu(userId: number, appcode: string): Promise<{ menu: any[] }> {
     // Step 1: Get the roles of the user
-    const roleCodes = await this.menuRepository.getUserRoles(userId,appcode);
+    const roleCodes = await this.menuRepository.getUserRoles(userId, appcode);
     if (!roleCodes.length) {
       return { menu: [] }; // Return empty menu if user has no roles
     }
 
     // Step 2: Get the modules the user has access to
-    const moduleCodes =
-      await this.menuRepository.getAccessibleModules(roleCodes,appcode);
+    const moduleCodes = await this.menuRepository.getAccessibleModules(
+      roleCodes,
+      appcode,
+    );
     if (!moduleCodes.length) {
       return { menu: [] }; // Return empty menu if no accessible modules
     }
 
     // Step 3: Get the menu items based on accessible modules
-    const menuItems = await this.menuRepository.getMenuItems(moduleCodes,appcode);
+    const menuItems = await this.menuRepository.getMenuItems(
+      moduleCodes,
+      appcode,
+    );
 
     // Step 4: Build hierarchical menu structure
     const menuTree = this.buildMenuHierarchy(menuItems);
@@ -57,4 +62,9 @@ export class MenuService {
 
     return rootMenu;
   }
+
+  // get user roles
+  async getUserRoles(userId: number, appcode: string): Promise<any> {
+    return this.menuRepository.getUserRoles(userId, appcode);
+  }
 }