fix : 그룹 초대 조회 및 삭제 로직 수정

- 기존의 조회해서 권한을 확인하는 대신 조회 시 그룹장 아이디 추가
tukcomCD2024 · Jun 6, 2024 · 276cc8f · 276cc8f
1 parent b19ab6e
commit 276cc8f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 40 deletions.
diff --git a/...a/site/timecapsulearchive/core/domain/member_group/api/command/MemberGroupCommandApi.java b/...a/site/timecapsulearchive/core/domain/member_group/api/command/MemberGroupCommandApi.java
@@ -118,11 +118,6 @@ ResponseEntity<ApiSpec<String>> acceptGroupInvitation(
             responseCode = "200",
             description = "처리 완료"
         ),
-        @ApiResponse(
-            responseCode = "403",
-            description = "그룹장이 아닌 경우 예외가 발생한다.",
-            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
-        ),
         @ApiResponse(
             responseCode = "404",
             description = "그룹 초대를 찾을 수 없는 경우 발생한다.",

diff --git a/...re/src/main/java/site/timecapsulearchive/core/domain/member_group/entity/GroupInvite.java b/...re/src/main/java/site/timecapsulearchive/core/domain/member_group/entity/GroupInvite.java
@@ -49,10 +49,4 @@ private GroupInvite(Group group, Member groupOwner, Member groupMember) {
     public static GroupInvite createOf(Group group, Member groupOwner, Member groupMember) {
         return new GroupInvite(group, groupOwner, groupMember);
     }
-
-    public void validateOwner(Long memberId) {
-        if (!groupOwner.getId().equals(memberId)) {
-            throw new NoGroupAuthorityException();
-        }
-    }
 }
diff --git a/...ve/core/domain/member_group/repository/group_invite_repository/GroupInviteRepository.java b/...ve/core/domain/member_group/repository/group_invite_repository/GroupInviteRepository.java
@@ -31,6 +31,6 @@ int deleteGroupInviteByGroupIdAndGroupOwnerIdAndGroupMemberId(
     @Modifying
     void bulkDelete(@Param("groupInviteIds") List<Long> groupInviteIds);
 
-    Optional<GroupInvite> findGroupInviteById(Long groupInviteId);
+    Optional<GroupInvite> findGroupInviteByIdAndGroupOwnerId(Long groupInviteId, Long groupOwnerId);
 }
 
diff --git a/...a/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandService.java b/...a/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandService.java
@@ -108,11 +108,11 @@ private void deleteGroupInvite(final Long memberId, final Long groupId,
 
     @Transactional
     public void deleteGroupInvite(final Long memberId, final Long groupInviteId) {
-        final GroupInvite groupInvite = groupInviteRepository.findGroupInviteById(groupInviteId)
+        final GroupInvite groupInvite = groupInviteRepository.findGroupInviteByIdAndGroupOwnerId(
+                groupInviteId,
+                memberId)
             .orElseThrow(GroupInviteNotFoundException::new);
 
-        groupInvite.validateOwner(memberId);
-
         groupInviteRepository.delete(groupInvite);
     }
 

diff --git a/...te/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandServiceTest.java b/...te/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandServiceTest.java
@@ -311,11 +311,12 @@ class MemberGroupCommandServiceTest {
         Long groupOwnerId = 1L;
         Long groupMemberId = 2L;
         Long groupInviteId = 1L;
-        given(groupInviteRepository.findGroupInviteById(anyLong())).willReturn(
-            GroupInviteFixture.groupInvite(GroupFixture.group(),
+        given(groupInviteRepository.findGroupInviteByIdAndGroupOwnerId(anyLong(),
+            anyLong()))
+            .willReturn(GroupInviteFixture.groupInvite(GroupFixture.group(),
                 MemberFixture.memberWithMemberId(groupOwnerId),
                 MemberFixture.memberWithMemberId(groupMemberId))
-        );
+            );
 
         //when
         groupMemberCommandService.deleteGroupInvite(groupOwnerId, groupInviteId);
@@ -329,35 +330,17 @@ class MemberGroupCommandServiceTest {
         //given
         Long groupOwnerId = 1L;
         Long groupInviteId = 1L;
-        given(groupInviteRepository.findGroupInviteById(anyLong())).willReturn(Optional.empty());
+        given(groupInviteRepository.findGroupInviteByIdAndGroupOwnerId(anyLong(),
+            anyLong())).willReturn(Optional.empty());
 
         //when
         //then
-        assertThatThrownBy(() -> groupMemberCommandService.deleteGroupInvite(groupOwnerId, groupInviteId))
+        assertThatThrownBy(
+            () -> groupMemberCommandService.deleteGroupInvite(groupOwnerId, groupInviteId))
             .isInstanceOf(GroupInviteNotFoundException.class)
             .hasMessageContaining(ErrorCode.GROUP_INVITATION_NOT_FOUND_ERROR.getMessage());
     }
 
-    @Test
-    void 그룹장이_아닌_사람이_그룹_초대를_삭제하면_예외가_발생한다() {
-        //given
-        Long groupOwnerId = 1L;
-        Long groupMemberId = 2L;
-        Long groupInviteId = 1L;
-        given(groupInviteRepository.findGroupInviteById(anyLong())).willReturn(
-            GroupInviteFixture.groupInvite(GroupFixture.group(),
-                MemberFixture.memberWithMemberId(groupOwnerId),
-                MemberFixture.memberWithMemberId(groupMemberId))
-        );
-
-        //when
-        //then
-        assertThatThrownBy(
-            () -> groupMemberCommandService.deleteGroupInvite(groupMemberId, groupInviteId))
-            .isInstanceOf(NoGroupAuthorityException.class)
-            .hasMessageContaining(ErrorCode.NO_GROUP_AUTHORITY_ERROR.getMessage());
-    }
-
     @Test
     void 나_자신을_그룹에서_삭제하려하면_예외가_발생한다() {
         //given