rez_core 6.5.10 → 6.5.11

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

@@ -8,22 +8,34 @@ import { InjectRepository } from '@nestjs/typeorm';
 export class UserRepository {
   constructor(
     @InjectRepository(UserData) private userRepository: Repository<UserData>,
-  ) {}
+  ) { }
 
   async findById(userId: number): Promise<UserData | null> {
     return this.userRepository.findOne({ where: { id: userId } });
   }
+
   async findByEmailId(
     email: string,
     enterprise_id?: number,
+    getLastApp?: boolean,
   ): Promise<UserData | null> {
     if (!email) return null;
 
     const where: any = { email_id: email };
+
     if (enterprise_id !== undefined) {
       where.enterprise_id = enterprise_id;
     }
-    return this.userRepository.findOne({ where });
+
+    const options: any = { where };
+
+    if (getLastApp) {
+      options.relations = {
+        last_app: true,
+      };
+    }
+
+    return this.userRepository.findOne(options);
   }
 
   async findByMobile(
@@ -51,4 +63,8 @@ export class UserRepository {
   async updateUser(id: number, user: UserData) {
     return await this.userRepository.update(id, user);
   }
+
+  async find(options: any): Promise<UserData[]> {
+    return await this.userRepository.find(options);
+  }
 }

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

@@ -53,10 +53,11 @@ export class LoginService {
       }
     }
 
-    // 🔹 Step 2: Find the user by email + organization check
+    // 🔹 Step 2: Find the user by email + enterprise check
     const user = await this.userService.findByEmailId(
       email_id,
       enterprise?.id,
+      true
     );
 
     if (!user || (enterprise && user.enterprise_id !== enterprise.id)) {
@@ -114,6 +115,9 @@ export class LoginService {
 
     const roleMappings = await this.userRoleMappingRepository.find({
       where: whereCondition,
+      relations: {
+        app: true
+      }
     });
 
     if (!roleMappings.length) {
@@ -137,6 +141,7 @@ export class LoginService {
       user,
       defaultAccess.app_id,
       defaultAccess,
+      defaultAccess.appcode
     );
 
     // 🔹 Step 7: Update first login + invitation status
@@ -170,6 +175,7 @@ export class LoginService {
       level_type: defaultAccess.level_type,
       level_id: defaultAccess.level_id,
       slug: slug,
+      appcode: defaultAccess.appcode
     };
   }
 
@@ -204,7 +210,7 @@ export class LoginService {
   private async getDefaultAccess(
     user: any,
     roleMappings: any[],
-  ): Promise<{ level_type: string; level_id: string; app_id: number }> {
+  ): Promise<{ level_type: string; level_id: string; app_id: number; appcode?:string }> {
     const orgAccess = roleMappings.find((r) => r.level_type === 'ORG');
     const brnAccesses = roleMappings.filter((r) => r.level_type === 'BRN');
     const schAccesses = roleMappings.filter((r) => r.level_type === 'SCH');
@@ -228,6 +234,7 @@ export class LoginService {
         level_type: user.last_level_type,
         level_id: user.last_level_id,
         app_id: user.last_app_access_id,
+        appcode: user.last_app.code
       };
     }
 
@@ -236,6 +243,7 @@ export class LoginService {
         level_type: 'ORG',
         level_id: orgAccess.level_id,
         app_id: orgAccess.app_id,
+        appcode: orgAccess.app.code
       };
     }
 

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

@@ -183,4 +183,8 @@ export class RoleService {
   async findById(id: number) {
     return await this.roleRepository.findById(id);
   }
+
+  async find(options: any): Promise<Role[]> {
+    return await this.roleRepository.findRoles(options);
+  }
 }

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

@@ -7,7 +7,7 @@ import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 export class UserRoleMappingService {
   constructor(
     private readonly userRoleMappingRepository: UserRoleMappingRepository,
-  ) {}
+  ) { }
 
   async assignUserRole(userRoleMapping: UserRoleMapping) {
     const existing = await this.userRoleMappingRepository.findByUserIdAndRoleId(
@@ -95,4 +95,26 @@ export class UserRoleMappingService {
       levelId,
     );
   }
+
+  async find(options: any): Promise<UserRoleMapping[]> {
+    return await this.userRoleMappingRepository.find(options);
+  }
+
+  async create(data: any, loggedInUser: any) {
+    // Assuming data maps to UserRoleMapping or needs transformation
+    // Based on usage in controller: this.roleMappingService.createEntity(data.userRoleMappingData, data.loggedInUserData)
+
+    // If data is already a UserRoleMapping object or similar
+    // We might need to adjust this based on actual DTO structure, but for now passing it through or saving
+
+    // If it's a direct save:
+    // return await this.userRoleMappingRepository.save(data);
+
+    // However, assignUserRole seems to be the main method for creating/assigning. 
+    // Let's use assignUserRole if data matches, or save if it's a raw entity.
+    // The controller passes `data.userRoleMappingData`.
+
+    // Let's assume it's a UserRoleMapping compatible object.
+    return await this.assignUserRole(data);
+  }
 }

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

@@ -24,7 +24,7 @@ export class UserSessionService {
     private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
     private readonly reflectionHelper: ReflectionHelper,
   ) {}
-  async createSession(user, app_id?: number, accessInfo?: any) {
+  async createSession(user, app_id?: number, accessInfo?: any, appcode?:string) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');
 
     const userSession: any = new UserSession();
@@ -47,6 +47,7 @@ export class UserSessionService {
       email_id: user.email_id,
       organization_id: user.organization_id,
       enterprise_id: user.enterprise_id,
+      appcode
     };
 
     // ✅ Add role access details

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

@@ -230,8 +230,9 @@ export class UserService implements Action {
   async findByEmailId(
     email_id: string,
     enterprise_id?: number,
+    getLastApp?: boolean
   ): Promise<UserData | null> {
-    return await this.userRepository.findByEmailId(email_id, enterprise_id);
+    return await this.userRepository.findByEmailId(email_id, enterprise_id, getLastApp);
   }
 
   async findByMobile(
@@ -333,4 +334,8 @@ export class UserService implements Action {
       };
     }
   }
+
+  async find(options: any): Promise<UserData[]> {
+    return await this.userRepository.find(options);
+  }
 }