feat: get deleted user

Open3r · Aug 1, 2024 · e240efc · e240efc
1 parent 173dab6
commit e240efc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/src/main/kotlin/com/open3r/openmusic/domain/admin/user/controller/AdminUserController.kt b/src/main/kotlin/com/open3r/openmusic/domain/admin/user/controller/AdminUserController.kt
@@ -18,6 +18,11 @@ class AdminUserController(
     @PreAuthorize("hasRole('ADMIN')")
     fun getUsers() = BaseResponse(adminUserService.getUsers(), 200).toEntity()
 
+    @Operation(summary = "삭제된 유저 목록")
+    @GetMapping("/deleted")
+    @PreAuthorize("hasRole('ADMIN')")
+    fun getDeletedUsers() = BaseResponse(adminUserService.getDeletedUsers(), 200).toEntity()
+
     @Operation(summary = "유저 삭제")
     @DeleteMapping("/{userId}")
     @PreAuthorize("hasRole('ADMIN')")

diff --git a/src/main/kotlin/com/open3r/openmusic/domain/admin/user/service/AdminUserService.kt b/src/main/kotlin/com/open3r/openmusic/domain/admin/user/service/AdminUserService.kt
@@ -4,5 +4,6 @@ import com.open3r.openmusic.domain.user.dto.response.UserResponse
 
 interface AdminUserService {
     fun getUsers(): List<UserResponse>
+    fun getDeletedUsers(): List<UserResponse>
     fun deleteUser(userId: Long)
 }
diff --git a/src/main/kotlin/com/open3r/openmusic/domain/admin/user/service/impl/AdminUserServiceImpl.kt b/src/main/kotlin/com/open3r/openmusic/domain/admin/user/service/impl/AdminUserServiceImpl.kt
@@ -17,7 +17,12 @@ class AdminUserServiceImpl(
     private val userQueryRepository: UserQueryRepository
 ) : AdminUserService {
     @Transactional(readOnly = true)
-    override fun getUsers() = userQueryRepository.findAll().map { UserResponse.of(it) }
+    override fun getUsers() = userQueryRepository.getUsers().map { UserResponse.of(it) }
+
+    @Transactional
+    override fun getDeletedUsers(): List<UserResponse> {
+        return userQueryRepository.getDeletedUsers().map { UserResponse.of(it) }
+    }
 
     @Transactional
     override fun deleteUser(userId: Long) {

diff --git a/src/main/kotlin/com/open3r/openmusic/domain/user/repository/UserQueryRepository.kt b/src/main/kotlin/com/open3r/openmusic/domain/user/repository/UserQueryRepository.kt
@@ -5,6 +5,7 @@ import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 
 interface UserQueryRepository {
-    fun findAll(): List<UserEntity>
+    fun getUsers(): List<UserEntity>
+    fun getDeletedUsers(): List<UserEntity>
     fun searchUsers(keyword: String, pageable: Pageable): Page<UserEntity>
 }
diff --git a/src/main/kotlin/com/open3r/openmusic/domain/user/repository/impl/UserQueryRepositoryImpl.kt b/src/main/kotlin/com/open3r/openmusic/domain/user/repository/impl/UserQueryRepositoryImpl.kt
@@ -17,12 +17,19 @@ class UserQueryRepositoryImpl(
     private val jpaQueryFactory: JPAQueryFactory
 ) : UserQueryRepository {
     @Transactional
-    override fun findAll(): List<UserEntity> {
+    override fun getUsers(): List<UserEntity> {
         return jpaQueryFactory.selectFrom(userEntity)
             .where(userEntity.status.eq(UserStatus.ACTIVE))
             .fetch()
     }
 
+    @Transactional
+    override fun getDeletedUsers(): List<UserEntity> {
+        return jpaQueryFactory.selectFrom(userEntity)
+            .where(userEntity.status.eq(UserStatus.DELETED))
+            .fetch()
+    }
+
     @Transactional
     override fun searchUsers(keyword: String, pageable: Pageable): Page<UserEntity> {
         val count = jpaQueryFactory.select(userEntity.count())