rez_core 1.0.82 → 1.0.83

package/package.json

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

package/src/module/meta/service/entity-list.service.ts

@@ -97,7 +97,7 @@ export class EntityListService {
     entityTab.tab_value = 'ALL';
     entityTab.tab_value_count = all;
     tabs.push(entityTab);
-    return tabs;
+    return tabs.reverse();
   }
 
   private getQuery(source: string, groupByColumn: string | null) {

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

@@ -9,32 +9,24 @@ export class UserRepository {
     @InjectRepository(UserData) private userRepository: Repository<UserData>,
   ) {}
 
-  async findById(userId: number ): Promise<UserData | null> {
+  async findById(userId: number): Promise<UserData | null> {
     return this.userRepository.findOne({ where: { id: userId } });
   }
-  async findByEmailId(email: string, organization_id?: number): Promise<UserData | null> {
+  async findByEmailId(email: string): Promise<UserData | null> {
     if (!email) return null;
-  
+
     const where: any = { email_id: email };
-    if (organization_id !== undefined) {
-      where.organization_id = organization_id;
-    }
-  
+
     return this.userRepository.findOne({ where });
   }
-  
-  async findByMobile(mobile: string, organization_id?: number): Promise<UserData | null> {
+
+  async findByMobile(mobile: string): Promise<UserData | null> {
     if (!mobile) return null;
-  
+
     const where: any = { mobile: mobile };
-    if (organization_id !== undefined) {
-      where.organization_id = organization_id;
-    }
-  
+
     return this.userRepository.findOne({ where });
   }
-  
-  
 
   async saveUser(user: UserData): Promise<UserData> {
     return this.userRepository.save(user);

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

@@ -38,16 +38,14 @@ export class UserService extends EntityServiceImpl {
   ): Promise<BaseEntity> {
     let userData = entityData as CreateUserDto;
     let existingUser = await this.userRepository.findByEmailId(
-      userData.email_id,
-      userData.organization_id
+      userData.email_id
     );
     if (existingUser) {
       throw new BadRequestException('User already exists');
     }
 
     existingUser = await this.userRepository.findByMobile(
-      userData.mobile,
-      userData.organization_id
+      userData.mobile
     );
     if (existingUser) {
       throw new BadRequestException('User already exists');
@@ -169,11 +167,11 @@ export class UserService extends EntityServiceImpl {
   }
   
 
-  async findByEmailId(email_id: string,organization_id?: number): Promise<UserData | null> {
-    return await this.userRepository.findByEmailId(email_id,organization_id);
+  async findByEmailId(email_id: string): Promise<UserData | null> {
+    return await this.userRepository.findByEmailId(email_id);
   }
 
-  async findByMobile(mobile: string,organization_id: number): Promise<UserData | null> {
-    return await this.userRepository.findByMobile(mobile,organization_id);
+  async findByMobile(mobile: string): Promise<UserData | null> {
+    return await this.userRepository.findByMobile(mobile);
   }
 }