rez_core 1.0.39 → 1.0.40

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

@@ -23,4 +23,18 @@ export class EntityMasterService {
 
     return entityMaster;
   }
+
+  async save(entityMaster: EntityMaster) {
+    return await this.entityMasterRepository.save(entityMaster);
+  }
+
+  async update(id: number, entityMaster: EntityMaster) {
+    return await this.entityMasterRepository.update(id, entityMaster);
+  }
+
+  async findByMappedEntityType(mappedEntityType: string) {
+    return await this.entityMasterRepository.findOne({
+      where: { mapped_entity_type: mappedEntityType },
+    });
+  }
 }

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

@@ -261,7 +261,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     } else {
       let entityMaster =
         await this.entityMasterService.getEntityData(entityType);
-      tableName = entityMaster.dbTableName;
+      tableName = entityMaster.db_table_name;
     }
     return await this.entityListService.getMaxSequenceNumber(
       tableName,

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

@@ -1,15 +1,15 @@
-import { Controller, Get, Request, UseGuards } from '@nestjs/common';
-import { MenuService } from '../service/menu.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-
-@Controller('menu')
-export class MenuController {
-  constructor(private readonly menuService: MenuService) {}
-
-  @UseGuards(JwtAuthGuard)
-  @Get()
-  async getMenu(@Request() req) {
-    const userId = req.user.userId;
-    return this.menuService.getUserMenu(userId);
-  }
-}
+import { Controller, Get, Request, UseGuards } from '@nestjs/common';
+import { MenuService } from '../service/menu.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('menu')
+export class MenuController {
+  constructor(private readonly menuService: MenuService) {}
+
+  @UseGuards(JwtAuthGuard)
+  @Get()
+  async getMenu(@Request() req) {
+    const userId = req.user.userId;
+    return this.menuService.getUserMenu(userId);
+  }
+}

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

@@ -1,10 +1,13 @@
-import { Body, Controller, Get, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query, UseGuards } from '@nestjs/common';
 import { ModuleAccessService } from '../service/module-access.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
 @Controller('module-access')
+@UseGuards(JwtAuthGuard)
 export class ModuleAccessController {
   constructor(private readonly moduleAccessService: ModuleAccessService) {}
 
+
   @Get('roles')
   async getRoles() {
     return this.moduleAccessService.getRoles();

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

@@ -1,22 +1,22 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_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})
-  app_code: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_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})
+  app_code: string;
+}

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

@@ -1,19 +1,19 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'module_action' })
-export class ModuleAction {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({type: 'int', nullable: true})
-  module_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 } from 'typeorm';
+
+@Entity({ name: 'module_action' })
+export class ModuleAction {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({type: 'int', nullable: true})
+  module_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/repository/module-access.repository.ts

@@ -20,12 +20,22 @@ export class ModuleAccessRepository {
   ) {}
 
   async getRoles() {
-    return this.roleRepo.find();
+    const roles = await this.roleRepo.find();
+    return roles.map(role => ({
+      label: role.name,
+      value: role.id,
+    }));
   }
+  
 
   async getModules() {
-    return this.moduleRepo.find({ where: { module_level: 'MAINMOD' } });
+    const modules = await this.moduleRepo.find({ where: { module_level: 'MAINMOD' } });
+    return modules.map(mod => ({
+      label: mod.name,
+      value: mod.id,
+    }));
   }
+  
 
   async getAccessListing(roleIds: number[]) {
     // Fetch roles using role IDs

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

@@ -1,28 +1,28 @@
-import {
-  Body,
-  Controller,
-  HttpStatus,
-  Inject,
-  Post,
-  Res,
-  ValidationPipe,
-} from '@nestjs/common';
-import { UserService } from '../service/user.service';
-import { CreateUserDto } from '../dto/create-user.dto';
-import { Response } from 'express';
-
-@Controller('user')
-export class UserController {
-  constructor(
-    @Inject('UserService') private readonly userService: UserService,
-  ) {}
-
-  @Post('signup')
-  async signup(
-    @Body(new ValidationPipe()) createUserDto: CreateUserDto,
-    @Res() res: Response,
-  ) {
-    const result = await this.userService.createEntity(createUserDto, null);
-    res.status(HttpStatus.OK).json(result);
-  }
-}
+import {
+  Body,
+  Controller,
+  HttpStatus,
+  Inject,
+  Post,
+  Res,
+  ValidationPipe,
+} from '@nestjs/common';
+import { UserService } from '../service/user.service';
+import { CreateUserDto } from '../dto/create-user.dto';
+import { Response } from 'express';
+
+@Controller('user')
+export class UserController {
+  constructor(
+    @Inject('UserService') private readonly userService: UserService,
+  ) {}
+
+  @Post('signup')
+  async signup(
+    @Body(new ValidationPipe()) createUserDto: CreateUserDto,
+    @Res() res: Response,
+  ) {
+    const result = await this.userService.createEntity(createUserDto, null);
+    res.status(HttpStatus.OK).json(result);
+  }
+}

package/src/module/user/dto/update-user.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateUserDto } from './create-user.dto';
-
-export class UpdateUserDto extends PartialType(CreateUserDto) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateUserDto } from './create-user.dto';
+
+export class UpdateUserDto extends PartialType(CreateUserDto) {}

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -1,21 +1,21 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_role_mapping' })
-export class UserRoleMapping {
-  constructor(user_id: number, role_id: number) {
-    this.user_id = user_id;
-    this.role_id = role_id;
-  }
-
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  user_id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  role_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  is_default: number;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_role_mapping' })
+export class UserRoleMapping {
+  constructor(user_id: number, role_id: number) {
+    this.user_id = user_id;
+    this.role_id = role_id;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  user_id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  role_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  is_default: number;
+}

package/src/module/user/entity/user-session.entity.ts

@@ -1,61 +1,61 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_session' })
-export class UserSession {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({
-    name: 'is_session_loggedout',
-    nullable: true,
-    type: 'int',
-  })
-  is_session_loggedout: number;
-
-  @Column({
-    name: 'login_id',
-    nullable: true,
-    length: 50,
-  })
-  login_id: string;
-
-  @Column({
-    name: 'login_time',
-    nullable: true,
-  })
-  login_time: Date;
-
-  @Column({
-    name: 'logout_time',
-    nullable: true,
-  })
-  logout_time: Date;
-
-  @Column({
-    name: 'session_key',
-    nullable: true,
-    length: 100,
-  })
-  session_key: string;
-
-  @Column({
-    name: 'user_id',
-    nullable: true,
-    type: 'bigint',
-  })
-  user_id: number;
-
-  @Column({
-    name: 'access_token',
-    nullable: true,
-    type: 'varchar',
-    length: 5000,
-  })
-  access_token: string;
-
-  @Column({
-    name: 'expiry_date',
-    nullable: true,
-  })
-  expiry_date: Date;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_session' })
+export class UserSession {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({
+    name: 'is_session_loggedout',
+    nullable: true,
+    type: 'int',
+  })
+  is_session_loggedout: number;
+
+  @Column({
+    name: 'login_id',
+    nullable: true,
+    length: 50,
+  })
+  login_id: string;
+
+  @Column({
+    name: 'login_time',
+    nullable: true,
+  })
+  login_time: Date;
+
+  @Column({
+    name: 'logout_time',
+    nullable: true,
+  })
+  logout_time: Date;
+
+  @Column({
+    name: 'session_key',
+    nullable: true,
+    length: 100,
+  })
+  session_key: string;
+
+  @Column({
+    name: 'user_id',
+    nullable: true,
+    type: 'bigint',
+  })
+  user_id: number;
+
+  @Column({
+    name: 'access_token',
+    nullable: true,
+    type: 'varchar',
+    length: 5000,
+  })
+  access_token: string;
+
+  @Column({
+    name: 'expiry_date',
+    nullable: true,
+  })
+  expiry_date: Date;
+}

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

@@ -1,35 +1,35 @@
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
-
-@Entity({ name: 'cr_user' })
-export class UserData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_USER;
-  }
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  first_name: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  last_name: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  password: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  email_id: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  mobile: string;
-
-  @Column({ type: 'int', nullable: true })
-  is_firstlogin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_defaultadmin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_customer: number;
-}
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+
+@Entity({ name: 'cr_user' })
+export class UserData extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  first_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  last_name: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  password: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  email_id: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  mobile: string;
+
+  @Column({ type: 'int', nullable: true })
+  is_firstlogin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_defaultadmin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_customer: number;
+}

