ONB-240 chore: Group Delete 검증 제거

Author: comforest

adapter-in/web/src/main/kotlin/com/yapp/bol/group/GroupController.kt

@@ -17,6 +17,7 @@ import com.yapp.bol.group.dto.toCreateGroupResponse
 import com.yapp.bol.group.dto.toDto
 import com.yapp.bol.group.dto.toListResponse
 import com.yapp.bol.group.dto.toResponse
+import com.yapp.bol.group.member.MemberValidator
 import com.yapp.bol.pagination.offset.PaginationOffsetResponse
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.DeleteMapping
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController
 class GroupController(
     private val groupService: GroupService,
     private val fileService: FileService,
+    private val memberValidator: MemberValidator,
 ) {
     @GetMapping("/default-image")
     fun getDefaultImage(): FileResponse {
@@ -99,8 +101,8 @@ class GroupController(
     ): EmptyResponse {
         val userId = getSecurityUserIdOrThrow()
 
-        groupService.deleteGroup(userId, groupId)
-
+        memberValidator.requiredGroupOwner(groupId, userId)
+        groupService.deleteGroup(groupId)
         return EmptyResponse
     }
 }

adapter-in/web/src/main/kotlin/com/yapp/bol/group/member/MemberValidator.kt

@@ -0,0 +1,17 @@
+package com.yapp.bol.group.member
+
+import com.yapp.bol.NoPermissionException
+import com.yapp.bol.auth.UserId
+import com.yapp.bol.group.GroupId
+import org.springframework.stereotype.Component
+
+@Component
+class MemberValidator(
+    private val memberService: MemberService,
+) {
+    fun requiredGroupOwner(groupId: GroupId, userId: UserId) {
+        val member = memberService.findMemberByGroupIdAndUserId(groupId, userId)
+
+        if (member == null || member.isOwner().not()) throw NoPermissionException
+    }
+}

adapter-in/web/src/test/kotlin/com/yapp/bol/group/GroupControllerTest.kt

@@ -1,6 +1,6 @@
 package com.yapp.bol.group
 
-import com.yapp.bol.NoPermissionDeleteGroupException
+import com.yapp.bol.NoPermissionException
 import com.yapp.bol.auth.UserId
 import com.yapp.bol.auth.authorizationHeader
 import com.yapp.bol.base.ARRAY
@@ -22,15 +22,20 @@ import com.yapp.bol.group.member.HostMember
 import com.yapp.bol.group.member.MemberId
 import com.yapp.bol.group.member.MemberList
 import com.yapp.bol.group.member.MemberRole
+import com.yapp.bol.group.member.MemberValidator
 import com.yapp.bol.group.member.OwnerMember
 import com.yapp.bol.pagination.offset.PaginationOffsetResponse
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.spyk
+import org.springframework.boot.test.context.SpringBootTest
 
+@SpringBootTest
 class GroupControllerTest : WebControllerTest() {
     private val groupService: GroupService = mockk()
     private val fileService: FileService = mockk()
-    override val controller = GroupController(groupService, fileService)
+    private val memberValidator: MemberValidator = mockk()
+    override val controller = spyk(GroupController(groupService, fileService, memberValidator))
 
     init {
         test("그룹 기본 이미지 가져오기") {
@@ -269,12 +274,12 @@ class GroupControllerTest : WebControllerTest() {
         }
 
         context("그룹 삭제") {
+            val groupId = GroupId(123L)
+            val userId = UserId(321L)
 
             test("성공") {
-                val groupId = GroupId(123L)
-                val userId = UserId(321L)
-
-                every { groupService.deleteGroup(userId, groupId) } returns Unit
+                every { memberValidator.requiredGroupOwner(groupId, userId) } returns Unit
+                every { groupService.deleteGroup(groupId) } returns Unit
 
                 delete("/api/v1/group/{groupId}", arrayOf(groupId.value)) {
                     authorizationHeader(userId)
@@ -293,15 +298,12 @@ class GroupControllerTest : WebControllerTest() {
             }
 
             test("오너가 아닌 사람") {
-                val groupId = GroupId(123L)
-                val userId = UserId(321L)
-
-                every { groupService.deleteGroup(userId, groupId) } throws NoPermissionDeleteGroupException
+                every { memberValidator.requiredGroupOwner(groupId, userId) } throws NoPermissionException
 
                 delete("/api/v1/group/{groupId}", arrayOf(groupId.value)) {
                     authorizationHeader(userId)
                 }
-                    .isStatus(400)
+                    .isStatus(403)
                     .makeDocument(
                         DocumentInfo(
                             identifier = "group/{method-name}",

core/src/main/kotlin/com/yapp/bol/group/GroupServiceImpl.kt

@@ -3,7 +3,6 @@ package com.yapp.bol.group
 import com.yapp.bol.AccessCodeNotMatchException
 import com.yapp.bol.AlreadyExistMemberException
 import com.yapp.bol.InvalidRequestException
-import com.yapp.bol.NoPermissionDeleteGroupException
 import com.yapp.bol.NotFoundFileException
 import com.yapp.bol.NotFoundGroupException
 import com.yapp.bol.NotFoundMemberException
@@ -166,13 +165,7 @@ internal class GroupServiceImpl(
     }
 
     @MyTransactional
-    override fun deleteGroup(userId: UserId, groupId: GroupId) {
-        val member = memberQueryRepository.findByGroupIdAndUserId(groupId, userId) ?: throw NoPermissionDeleteGroupException
-
-        if (member.isOwner().not()) {
-            throw NoPermissionDeleteGroupException
-        }
-
+    override fun deleteGroup(groupId: GroupId) {
         memberCommandRepository.deleteAllMember(groupId)
         groupCommandRepository.deleteGroup(groupId)
     }

domain/src/main/kotlin/com/yapp/bol/Exception.kt

@@ -45,7 +45,6 @@ object InvalidGroupOrganizationException :
 object NotFoundGroupException : GroupException("Group004", "그룹을 찾을 수 없습니다.")
 object AccessCodeNotMatchException : GroupException("Group005", "참여 코드가 올바르지 않습니다.")
 object InvalidGuestIdException : GroupException("Group006", "게스트 ID가 올바르지 않습니다.")
-object NoPermissionDeleteGroupException : GroupException("Group007", "그룹을 삭제 할 수 있는 권한이 없습니다.")
 
 sealed class MemberException(code: String, status: Int, message: String, cause: Throwable? = null) :
     BolRatingException(code = code, status = status, message = message, cause = cause)
@@ -72,3 +71,4 @@ object UnknownException : BolRatingException("BOL000", 500, "알 수 없는 에
 class InvalidRequestException(msg: String = "유효하지 않은 요청입니다.") : BolRatingException("BOL001", 400, msg)
 class InvalidNicknameException(val nickname: String?) : BolRatingException("BOL002", 400, "$nickname 닉네임이 잘못되었습니다.")
 object InvalidDateTimeException : BolRatingException("BOL003", 400, "날짜 값이 잘못됐습니다.")
+object NoPermissionException : BolRatingException("BOL003", 403, "권한이 없습니다.")

port-in/src/main/kotlin/com/yapp/bol/group/GroupService.kt

@@ -38,6 +38,6 @@ interface GroupService {
 
     fun isRegisterGroup(userId: UserId, groupId: GroupId): Boolean
 
-    fun deleteGroup(userId: UserId, groupId: GroupId)
+    fun deleteGroup(groupId: GroupId)
     fun getGroupWithMemberInfo(userId: UserId): List<GroupWithMemberDto>
 }