rez_core 1.0.54 → 1.0.56

package/package.json

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

package/src/module/module/repository/module-access.repository.ts

@@ -175,18 +175,33 @@ export class ModuleAccessRepository {
     if (nameExists) {
       throw new BadRequestException('Role name already exists.');
     }
+    if(copyFromRoleId){
+      const sourceRole = await this.roleRepo.findOne({
+        where: { id: copyFromRoleId },
+      });
+      if (!sourceRole) {
+        throw new BadRequestException('Source role not found');
+      }
+    }
 
-    const code = this.clockIDGenService.idGenerator('ROL');
+    // 1. Create the role without the code (code will be updated after ID is generated)
     const newRole = this.roleRepo.create({
       name,
-      code,
       description,
       status: status || 'ACTIVE',
       created_by: loggedInUser.id,
       created_date: new Date(),
     });
 
-    const savedRole = await this.roleRepo.save(newRole);
+    // 2. Save the role to get the generated ID
+    const savedRole = await this.roleRepo.save(newRole); // ID is now available
+
+    // 3. Generate the code using the saved ID
+    const generatedCode = `ROL${savedRole.id}`;
+
+    // 4. Update the role with the generated code
+    savedRole.code = generatedCode;
+    await this.roleRepo.save(savedRole); // Update only the code
 
     if (copyFromRoleId) {
       const sourceRole = await this.roleRepo.findOne({
@@ -200,7 +215,7 @@ export class ModuleAccessRepository {
       });
       const clonedPermissions = sourcePermissions.map((perm) =>
         this.moduleAccessRepo.create({
-          role_code: code,
+          role_code: generatedCode,
           module_code: perm.module_code,
           action_type: perm.action_type,
           access_flag: perm.access_flag,
@@ -303,4 +318,4 @@ export class ModuleAccessRepository {
     const existingRole = await query.getOne();
     return !!existingRole;
   }
-}
+}