rez_core 4.0.82 → 4.0.83

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

@@ -1,134 +1,134 @@
-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 { MenuService } from '../service/menu.service';
-
-@Controller('module-access')
-@UseGuards(JwtAuthGuard)
-export class ModuleAccessController {
-  constructor(
-    private readonly moduleAccessService: ModuleAccessService,
-    private readonly menuService: MenuService,
-  ) {}
-
-  @Get('roles')
-  async getRoles(
-    @Query('appcode') appcode: string,
-    @Query('include') include: string, // ✅ declare it as boolean
-    @Request() req,
-  ) {
-    const { level_type, level_id, organization_id } = req.user.userData;
-
-    return this.moduleAccessService.getRoles({
-      appcode,
-      level_type,
-      level_id,
-      organization_id,
-      include: include === 'true', // ensure it's either true or false
-    });
-  }
-
-  @Get('modules')
-  async getModules(@Query('appcode') appcode: string, @Request() req) {
-     const loggedInUser = req.user.userData;
-    return this.moduleAccessService.getModules({
-      appcode,
-      loggedInUser
-    });
-  }
-
-  @Get('access-listing')
-  async getAccessListing(
-    @Query('roles') roleIds: string,
-    @Query('appcode') queryAppcode: string,
-    @Request() req,
-  ) {
-    const roleIdArray = roleIds.split(',').map(Number);
-    const appcode = queryAppcode || req.user.userData.appcode;
-    const level_type = req.user.userData.level_type;
-    const level_id = req.user.userData.level_id;
-    return this.moduleAccessService.getAccessListing(
-      roleIdArray,
-      appcode,
-      level_type,
-      level_id,
-    );
-  }
-
-  @Get('menu-listing')
-  async getMenuListing(
-    @Query('mainmod') mainModIds: string,
-    @Query('appcode') appcode: string,
-    @Request() req,
-  ) {
-    const mainModArray = mainModIds.split(',').map(String);
-    const { level_type } = req.user.userData;
-
-    return this.moduleAccessService.getMenuListing(
-      mainModArray,
-      appcode,
-      level_type,
-    );
-  }
-
-  @Post('update')
-  async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
-    return this.moduleAccessService.updateModuleAccess(moduleAccessData);
-  }
-
-  // src/module/module-access/controller/module-access.controller.ts
-
-  @Get('ui-config')
-  async getModuleUIConfig(
-    @Query('module_code') moduleCode: string,
-    @Request() req,
-  ) {
-    const userId = req.user.userData?.id;
-    const appcode = req.user.userData?.appcode;
-    const roles = await this.menuService.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)),
-    );
-  }
-
-  @Get('user-permissions')
-  async getUserPermissions(@Request() req) {
-    const userData = req.user.userData;
-
-    const userId = userData?.id;
-    const appcode = userData?.appcode;
-    const level_type = userData?.level_type;
-    const level_id = userData?.level_id;
-    const organization_id = userData?.organization_id;
-
-    if (!userId || !appcode || !level_type || !level_id || !organization_id) {
-      throw new BadRequestException('Invalid token data');
-    }
-
-    return this.moduleAccessService.getUserPermissions({
-      userId,
-      appcode,
-      level_type,
-      level_id,
-      organization_id,
-    });
-  }
-}
+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 { MenuService } from '../service/menu.service';
+
+@Controller('module-access')
+@UseGuards(JwtAuthGuard)
+export class ModuleAccessController {
+  constructor(
+    private readonly moduleAccessService: ModuleAccessService,
+    private readonly menuService: MenuService,
+  ) {}
+
+  @Get('roles')
+  async getRoles(
+    @Query('appcode') appcode: string,
+    @Query('include') include: string, // ✅ declare it as boolean
+    @Request() req,
+  ) {
+    const { level_type, level_id, organization_id } = req.user.userData;
+
+    return this.moduleAccessService.getRoles({
+      appcode,
+      level_type,
+      level_id,
+      organization_id,
+      include: include === 'true', // ensure it's either true or false
+    });
+  }
+
+  @Get('modules')
+  async getModules(@Query('appcode') appcode: string, @Request() req) {
+     const loggedInUser = req.user.userData;
+    return this.moduleAccessService.getModules({
+      appcode,
+      loggedInUser
+    });
+  }
+
+  @Get('access-listing')
+  async getAccessListing(
+    @Query('roles') roleIds: string,
+    @Query('appcode') queryAppcode: string,
+    @Request() req,
+  ) {
+    const roleIdArray = roleIds.split(',').map(Number);
+    const appcode = queryAppcode || req.user.userData.appcode;
+    const level_type = req.user.userData.level_type;
+    const level_id = req.user.userData.level_id;
+    return this.moduleAccessService.getAccessListing(
+      roleIdArray,
+      appcode,
+      level_type,
+      level_id,
+    );
+  }
+
+  @Get('menu-listing')
+  async getMenuListing(
+    @Query('mainmod') mainModIds: string,
+    @Query('appcode') appcode: string,
+    @Request() req,
+  ) {
+    const mainModArray = mainModIds.split(',').map(String);
+    const { level_type } = req.user.userData;
+
+    return this.moduleAccessService.getMenuListing(
+      mainModArray,
+      appcode,
+      level_type,
+    );
+  }
+
+  @Post('update')
+  async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
+    return this.moduleAccessService.updateModuleAccess(moduleAccessData);
+  }
+
+  // src/module/module-access/controller/module-access.controller.ts
+
+  @Get('ui-config')
+  async getModuleUIConfig(
+    @Query('module_code') moduleCode: string,
+    @Request() req,
+  ) {
+    const userId = req.user.userData?.id;
+    const appcode = req.user.userData?.appcode;
+    const roles = await this.menuService.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)),
+    );
+  }
+
+  @Get('user-permissions')
+  async getUserPermissions(@Request() req) {
+    const userData = req.user.userData;
+
+    const userId = userData?.id;
+    const appcode = userData?.appcode;
+    const level_type = userData?.level_type;
+    const level_id = userData?.level_id;
+    const organization_id = userData?.organization_id;
+
+    if (!userId || !appcode || !level_type || !level_id || !organization_id) {
+      throw new BadRequestException('Invalid token data');
+    }
+
+    return this.moduleAccessService.getUserPermissions({
+      userId,
+      appcode,
+      level_type,
+      level_id,
+      organization_id,
+    });
+  }
+}

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

