rez_core 6.5.36 → 6.5.38

package/package.json

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

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

@@ -10,9 +10,6 @@ export class ModuleAccess {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-
   @Column({ type: 'int', nullable: true })
   module_id: number;
 

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { UserData } from '../entity/user.entity';
 import { Role } from '../entity/role.entity';
-import { STATUS_ACTIVE, STATUS_INACTIVE } from 'src/constant/global.constant';
+import { STATUS_INACTIVE } from 'src/constant/global.constant';
 import { RoleRepository } from '../repository/role.repository';
 import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
@@ -63,11 +63,11 @@ export class RoleService {
       const clonedPermissions = sourcePermissions.map((perm) =>
         this.moduleAccessRepo.create({
           role_code: savedRole.code,
-          module_code: perm.module_code,
           action_type: perm.action_type,
           access_flag: perm.access_flag,
           level_type: perm.level_type,
           appcode: perm.appcode,
+          module_id: perm.module_id
         }),
       );
 
@@ -155,7 +155,7 @@ export class RoleService {
       const clonedPermissions = sourcePermissions.map((perm) =>
         this.moduleAccessRepo.create({
           role_code: role.code,
-          module_code: perm.module_code,
+          module_id: perm.module_id,
           action_type: perm.action_type,
           access_flag: perm.access_flag,
           appcode: perm.appcode,

package/src/module/user/service/user.service.ts

@@ -12,7 +12,7 @@ import { plainToInstance } from 'class-transformer';
 import { UpdateUserDto } from '../dto/update-user.dto';
 import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
 import { StatusConstant } from '../../../constant/status.constant';
-import { RoleService } from './role.service';
+import { RoleRepository } from '../repository/role.repository';
 
 @Injectable()
 @ActionHandler('User')
@@ -20,7 +20,7 @@ export class UserService {
   constructor(
     private userRepository: UserRepository,
     private userRoleMappingService: UserRoleMappingService,
-    private roleService: RoleService,
+    private roleRepo: RoleRepository,
     private configService: ConfigService,
     private readonly enterpriseRepository: EnterpriseRepository,
   ) {
@@ -127,7 +127,7 @@ export class UserService {
         for (const i in userRoleMappings) {
           const userRoleMapping = userRoleMappings[i];
           const roleId = userRoleMapping.role_id;
-          const role = await this.roleService.findById(roleId);
+          const role = await this.roleRepo.findById(roleId);
           roles.push(role);
         }
         userDto.roles = roles;
@@ -223,7 +223,7 @@ export class UserService {
   async findByEmailId(
     email_id: string,
     enterprise_id?: number,
-    getLastApp?: boolean
+    getLastApp?: boolean,
   ): Promise<UserData | null> {
     return await this.userRepository.findByEmailId(email_id, enterprise_id, getLastApp);
   }