rez_core 2.0.26 → 2.0.27

package/package.json

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

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

@@ -5,18 +5,18 @@ import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 import { UserService } from 'src/module/user/service/user.service';
 import { ENTITYTYPE_USER } from '../../../constant/global.constant';
 
-
 @Controller('organization')
 export class OrganizationController {
-  constructor(private readonly orgService: OrganizationService,
-    @Inject('UserService') private readonly  userService: UserService
+  constructor(
+    private readonly orgService: OrganizationService,
+    @Inject('UserService') private readonly userService: UserService,
   ) {}
 
   @UseGuards(JwtAuthGuard)
   @Get('dropdown')
   async getOrganizationDropdown(@Req() req: Request & { user: any }) {
-    const userId = req.user.userId;
-    const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
+    const userData = req.user.userData;
+    // const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
     // const enterpriseId = req.user['enterpriseId']; // or adapt based on your user structure
     return this.orgService.findById(userData?.organization_id);
   }

package/src/module/layout/controller/layout.controller.ts

@@ -23,11 +23,11 @@ export class LayoutController {
 
   @Get('header')
   async getHeader(@Req() req: Request & { user: any }, @Res() res: Response) {
-    const userId = req.user.userId;
-    const userData = await this.userService.getEntityData(
-      ENTITYTYPE_USER,
-      userId,
-    );
+    const userData = req.user.userData;
+    // const userData = await this.userService.getEntityData(
+    //   ENTITYTYPE_USER,
+    //   userId,
+    // );
     if (userData) {
       let response = await this.headerSectionService.findByOrganizationId(
         userData.organization_id,

package/src/module/master/controller/master.controller.ts

@@ -53,8 +53,8 @@ export class MasterController {
     @Req() req: Request & { user: any },
     @Body('duplicateHandling') duplicateHandling: 'skip_duplicates' | 'overwrite_items',
   ) {
-    let requestedUser = req.user;
-    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER, requestedUser.userId);
+    let loggedInUser = req.user.userData;
+    // let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER, requestedUser.userId);
   
     if (!file) {
       throw new BadRequestException('File is required');

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

@@ -67,7 +67,7 @@ export class EntityController {
     @Res() res: Response,
     @Req() req: Request & { user: any },
   ) {
-    let requestedUser = req.user;
+    let requestedUser = req.user.userData;
     let appcode = requestedUser.appcode;
     // let loggedInUser = await this.entityService.getEntityData(
     //   ENTITYTYPE_USER,
@@ -109,11 +109,11 @@ export class EntityController {
     @Res() response: Response,
     @Req() req: Request & { user: any },
   ) {
-    let requestedUser = req.user;
-    let loggedInUser = await this.entityService.getEntityData(
-      ENTITYTYPE_USER,
-      requestedUser.userId,
-    );
+    let loggedInUser = req.user.userData;
+    // let loggedInUser = await this.entityService.getEntityData(
+    //   ENTITYTYPE_USER,
+    //   requestedUser.userId,
+    // );
     if (!entityType) {
       throw new BadRequestException(
         'Query parameter "entity_type" is required',
@@ -156,7 +156,7 @@ export class EntityController {
     @Query('tab_column') tabColumn?: string,
     @Query('tab_value') tabValue?: string,
   ) {
-    const appcode = req.user.appcode;
+    const appcode = req.user.userData.appcode;
 
     return res
       .status(HttpStatus.OK)

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

@@ -1,4 +1,12 @@
-import { Controller, HttpStatus, Post, Query, Req, Res, UseGuards } from '@nestjs/common';
+import {
+  Controller,
+  HttpStatus,
+  Post,
+  Query,
+  Req,
+  Res,
+  UseGuards,
+} from '@nestjs/common';
 import { EntityTableService } from '../service/entity-table.service';
 import { Response } from 'express';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
@@ -9,17 +17,24 @@ export class MetaController {
   constructor(private readonly entityTableService: EntityTableService) {}
 
   @Post('get-table-data')
-  async getTableMetaData(@Query('entity_type') entityType: string,
-                         @Query('list_type') listType: string,
-                         @Res() response: Response,
-                        @Req() req: Request & { user: any }) {
-                          const userId = req.user.userId;
-                          console.log(userId)
-    let entityTableDto = await this.entityTableService.getTableMetaDataForListing(entityType, listType,userId);
+  async getTableMetaData(
+    @Query('entity_type') entityType: string,
+    @Query('list_type') listType: string,
+    @Res() response: Response,
+    @Req() req: Request & { user: any },
+  ) {
+    const userId = req.user.userData?.id;
+    console.log(userId);
+    let entityTableDto =
+      await this.entityTableService.getTableMetaDataForListing(
+        entityType,
+        listType,
+        userId,
+      );
     return response.status(HttpStatus.OK).json({
       success: true,
       data: entityTableDto,
-      message: 'Data fetch successfully!'
-    })
+      message: 'Data fetch successfully!',
+    });
   }
 }

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

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

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

@@ -9,8 +9,8 @@ export class MenuController {
   @UseGuards(JwtAuthGuard)
   @Get()
   async getMenu(@Request() req) {
-    const userId = req.user.userId;
-    const appcode = req.user.appcode;
-    return this.menuService.getUserMenu(userId,appcode);
+    const userId = req.user.userData?.id;
+    const appcode = req.user.userData?.appcode;
+    return this.menuService.getUserMenu(userId, appcode);
   }
 }

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

@@ -28,13 +28,13 @@ export class ModuleAccessController {
 
   @Get('roles')
   async getRoles(@Request() req) {
-    const appcode = req.user.appcode;
+    const appcode = req.user.userData.appcode;
     return this.moduleAccessService.getRoles({ appcode });
   }
 
   @Get('modules')
   async getModules(@Request() req) {
-    const appcode = req.user.appcode;
+    const appcode = req.user.userData.appcode;
 
     return this.moduleAccessService.getModules({
       appcode,
@@ -44,20 +44,20 @@ export class ModuleAccessController {
   @Get('access-listing')
   async getAccessListing(@Query('roles') roleIds: string, @Request() req) {
     const roleIdArray = roleIds.split(',').map(Number);
-    const appcode = req.user.appcode;
+    const appcode = req.user.userData.appcode;
     return this.moduleAccessService.getAccessListing(roleIdArray, appcode);
   }
 
   @Get('menu-listing')
   async getMenuListing(@Query('mainmod') mainModIds: string, @Request() req) {
     const mainModArray = mainModIds.split(',').map(String);
-    const appcode = req.user.appcode;
+    const appcode = req.user.userData.appcode;
     return this.moduleAccessService.getMenuListing(mainModArray, appcode);
   }
 
   @Post('update')
   async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
-    const appcode = req.user.appcode;
+    const appcode = req.user.userData.appcode;
     return this.moduleAccessService.updateModuleAccess(
       moduleAccessData,
       appcode,
@@ -71,8 +71,8 @@ export class ModuleAccessController {
     @Query('module_code') moduleCode: string,
     @Request() req,
   ) {
-    const userId = req.user.userId;
-    const appcode = req.user.appcode;
+    const userId = req.user.userData?.id;
+    const appcode = req.user.userData?.appcode;
     const roles = await this.menuRepository.getUserRoles(userId, appcode); // returns ['1', '4']
 
     if (!roles || roles.length === 0) {

package/src/module/user/controller/login.controller.ts

@@ -19,7 +19,7 @@ export class LoginController {
 
   @Post('login')
   async login(@Body() body, @Res() res: Response) {
-    const { email_id, password, appcode, organization_id } = body;
+    const { email_id, password, appcode } = body;
     const result = await this.loginService.login(email_id, password, appcode);
     return res.status(HttpStatus.OK).json(result);
   }
@@ -46,7 +46,7 @@ export class LoginController {
   @Get('google/callback')
   @UseGuards(GoogleAuthGuard)
   async googleAuthRedirect(@Req() req) {
-    let { email, name } = req.user; // Extracted from Google Strategy
+    let { email, name } = req.user.userData; // Extracted from Google Strategy
 
     // Call LoginService to validate user, create session, and return JWT
     return this.loginService.loginWithGoogle(email, name);