From 0f83486593b0bebd08578a191328f12c2be2e360 Mon Sep 17 00:00:00 2001
From: Mikhail Yasnov <yasnov.mi@gmail.com>
Date: Tue, 8 Feb 2022 18:40:46 +0300
Subject: [PATCH] Fix saving user scopes (#66)

---
 .../kotlin/ru/touchin/auth/core/scope/models/ScopeEntity.kt  | 1 -
 .../kotlin/ru/touchin/auth/core/user/models/UserEntity.kt    | 1 -
 .../auth/core/user/services/UserCoreServiceImplSlowTest.kt   | 5 ++++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/scope/models/ScopeEntity.kt b/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/scope/models/ScopeEntity.kt
index 24f6c80..527373a 100644
--- a/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/scope/models/ScopeEntity.kt
+++ b/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/scope/models/ScopeEntity.kt
@@ -28,7 +28,6 @@ class ScopeEntity : BaseEntity() {
 
     fun addUsers(users: Collection<UserEntity>) {
         this.users.addAll(users)
-        users.forEach { it.scopes.add(this) }
     }
 
 }
diff --git a/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/user/models/UserEntity.kt b/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/user/models/UserEntity.kt
index b3e424f..969c059 100644
--- a/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/user/models/UserEntity.kt
+++ b/security-authorization-server-core/src/main/kotlin/ru/touchin/auth/core/user/models/UserEntity.kt
@@ -39,7 +39,6 @@ class UserEntity : AuditableUuidIdEntity() {
 
     fun addScopes(scopes: Collection<ScopeEntity>) {
         this.scopes.addAll(scopes)
-        scopes.forEach { it.users.add(this) }
     }
 
 }
diff --git a/security-authorization-server-core/src/test/kotlin/ru/touchin/auth/core/user/services/UserCoreServiceImplSlowTest.kt b/security-authorization-server-core/src/test/kotlin/ru/touchin/auth/core/user/services/UserCoreServiceImplSlowTest.kt
index 176b449..df5f341 100644
--- a/security-authorization-server-core/src/test/kotlin/ru/touchin/auth/core/user/services/UserCoreServiceImplSlowTest.kt
+++ b/security-authorization-server-core/src/test/kotlin/ru/touchin/auth/core/user/services/UserCoreServiceImplSlowTest.kt
@@ -398,7 +398,10 @@ internal class UserCoreServiceImplSlowTest {
                 userId = regUser.id,
                 scopes = newScopes
             )
-        )
+        ).also {
+            entityManager.flush()
+            entityManager.clear()
+        }
 
         val actualUser = userRepository.findByIdOrThrow(regUser.id)