rez_core 2.1.51 → 2.1.53

package/package.json

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

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

@@ -462,8 +462,9 @@ export class FilterService {
     const op = filter.filter_operator;
     const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
 
-    if (meta.data_source_type === 'entity' && !filter.skip_id)
+    if (meta.data_source_type === 'entity' && !filter.skip_id) {
       attr = `${attr}_id`;
+    }
 
     switch (meta.data_type) {
       case 'text':
@@ -560,8 +561,16 @@ export class FilterService {
         if (typeof val === 'string') {
           val = val.split(',').map((v) => v.trim());
         }
-        if (!Array.isArray(val) || val.length !== 2) {
-          throw new BadRequestException(`Invalid value for in_between: ${val}`);
+
+        if (
+          !Array.isArray(val) ||
+          val.length !== 2 ||
+          val[0] === '' ||
+          val[1] === ''
+        ) {
+          // throw new BadRequestException(`Invalid value for in_between: ${val}`);
+          console.log(`Invalid value for in_between: ${val}`);
+          return null;
         }
         return {
           query: `e.${attr} BETWEEN :${key}_start AND :${key}_end`,

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

@@ -1,3 +1,4 @@
+import { level } from 'winston';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
@@ -73,7 +74,15 @@ export class UserRoleMappingRepository {
     });
   }
 
-  async deleteByUserId(userId: number) {
+  async deleteByUserId(userId: number, levelType?: string, levelId?: string) {
+    if (levelType && levelId) {
+      await this.userRoleMappingRepository.delete({
+        user_id: userId,
+        level_type: levelType,
+        level_id: levelId,
+      });
+      return;
+    }
     await this.userRoleMappingRepository.delete({ user_id: userId });
   }
 

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

@@ -16,27 +16,23 @@ export class UserRepository {
   async findByEmailId(
     email: string,
     organization_id?: number,
-    appCode?: string,
   ): Promise<UserData | null> {
     if (!email) return null;
-  
+
     const where: any = { email_id: email };
     if (organization_id !== undefined) {
       where.organization_id = organization_id;
     }
-    if (appCode !== undefined) {
-      where.appcode = appCode;
-    }
     return this.userRepository.findOne({ where });
   }
-  
+
   async findByMobile(
     mobile: string,
     organization_id?: number,
     appCode?: string,
   ): Promise<UserData | null> {
     if (!mobile) return null;
-   
+
     const where: any = { mobile };
     if (organization_id !== undefined) {
       where.organization_id = organization_id;
@@ -44,10 +40,9 @@ export class UserRepository {
     if (appCode !== undefined) {
       where.appcode = appCode;
     }
-  
+
     return this.userRepository.findOne({ where });
   }
-  
 
   async saveUser(user: UserData): Promise<UserData> {
     return this.userRepository.save(user);

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

@@ -1,3 +1,4 @@
+import { level } from 'winston';
 import { Injectable } from '@nestjs/common';
 import { UserRoleMappingRepository } from '../repository/user-role-mapping.repository';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
@@ -59,8 +60,16 @@ export class UserRoleMappingService {
     return await this.userRoleMappingRepository.findByUserId(userId);
   }
 
-  async deleteByUserId(userId: number) {
-    await this.userRoleMappingRepository.deleteByUserId(userId);
+  async deleteByUserId(
+    userId: number,
+    levelType?: string,
+    levelId?,
+  ): Promise<void> {
+    await this.userRoleMappingRepository.deleteByUserId(
+      userId,
+      levelType,
+      levelId,
+    );
   }
 
   async getUserByIdAndAppCode(

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

@@ -178,7 +178,15 @@ export class UserService extends EntityServiceImpl {
 
     // Handle updated access levels
     if (userDto.access && userDto.access.length > 0) {
-      await this.userRoleMappingService.deleteByUserId(existingUser.id);
+      if (loggedInUserData.level_type == 'ORG') {
+        await this.userRoleMappingService.deleteByUserId(existingUser.id);
+      } else {
+        await this.userRoleMappingService.deleteByUserId(
+          existingUser.id,
+          loggedInUserData.level_type,
+          loggedInUserData.level_id,
+        );
+      }
 
       const insertPromises: any[] = [];
 
@@ -217,13 +225,8 @@ export class UserService extends EntityServiceImpl {
   async findByEmailId(
     email_id: string,
     organization_id?: number,
-    appCode?: string,
   ): Promise<UserData | null> {
-    return await this.userRepository.findByEmailId(
-      email_id,
-      organization_id,
-      appCode,
-    );
+    return await this.userRepository.findByEmailId(email_id, organization_id);
   }
 
   async findByMobile(