package/src/module/user/repository/role.repository.ts

@@ -1,16 +1,16 @@
-import { Injectable } from '@nestjs/common';
-import { Repository } from 'typeorm';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Role } from '../entity/role.entity';
-
-@Injectable()
-export class RoleRepository {
-  constructor(
-    @InjectRepository(Role)
-    private readonly roleRepo: Repository<Role>,
-  ) {}
-
-  async findByCode(code: string): Promise<Role | null> {
-    return this.roleRepo.findOne({ where: { code } });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Role } from '../entity/role.entity';
+
+@Injectable()
+export class RoleRepository {
+  constructor(
+    @InjectRepository(Role)
+    private readonly roleRepo: Repository<Role>,
+  ) {}
+
+  async findByCode(code: string): Promise<Role | null> {
+    return this.roleRepo.findOne({ where: { code } });
+  }
+}

package/src/module/user/repository/userSession.repository.ts

@@ -1,33 +1,33 @@
-import { Repository } from 'typeorm';
-import { UserSession } from '../entity/user-session.entity';
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-@Injectable()
-export class UserSessionRepository {
-  constructor(
-    @InjectRepository(UserSession)
-    private userSessionRepo: Repository<UserSession>,
-  ) {}
-
-  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
-  }
-
-  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({
-      where: { user_id: userId, is_session_loggedout: 0 },
-    });
-  }
-
-  async saveSession(session: UserSession): Promise<UserSession> {
-    return this.userSessionRepo.save(session);
-  }
-
-  async logoutSession(sessionKey: string): Promise<void> {
-    await this.userSessionRepo.update(
-      { session_key: sessionKey },
-      { is_session_loggedout: 1, logout_time: new Date() },
-    );
-  }
-}
+import { Repository } from 'typeorm';
+import { UserSession } from '../entity/user-session.entity';
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+@Injectable()
+export class UserSessionRepository {
+  constructor(
+    @InjectRepository(UserSession)
+    private userSessionRepo: Repository<UserSession>,
+  ) {}
+
+  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
+  }
+
+  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({
+      where: { user_id: userId, is_session_loggedout: 0 },
+    });
+  }
+
+  async saveSession(session: UserSession): Promise<UserSession> {
+    return this.userSessionRepo.save(session);
+  }
+
+  async logoutSession(sessionKey: string): Promise<void> {
+    await this.userSessionRepo.update(
+      { session_key: sessionKey },
+      { is_session_loggedout: 1, logout_time: new Date() },
+    );
+  }
+}