Add set user role when setting group via mapping

Author: Isti01

backend/src/main/kotlin/hu/bme/sch/cmsch/component/login/LoginService.kt

@@ -4,14 +4,12 @@ import hu.bme.sch.cmsch.component.SettingProxy
 import hu.bme.sch.cmsch.component.login.authsch.ProfileResponse
 import hu.bme.sch.cmsch.component.login.google.GoogleUserInfoResponse
 import hu.bme.sch.cmsch.component.login.keycloak.KeycloakUserInfoResponse
+import hu.bme.sch.cmsch.component.team.TeamService
 import hu.bme.sch.cmsch.config.AUTHSCH
 import hu.bme.sch.cmsch.config.GOOGLE
 import hu.bme.sch.cmsch.config.KEYCLOAK
 import hu.bme.sch.cmsch.config.StartupPropertyConfig
-import hu.bme.sch.cmsch.model.GuildType
-import hu.bme.sch.cmsch.model.MajorType
-import hu.bme.sch.cmsch.model.RoleType
-import hu.bme.sch.cmsch.model.UserEntity
+import hu.bme.sch.cmsch.model.*
 import hu.bme.sch.cmsch.repository.GroupRepository
 import hu.bme.sch.cmsch.repository.GroupToUserMappingRepository
 import hu.bme.sch.cmsch.repository.GuildToUserMappingRepository
@@ -23,6 +21,7 @@ import hu.bme.sch.cmsch.util.transaction
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import org.springframework.transaction.PlatformTransactionManager
+import java.util.*
 
 @Service
 open class LoginService(
@@ -36,7 +35,8 @@ open class LoginService(
     private val unitScopeComponent: UnitScopeComponent,
     private val startupPropertyConfig: StartupPropertyConfig,
     private val adminMenuService: AdminMenuService,
-    private val transactionManager: PlatformTransactionManager
+    private val transactionManager: PlatformTransactionManager,
+    private val teamService: Optional<TeamService>
 ) {
 
     private val log = LoggerFactory.getLogger(javaClass)
@@ -266,8 +266,7 @@ open class LoginService(
         if (user.neptun.isNotBlank()) {
             groupToUserMapping.findByNeptun(user.neptun).ifPresent {
                 user.major = it.major
-                user.groupName = it.groupName
-                user.group = groups.findByName(it.groupName).orElse(null)
+                addUserToGroup(user, it)
                 user.detailsImported = true
                 alreadySetGroupAndGuild = true
             }
@@ -276,13 +275,22 @@ open class LoginService(
         if (user.email.isNotBlank() && !alreadySetGroupAndGuild) {
             groupToUserMapping.findByEmailIgnoreCase(user.email).ifPresent {
                 user.major = it.major
-                user.groupName = it.groupName
-                user.group = groups.findByName(it.groupName).orElse(null)
+                addUserToGroup(user, it)
                 user.detailsImported = true
             }
         }
     }
 
+    private fun addUserToGroup(user: UserEntity, groupMapping: GroupToUserMappingEntity) {
+        val group = groups.findByName(groupMapping.groupName)
+        if (teamService.isPresent && group.isPresent) {
+            teamService.get().addUserToGroup(user, group.get())
+        } else {
+            user.groupName = groupMapping.groupName
+            user.group = group.orElse(null)
+        }
+    }
+
     private fun processUnitScopeStatus(
         user: UserEntity,
         grantRoleAttendee: SettingProxy,

backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamService.kt

@@ -381,21 +381,25 @@ open class TeamService(
 
         if (teamJoinRequestRepository.existsByUserIdAndGroupId(userId, group.id)) {
             val user = userRepository.findById(userId).orElse(null) ?: return false
-            user.groupName = group.name
-            user.group = group
-            if (teamComponent.grantAttendeeRole.isValueTrue() && user.role.value <= RoleType.ATTENDEE.value) {
-                log.info("User '{}' accepted for group '{}' (ATTENDEE granted)", user.fullName, group.name)
-                user.role = RoleType.ATTENDEE
-            } else {
-                log.info("User '{}' accepted for group '{}' (ATTENDEE not granted)", user.fullName, group.name)
-            }
+            addUserToGroup(user, group)
             userRepository.save(user)
             teamJoinRequestRepository.deleteAllByUserId(userId)
             return true
         }
         return false
     }
 
+    fun addUserToGroup(user: UserEntity, group: GroupEntity) {
+        user.groupName = group.name
+        user.group = group
+        if (teamComponent.grantAttendeeRole.isValueTrue() && user.role.value <= RoleType.ATTENDEE.value) {
+            log.info("User '{}' accepted for group '{}' (ATTENDEE granted)", user.fullName, group.name)
+            user.role = RoleType.ATTENDEE
+        } else {
+            log.info("User '{}' accepted for group '{}' (ATTENDEE not granted)", user.fullName, group.name)
+        }
+    }
+
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE)
     open fun rejectJoin(userId: Int, groupId: Int?, groupName: String): Boolean {