Delete user information (#2384)

* Deleted user information
saveourtool · Jul 31, 2023 · 0bec476 · 0bec476
1 parent 130576c
commit 0bec476
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git a/.../src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserOrganizationRepository.kt b/.../src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserOrganizationRepository.kt
@@ -80,4 +80,9 @@ interface LnkUserOrganizationRepository : BaseEntityRepository<LnkUserOrganizati
      * @return List of [LnkUserOrganization] in which user with [userName] participates
      */
     fun findByUserName(userName: String): List<LnkUserOrganization>
+
+    /**
+     * @param userId id of user
+     */
+    fun deleteByUserId(userId: Long)
 }
diff --git a/...ckend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserProjectRepository.kt b/...ckend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserProjectRepository.kt
@@ -60,4 +60,9 @@ interface LnkUserProjectRepository : BaseEntityRepository<LnkUserProject> {
         @Param("user_id") userId: Long,
         @Param("role") role: String
     )
+
+    /**
+     * @param userId id of user
+     */
+    fun deleteByUserId(userId: Long)
 }
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt
@@ -2,8 +2,12 @@ package com.saveourtool.save.backend.service
 
 import com.saveourtool.save.authservice.utils.toSpringUserDetails
 import com.saveourtool.save.authservice.utils.userId
+import com.saveourtool.save.backend.repository.LnkUserOrganizationRepository
+import com.saveourtool.save.backend.repository.LnkUserProjectRepository
 import com.saveourtool.save.backend.repository.OriginalLoginRepository
 import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.storage.AvatarKey
+import com.saveourtool.save.backend.storage.AvatarStorage
 import com.saveourtool.save.domain.Role
 import com.saveourtool.save.domain.UserSaveStatus
 import com.saveourtool.save.entities.OriginalLogin
@@ -26,6 +30,9 @@ import java.util.*
 class UserDetailsService(
     private val userRepository: UserRepository,
     private val originalLoginRepository: OriginalLoginRepository,
+    private val lnkUserOrganizationRepository: LnkUserOrganizationRepository,
+    private val lnkUserProjectRepository: LnkUserProjectRepository,
+    private val avatarStorage: AvatarStorage,
 ) {
     /**
      * @param username
@@ -147,12 +154,26 @@ class UserDetailsService(
                 this.name = newName
                 this.status = UserStatus.DELETED
                 this.avatar = null
+                this.company = null
+                this.twitter = null
+                this.email = null
+                this.gitHub = null
+                this.linkedin = null
+                this.location = null
             })
         } else {
             return UserSaveStatus.CONFLICT
         }
 
+        val avatarKey = AvatarKey(
+            AvatarType.USER,
+            name,
+        )
+        avatarStorage.delete(avatarKey)
+
         originalLoginRepository.deleteByUserId(user.requiredId())
+        lnkUserProjectRepository.deleteByUserId(user.requiredId())
+        lnkUserOrganizationRepository.deleteByUserId(user.requiredId())
 
         return UserSaveStatus.DELETED
     }

diff --git a/...end/src/test/kotlin/com/saveourtool/save/backend/controller/OrganizationControllerTest.kt b/...end/src/test/kotlin/com/saveourtool/save/backend/controller/OrganizationControllerTest.kt
@@ -9,6 +9,7 @@ import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
 import com.saveourtool.save.backend.service.*
 import com.saveourtool.save.authservice.utils.AuthenticationDetails
 import com.saveourtool.save.backend.S11nTestConfig
+import com.saveourtool.save.backend.storage.AvatarStorage
 import com.saveourtool.save.backend.storage.TestsSourceSnapshotStorage
 import com.saveourtool.save.backend.utils.mutateMockedUser
 import com.saveourtool.save.domain.Role
@@ -80,10 +81,12 @@ import java.util.concurrent.TimeUnit
     MockBean(AgentRepository::class),
     MockBean(ProjectRepository::class),
     MockBean(LnkUserProjectRepository::class),
+    MockBean(LnkUserOrganizationRepository::class),
     MockBean(OriginalLoginRepository::class),
     MockBean(LnkContestProjectService::class),
     MockBean(LnkOrganizationTestSuiteService::class),
     MockBean(LnkExecutionTestSuiteService::class),
+    MockBean(AvatarStorage::class),
 )
 @AutoConfigureWebTestClient
 @Suppress("UnsafeCallOnNullableType")

diff --git a/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/BasicSecurityTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/BasicSecurityTest.kt
@@ -7,6 +7,9 @@ import com.saveourtool.save.backend.repository.OriginalLoginRepository
 import com.saveourtool.save.backend.repository.UserRepository
 import com.saveourtool.save.backend.service.UserDetailsService
 import com.saveourtool.save.authservice.utils.AuthenticationDetails
+import com.saveourtool.save.backend.repository.LnkUserOrganizationRepository
+import com.saveourtool.save.backend.repository.LnkUserProjectRepository
+import com.saveourtool.save.backend.storage.AvatarStorage
 import com.saveourtool.save.entities.User
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
@@ -35,6 +38,9 @@ import org.springframework.test.context.junit.jupiter.SpringExtension
     MockBean(UserRepository::class),
     MockBean(OriginalLoginRepository::class),
     MockBean(NamedParameterJdbcTemplate::class),
+    MockBean(LnkUserProjectRepository::class),
+    MockBean(LnkUserOrganizationRepository::class),
+    MockBean(AvatarStorage::class),
 )
 class BasicSecurityTest {
     @Autowired