rez_core 6.5.45 → 6.5.47

package/package.json

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

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

@@ -96,6 +96,7 @@ export class RoleRepository {
   async findMaxIdRecord() {
     return await this.roleRepo.findOne({
       order: { id: 'DESC' },
+      where: {},
       select: ['id']
     });
   }

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

@@ -1,4 +1,3 @@
-import { OrganizationData } from './../../enterprise/entity/organization.entity';
 import { Repository } from 'typeorm';
 import { UserData } from '../entity/user.entity';
 import { Injectable } from '@nestjs/common';
@@ -71,7 +70,8 @@ export class UserRepository {
   async findMaxIdRecord() {
     return await this.userRepository.findOne({
       order: { id: 'DESC' },
-      select: ['id']
+      select: ['id'],
+      where:{}
     });
   }
 }

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

@@ -13,6 +13,7 @@ import { UpdateUserDto } from '../dto/update-user.dto';
 import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
 import { StatusConstant } from '../../../constant/status.constant';
 import { RoleRepository } from '../repository/role.repository';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 @ActionHandler('User')
@@ -23,6 +24,7 @@ export class UserService {
     private roleRepo: RoleRepository,
     private configService: ConfigService,
     private readonly enterpriseRepository: EnterpriseRepository,
+    private readonly reflectionHelper: ReflectionHelper
   ) {
   }
 
@@ -85,7 +87,6 @@ export class UserService {
 
     for (const entry of userData.access || []) {
       const { level_type, level_ids, app_code, role_id } = entry;
-
       if (
         !level_type ||
         !Array.isArray(level_ids) ||
@@ -95,12 +96,18 @@ export class UserService {
       ) {
         return { success: false, error: 'Invalid access level entry' };
       }
-
+      const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+      const appMaster = await appMasterRepo.findOne({
+        where: {
+          code: app_code
+        }
+      })
       for (const levelId of level_ids) {
         const userRoleMapping = new UserRoleMapping(savedData.id, role_id);
         userRoleMapping.level_type = level_type;
         userRoleMapping.level_id = String(levelId);
         userRoleMapping.appcode = app_code;
+        userRoleMapping.app_id = appMaster.id
         userRoleMapping.enterprise_id = loggedInUser?.enterprise_id || 0;
         insertPromises.push(
           this.userRoleMappingService.assignUserRole(userRoleMapping),