rez_core 2.0.78 → 2.0.80

package/package.json

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

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

@@ -22,16 +22,13 @@ export class RoleService extends EntityServiceImpl {
 
   async createEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
-    manager?: EntityManager,
-    appcode?: string,
+    loggedInUser: UserData,
   ): Promise<BaseEntity> {
     let role = entityData as Role;
 
-    if (loggedInUser?.level_type && loggedInUser?.level_id) {
-      role.level_type = loggedInUser.level_type;
-      role.level_id = loggedInUser.level_id;
-    }
+    // if level_type and level_id are not provided, use loggedInUser's values
+    role.level_type = entityData.level_type || loggedInUser.level_type;
+    role.level_id = entityData.level_id || loggedInUser.level_id;
 
     if (
       await this.roleRepository.isRoleNameWithLevelExists(role.name, {

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

@@ -187,10 +187,13 @@ export class UserService extends EntityServiceImpl {
 
     // Handle updated access levels
     if (userDto.access && userDto.access.length > 0) {
+      // delete all the existing user role mapping
+      await this.userRoleMappingService.deleteByUserId(existingUser.id);
+
       const insertPromises: any[] = [];
 
       for (const entry of userDto.access) {
-        const { id, level_type, level_ids, app_code, role_id } = entry;
+        const { level_type, level_ids, app_code, role_id } = entry;
 
         if (!level_type || !app_code || !role_id || !Array.isArray(level_ids)) {
           throw new BadRequestException('Invalid access level entry');
@@ -199,10 +202,6 @@ export class UserService extends EntityServiceImpl {
         for (const levelId of level_ids) {
           const userRoleMapping = new UserRoleMapping(savedData.id, role_id);
 
-          if (id) {
-            userRoleMapping.id = id; // Use the existing ID if provided
-          }
-
           userRoleMapping.level_type = level_type;
           userRoleMapping.level_id = String(levelId);
           userRoleMapping.appcode = app_code;