@@ -1,43 +1,43 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_menu' })
-export class MenuData {
-  @PrimaryGeneratedColumn({ type: 'int' })
-  id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  wbs_code: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  path: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  icon: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_level: string;
-
-  @Column({ type: 'int', nullable: true })
-  parent_id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  parent_code: string;
-
-  @Column({ type: 'int', nullable: true })
-  ui_visible: number;
-
-  @Column({ type: 'varchar', nullable: true })
-  appcode: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  level_type: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_menu' })
+export class MenuData {
+  @PrimaryGeneratedColumn({ type: 'int' })
+  id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_code: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  status: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  wbs_code: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  path: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  icon: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_level: string;
+
+  @Column({ type: 'int', nullable: true })
+  parent_id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  parent_code: string;
+
+  @Column({ type: 'int', nullable: true })
+  ui_visible: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  appcode: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  level_type: string;
+}

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

@@ -1,25 +1,25 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_module_access' })
-export class ModuleAccess {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  role_code: string;
-
-  @Column({ type: 'int', nullable: true })
-  access_flag: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  action_type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  level_type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  appcode: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_module_access' })
+export class ModuleAccess {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_code: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  role_code: string;
+
+  @Column({ type: 'int', nullable: true })
+  access_flag: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  action_type: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  level_type: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  appcode: string;
+}

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

@@ -1,17 +1,17 @@
-import { Column, Entity, PrimaryGeneratedColumn, Unique } from 'typeorm';
-
-@Entity({ name: 'sso_module_action' }) // <- new table name
-@Unique(['module_code', 'action_type']) // enforce uniqueness per module + action
-export class ModuleAction {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  action_name: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  action_type: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn, Unique } from 'typeorm';
+
+@Entity({ name: 'sso_module_action' }) // <- new table name
+@Unique(['module_code', 'action_type']) // enforce uniqueness per module + action
+export class ModuleAction {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_code: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  action_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  action_type: string;
+}

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

@@ -1,52 +1,52 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_module' })
-export class ModuleData {
-  @PrimaryGeneratedColumn({ type: 'int' })
-  id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  wbs_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_level: string;
-
-  @Column({ type: 'int', nullable: true })
-  parent_id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  parent_code: string;
-
-  @Column({ type: 'int', nullable: true })
-  ui_visible: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  entity_type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  title: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  component_name: string;
-
-  @Column({ type: 'json', nullable: true })
-  ui_config: JSON;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  appcode: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  level_type: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_module' })
+export class ModuleData {
+  @PrimaryGeneratedColumn({ type: 'int' })
+  id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_code: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  wbs_code: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  status: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_level: string;
+
+  @Column({ type: 'int', nullable: true })
+  parent_id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  parent_code: string;
+
+  @Column({ type: 'int', nullable: true })
+  ui_visible: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  entity_type: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  title: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  component_name: string;
+
+  @Column({ type: 'json', nullable: true })
+  ui_config: JSON;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  appcode: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  type: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  level_type: string;
+}

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

@@ -1,42 +1,42 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { ModuleData } from './entity/module.entity';
-import { UtilsModule } from '../../utils/utils.module';
-import { ModuleAction } from './entity/module-action.entity';
-import { ModuleAccessService } from './service/module-access.service';
-import { MenuController } from './controller/menu.controller';
-import { MenuService } from './service/menu.service';
-import { MenuRepository } from './repository/menu.repository';
-import { MenuData } from './entity/menu.entity';
-import { ModuleAccessRepository } from './repository/module-access.repository';
-import { ModuleAccessController } from './controller/module-access.controller';
-import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
-import { UserModule } from '../user/user.module';
-import { Role } from '../user/entity/role.entity';
-import { ModuleAccess } from './entity/module-access.entity';
-import { ListMasterModule } from '../listmaster/listmaster.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([
-      ModuleData,
-      ModuleAccess,
-      ModuleAction,
-      MenuData,
-      UserRoleMapping,
-      Role,
-    ]),
-    UtilsModule,
-    UserModule,
-    ListMasterModule,
-  ],
-  controllers: [MenuController, ModuleAccessController],
-  providers: [
-    ModuleAccessService,
-    MenuService,
-    MenuRepository,
-    ModuleAccessRepository,
-  ],
-  exports: [ModuleAccessService,MenuService],
-})
-export class ModuleModule {}
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { ModuleData } from './entity/module.entity';
+import { UtilsModule } from '../../utils/utils.module';
+import { ModuleAction } from './entity/module-action.entity';
+import { ModuleAccessService } from './service/module-access.service';
+import { MenuController } from './controller/menu.controller';
+import { MenuService } from './service/menu.service';
+import { MenuRepository } from './repository/menu.repository';
+import { MenuData } from './entity/menu.entity';
+import { ModuleAccessRepository } from './repository/module-access.repository';
+import { ModuleAccessController } from './controller/module-access.controller';
+import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
+import { UserModule } from '../user/user.module';
+import { Role } from '../user/entity/role.entity';
+import { ModuleAccess } from './entity/module-access.entity';
+import { ListMasterModule } from '../listmaster/listmaster.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      ModuleData,
+      ModuleAccess,
+      ModuleAction,
+      MenuData,
+      UserRoleMapping,
+      Role,
+    ]),
+    UtilsModule,
+    UserModule,
+    ListMasterModule,
+  ],
+  controllers: [MenuController, ModuleAccessController],
+  providers: [
+    ModuleAccessService,
+    MenuService,
+    MenuRepository,
+    ModuleAccessRepository,
+  ],
+  exports: [ModuleAccessService,MenuService],
+})
+export class ModuleModule {}