fix lateinit error in role creation

NIAEFEUP · Mar 14, 2024 · 5a4806f · 5a4806f
1 parent 5f67feb
commit 5a4806f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/model/Role.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/model/Role.kt
@@ -54,6 +54,6 @@ class Role(
         if (associatedActivities.isEmpty()) {
             return permissionsPayload
         }
-        return "$permissionsPayload ${associatedActivities.joinToString(" ").trimEnd()}"
+        return "$this.name $permissionsPayload ${associatedActivities.joinToString(" ").trimEnd()}"
     }
 }
diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/service/AuthService.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/service/AuthService.kt
@@ -34,7 +34,7 @@ class AuthService(
     fun hasPermission(permission: String): Boolean {
         val authentication = SecurityContextHolder.getContext().authentication
         return authentication.authorities.any {
-            it.toString() == permission.trim().uppercase()
+            it.toString() == permission.trim().uppercase(Locale.getDefault())
         }
     }
 
@@ -47,9 +47,7 @@ class AuthService(
         return authentication.authorities.any {
             val payload = it.toString().split(":")
             payload.size == 2 && payload[0] == name && payload[1].split("-").any { p ->
-                p == permission.trim().uppercase(
-                    Locale.getDefault()
-                )
+                p == permission.trim().uppercase(Locale.getDefault())
             }
         }
     }

diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/service/RoleService.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/service/RoleService.kt
@@ -73,6 +73,16 @@ class RoleService(
         if (validator.validateProperty(generation, "roles").isNotEmpty()) {
             throw IllegalArgumentException(ErrorMessages.roleAlreadyExists(role.name, generation.schoolYear))
         }
+
+        for (perActivityRoleDto in dto.associatedActivities) {
+            val activity = activityService.getActivityById(perActivityRoleDto.activityId!!)
+
+            for(perActivityRole in role.associatedActivities) {
+                perActivityRole.role = role
+                perActivityRole.activity = activity
+            }
+        }
+
         role.generation = generation
         roleRepository.save(role)
         return role