rez_core 6.5.41 → 6.5.43

package/package.json

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

package/src/core.module.ts

@@ -46,7 +46,8 @@ export class CoreModule {
         EnterpriseModule,
         UtilsModule,
         AuthModule,
-        NotificationModule
+        NotificationModule,
+        AppMasterModule
       ];
       exportsArray = [
         ConfigModule,

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

@@ -23,7 +23,7 @@ export class Role {
   @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
   status: string;
 
-  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
+  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true, unique: true })
   code: string;
 
   @Column({ name: 'created_by', type: 'bigint', nullable: true })

package/src/module/user/entity/user.entity.ts

@@ -12,7 +12,7 @@ export class UserData {
   @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
   status: string;
 
-  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
+  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true, unique: true })
   code: string;
 
   @Column({ name: 'created_by', type: 'bigint', nullable: true })

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

@@ -93,6 +93,13 @@ export class RoleRepository {
     return this.roleRepo.findOne({ where: { id } });
   }
 
+  async findMaxIdRecord() {
+    return await this.roleRepo.findOne({
+      order: { id: 'DESC' },
+      select: ['id']
+    });
+  }
+
   async saveRole(role: Role) {
     let entity = this.roleRepo.create(role);
     return await this.roleRepo.save(entity);

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

@@ -67,4 +67,11 @@ export class UserRepository {
   async find(options: any): Promise<UserData[]> {
     return await this.userRepository.find(options);
   }
+
+  async findMaxIdRecord() {
+    return await this.userRepository.findOne({
+      order: { id: 'DESC' },
+      select: ['id']
+    });
+  }
 }

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

@@ -23,7 +23,7 @@ export class RoleService {
 
   async createRole(
     role: Role,
-    loggedInUser: UserData,
+    loggedInUser: any,
   ) {
 
     // if level_type and level_id are not provided, use loggedInUser's values
@@ -31,7 +31,7 @@ export class RoleService {
     role.level_id = role.level_id || loggedInUser.level_id;
     role.created_by = loggedInUser.id;
     role.enterprise_id = loggedInUser.enterprise_id;
-    // role.appcode = role.appcode || loggedInUser.appcode;
+    role.app_id = role.app_id || loggedInUser.app_id;
 
     if (
       await this.roleRepository.isRoleNameWithLevelExists(role.name, {
@@ -45,6 +45,14 @@ export class RoleService {
       return { success: false, error: 'Role name already exists.' };
     }
 
+    if(!role.code) {
+      const maxId = await this.roleRepository.findMaxIdRecord();
+      if(maxId && maxId.id) {
+        role.code = `ROL${maxId.id + 1}`;
+      } else {
+        role.code = `ROL1`;
+      }
+    }
 
     const sourceRole = role.copy_from_role_id
       ? await this.roleRepository.findById(role.copy_from_role_id)

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

@@ -50,7 +50,15 @@ export class UserService {
     if (existingUser) {
       return { success: false, error: 'User with this mobile already exists' };
     }
-    ;
+
+    if(!userData.code) {
+      const maxId = await this.userRepository.findMaxIdRecord();
+      if(maxId && maxId.id) {
+        userData.code = `USR${maxId.id + 1}`;
+      } else {
+        userData.code = `USR1`;
+      }
+    }
 
     userData.password = EncryptUtilService.encryptGCM(
       userData.password || 'Admin@123',