rez_core 2.0.74 → 2.0.76

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -297,7 +297,7 @@ export class FilterService {
       case 'contains':
         return {
           query: `LOWER(e.${attr}) LIKE :${key}`,
-          params: { [key]: `%${val.toLowerCase()}%` },
+          params: { [key]: `%${val?val.toLowerCase():""}%` },
         };
       case 'equal':
         return {

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

@@ -192,29 +192,27 @@ export class UserService extends EntityServiceImpl {
       for (const entry of userDto.access) {
         const { id, level_type, level_ids, app_code, role_id } = entry;
 
-        if (
-          !level_type ||
-          typeof level_ids !== 'number' ||
-          !app_code ||
-          !role_id
-        ) {
+        if (!level_type || !app_code || !role_id || !Array.isArray(level_ids)) {
           throw new BadRequestException('Invalid access level entry');
         }
 
-        const userRoleMapping = new UserRoleMapping(savedData.id, role_id);
-        if (id) {
-          userRoleMapping.id = id; // Use the existing ID if provided
+        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;
+          userRoleMapping.role_id = role_id;
+          userRoleMapping.organization_id =
+            loggedInUserData?.organization_id || 0;
+          insertPromises.push(
+            this.userRoleMappingService.assignUserRole(userRoleMapping),
+          );
         }
-
-        userRoleMapping.role_id = role_id;
-        userRoleMapping.appcode = app_code;
-        userRoleMapping.level_id = String(level_ids); // level_ids is now a number
-        userRoleMapping.level_type = level_type;
-        userRoleMapping.organization_id = loggedInUserData.organization_id || 0;
-
-        insertPromises.push(
-          this.userRoleMappingService.updateAssignedRole(userRoleMapping),
-        );
       }
 
       try {