Merge pull request #497 from tukcomCD2024/fix/group_capsule-B-#495

fix : 그룹 캡슐 API 수정 #495
tukcomCD2024 · Jun 17, 2024 · 05805be · 05805be
2 parents f3d226e + af72aa1
commit 05805be
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 173 deletions.
diff --git a/...n/java/site/timecapsulearchive/core/domain/capsule/group_capsule/api/GroupCapsuleApi.java b/...n/java/site/timecapsulearchive/core/domain/capsule/group_capsule/api/GroupCapsuleApi.java
@@ -20,9 +20,9 @@
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.reqeust.GroupCapsuleUpdateRequest;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleDetailResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleOpenStateResponse;
+import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleMembersResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleSliceResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleSummaryResponse;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupMemberCapsuleOpenStatusListResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.MyGroupCapsuleSliceResponse;
 import site.timecapsulearchive.core.global.common.response.ApiSpec;
 import site.timecapsulearchive.core.global.error.ErrorResponse;
@@ -98,9 +98,6 @@ ResponseEntity<ApiSpec<GroupCapsuleDetailResponse>> getGroupCapsuleDetailByCapsu
     ResponseEntity<ApiSpec<GroupCapsuleSummaryResponse>> getGroupCapsuleSummaryByCapsuleId(
         Long memberId,
 
-        @Parameter(in = ParameterIn.QUERY, description = "그룹 아이디", required = true)
-        Long groupId,
-
         @Parameter(in = ParameterIn.PATH, description = "조회할 캡슐 아이디", required = true)
         Long capsuleId
     );
@@ -159,9 +156,9 @@ ResponseEntity<ApiSpec<MyGroupCapsuleSliceResponse>> getMyGroupCapsules(
     );
 
     @Operation(
-        summary = "그룹원의 그룹 캡슐 개봉 상태 확인",
+        summary = "그룹 캡슐에 대한 그룹원 목록 조회",
         description = """
-            그룹원의 그룹 캡슐 개봉 상태를 확인한다.
+            그룹 캡슐에 대한 그룹원 목록 조회한다.
             """,
         security = {@SecurityRequirement(name = "user_token")},
         tags = {"group capsule"}
@@ -177,7 +174,7 @@ ResponseEntity<ApiSpec<MyGroupCapsuleSliceResponse>> getMyGroupCapsules(
             content = @Content(schema = @Schema(implementation = ErrorResponse.class))
         )
     })
-    ResponseEntity<ApiSpec<GroupMemberCapsuleOpenStatusListResponse>> getGroupCapsuleOpenStatus(
+    ResponseEntity<ApiSpec<GroupCapsuleMembersResponse>> getGroupCapsuleMembers(
         Long memberId,
 
         @Parameter(in = ParameterIn.PATH, description = "개봉 상태를 확인할 캡슐 아이디", required = true)

diff --git a/...e/timecapsulearchive/core/domain/capsule/group_capsule/api/GroupCapsuleApiController.java b/...e/timecapsulearchive/core/domain/capsule/group_capsule/api/GroupCapsuleApiController.java
@@ -17,16 +17,16 @@
 import site.timecapsulearchive.core.domain.capsule.data.dto.CapsuleBasicInfoDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.CombinedGroupCapsuleSummaryDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleDetailDto;
+import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleMemberDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleSliceRequestDto;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupMemberCapsuleOpenStatusDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.reqeust.GroupCapsuleCreateRequest;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.reqeust.GroupCapsuleUpdateRequest;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleDetailResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleOpenStateResponse;
+import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleMembersResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleSliceResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupCapsuleSummaryResponse;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.GroupMemberCapsuleOpenStatusListResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.MyGroupCapsuleSliceResponse;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.facade.GroupCapsuleFacade;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.service.GroupCapsuleService;
@@ -95,12 +95,10 @@ public ResponseEntity<ApiSpec<GroupCapsuleDetailResponse>> getGroupCapsuleDetail
     @Override
     public ResponseEntity<ApiSpec<GroupCapsuleSummaryResponse>> getGroupCapsuleSummaryByCapsuleId(
         @AuthenticationPrincipal Long memberId,
-        @RequestParam("group_id") Long groupId,
         @PathVariable("capsule_id") Long capsuleId
     ) {
         CombinedGroupCapsuleSummaryDto groupCapsuleSummary = groupCapsuleService.findGroupCapsuleSummary(
             memberId,
-            groupId,
             capsuleId
         );
 
@@ -172,18 +170,18 @@ public ResponseEntity<ApiSpec<MyGroupCapsuleSliceResponse>> getMyGroupCapsules(
 
     @GetMapping(value = "/{capsule_id}/open-status", produces = {"application/json"})
     @Override
-    public ResponseEntity<ApiSpec<GroupMemberCapsuleOpenStatusListResponse>> getGroupCapsuleOpenStatus(
+    public ResponseEntity<ApiSpec<GroupCapsuleMembersResponse>> getGroupCapsuleMembers(
         @AuthenticationPrincipal final Long memberId,
         @PathVariable("capsule_id") final Long capsuleId,
         @RequestParam("group_id") final Long groupId
     ) {
-        List<GroupMemberCapsuleOpenStatusDto> groupMemberCapsuleOpenStatus = groupCapsuleService.findGroupMemberCapsuleOpenStatus(
+        List<GroupCapsuleMemberDto> groupCapsuleMembers = groupCapsuleService.findGroupCapsuleMembers(
             memberId, capsuleId, groupId);
 
         return ResponseEntity.ok(
             ApiSpec.success(
                 SuccessCode.SUCCESS,
-                GroupMemberCapsuleOpenStatusListResponse.create(groupMemberCapsuleOpenStatus)
+                GroupCapsuleMembersResponse.create(groupCapsuleMembers)
             )
         );
     }

diff --git a/...learchive/core/domain/capsule/group_capsule/data/dto/GroupMemberCapsuleOpenStatusDto.java b/...learchive/core/domain/capsule/group_capsule/data/dto/GroupMemberCapsuleOpenStatusDto.java
diff --git a/...earchive/core/domain/capsule/group_capsule/data/response/GroupCapsuleMembersResponse.java b/...earchive/core/domain/capsule/group_capsule/data/response/GroupCapsuleMembersResponse.java
@@ -0,0 +1,22 @@
+package site.timecapsulearchive.core.domain.capsule.group_capsule.data.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleMemberDto;
+
+@Schema(description = "그룹 캡슐의 그룹원들 목록 응답")
+public record GroupCapsuleMembersResponse(
+    @Schema(description = "그룹 캡슐의 그룹원들 목록")
+    List<GroupCapsuleMemberResponse> groupCapsuleMembers
+) {
+
+    public static GroupCapsuleMembersResponse create(
+        final List<GroupCapsuleMemberDto> groupCapsuleMembers
+    ) {
+        List<GroupCapsuleMemberResponse> groupCapsuleMemberResponses = groupCapsuleMembers.stream()
+            .map(GroupCapsuleMemberDto::toResponse)
+            .toList();
+
+        return new GroupCapsuleMembersResponse(groupCapsuleMemberResponses);
+    }
+}
diff --git a/...sulearchive/core/domain/capsule/group_capsule/data/response/GroupCapsulePageResponse.java b/...sulearchive/core/domain/capsule/group_capsule/data/response/GroupCapsulePageResponse.java
diff --git a/.../domain/capsule/group_capsule/data/response/GroupMemberCapsuleOpenStatusListResponse.java b/.../domain/capsule/group_capsule/data/response/GroupMemberCapsuleOpenStatusListResponse.java
diff --git a/...core/domain/capsule/group_capsule/data/response/GroupMemberCapsuleOpenStatusResponse.java b/...core/domain/capsule/group_capsule/data/response/GroupMemberCapsuleOpenStatusResponse.java
diff --git a/...archive/core/domain/capsule/group_capsule/repository/GroupCapsuleOpenQueryRepository.java b/...archive/core/domain/capsule/group_capsule/repository/GroupCapsuleOpenQueryRepository.java
@@ -2,6 +2,7 @@
 
 import static site.timecapsulearchive.core.domain.capsule.entity.QGroupCapsuleOpen.groupCapsuleOpen;
 import static site.timecapsulearchive.core.domain.member.entity.QMember.member;
+import static site.timecapsulearchive.core.domain.member_group.entity.QMemberGroup.memberGroup;
 
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -16,8 +17,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import site.timecapsulearchive.core.domain.capsule.entity.Capsule;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupMemberCapsuleOpenStatusDto;
-import site.timecapsulearchive.core.domain.member.entity.QMember;
+import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleMemberDto;
 
 @Repository
 @RequiredArgsConstructor
@@ -59,24 +59,27 @@ public int getBatchSize() {
         );
     }
 
-    public List<GroupMemberCapsuleOpenStatusDto> findGroupMemberCapsuleOpenStatus(
+    public List<GroupCapsuleMemberDto> findGroupCapsuleMembers(
         final Long capsuleId,
         final Long groupId
     ) {
         return jpaQueryFactory
             .select(
                 Projections.constructor(
-                    GroupMemberCapsuleOpenStatusDto.class,
-                    groupCapsuleOpen.member.id,
-                    groupCapsuleOpen.member.nickname,
-                    groupCapsuleOpen.member.profileUrl,
+                    GroupCapsuleMemberDto.class,
+                    member.id,
+                    member.nickname,
+                    member.profileUrl,
+                    memberGroup.isOwner,
                     groupCapsuleOpen.isOpened
                 )
             )
             .from(groupCapsuleOpen)
+            .join(memberGroup).on(groupCapsuleOpen.member.id.eq(memberGroup.member.id))
             .join(groupCapsuleOpen.member, member)
             .where(groupCapsuleOpen.group.id.eq(groupId)
                 .and(groupCapsuleOpen.capsule.id.eq(capsuleId))
+                .and(memberGroup.group.id.eq(groupId))
             )
             .fetch();
     }

diff --git a/...sulearchive/core/domain/capsule/group_capsule/repository/GroupCapsuleQueryRepository.java b/...sulearchive/core/domain/capsule/group_capsule/repository/GroupCapsuleQueryRepository.java
@@ -91,7 +91,6 @@ private StringExpression groupConcatDistinct(final StringExpression expression)
     }
 
     public Optional<GroupCapsuleSummaryDto> findGroupCapsuleSummaryDtoByCapsuleId(
-        final Long groupId,
         final Long capsuleId
     ) {
         return Optional.ofNullable(
@@ -120,7 +119,6 @@ public Optional<GroupCapsuleSummaryDto> findGroupCapsuleSummaryDtoByCapsuleId(
                 .join(capsule.capsuleSkin, capsuleSkin)
                 .join(capsule.group, group)
                 .where(capsule.id.eq(capsuleId)
-                    .and(capsule.group.id.eq(groupId))
                     .and(capsule.type.eq(CapsuleType.GROUP))
                 )
                 .fetchOne()

diff --git a/...ite/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java b/...ite/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
@@ -20,7 +20,6 @@
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleSliceRequestDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleSummaryDto;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupMemberCapsuleOpenStatusDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.repository.GroupCapsuleOpenQueryRepository;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.repository.GroupCapsuleQueryRepository;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
@@ -82,28 +81,25 @@ private boolean capsuleNotOpened(final GroupCapsuleDetailDto detailDto) {
      * 그룹 캡슐의 요약 정보를 조회한다.
      * <br>
      * @param memberId 사용자 아이디
-     * @param groupId 캡슐이 만들어진 그룹 아이디
      * @param capsuleId 조회할 캡슐 아이디
      * @return 그룹 캡슐의 요약 정보(캡슐, 그룹원)
      * @throws NoGroupAuthorityException 그룹에 대한 권한이 존재하지 않으면 예외가 발생한다.
      */
     public CombinedGroupCapsuleSummaryDto findGroupCapsuleSummary(
         final Long memberId,
-        final Long groupId,
         final Long capsuleId
     ) {
+        GroupCapsuleSummaryDto groupCapsuleSummaryDto = groupCapsuleQueryRepository.findGroupCapsuleSummaryDtoByCapsuleId(capsuleId)
+            .orElseThrow(CapsuleNotFondException::new);
+
         List<GroupCapsuleMemberDto> groupCapsuleMembers = memberGroupRepository.findGroupCapsuleMembers(
-            groupId, capsuleId);
+            groupCapsuleSummaryDto.groupId(), capsuleId);
 
         GroupCapsuleMemberDto requestMember = groupCapsuleMembers.stream()
             .filter(dto -> memberId.equals(dto.id()))
             .findAny()
             .orElseThrow(NoGroupAuthorityException::new);
 
-        GroupCapsuleSummaryDto groupCapsuleSummaryDto = groupCapsuleQueryRepository.findGroupCapsuleSummaryDtoByCapsuleId(
-            groupId, capsuleId)
-            .orElseThrow(CapsuleNotFondException::new);
-
         Boolean hasEditPermission = requestMember.id().equals(groupCapsuleSummaryDto.creatorId());
         Boolean hasDeletePermission = hasEditPermission || requestMember.isGroupOwner();
 
@@ -177,14 +173,21 @@ private void checkGroupAuthority(Long memberId, Long groupId) {
         }
     }
 
-    public List<GroupMemberCapsuleOpenStatusDto> findGroupMemberCapsuleOpenStatus(
+    public List<GroupCapsuleMemberDto> findGroupCapsuleMembers(
         final Long memberId,
         final Long capsuleId,
         final Long groupId
     ) {
-        checkGroupAuthority(memberId, groupId);
+        List<GroupCapsuleMemberDto> groupCapsuleMembers = groupCapsuleOpenQueryRepository.findGroupCapsuleMembers(
+            capsuleId, groupId);
+
+        boolean isGroupMember = groupCapsuleMembers.stream()
+            .anyMatch(groupCapsuleMember -> groupCapsuleMember.id().equals(memberId));
+        if (!isGroupMember) {
+            throw new NoGroupAuthorityException();
+        }
 
-        return groupCapsuleOpenQueryRepository.findGroupMemberCapsuleOpenStatus(capsuleId, groupId);
+        return groupCapsuleMembers;
     }
 }
 
diff --git a/...te/timecapsulearchive/core/common/fixture/dto/GroupMemberCapsuleOpenStatusDtoFixture.java b/...te/timecapsulearchive/core/common/fixture/dto/GroupMemberCapsuleOpenStatusDtoFixture.java
diff --git a/...archive/core/domain/capsule/group_capsule/repository/GroupCapsuleQueryRepositoryTest.java b/...archive/core/domain/capsule/group_capsule/repository/GroupCapsuleQueryRepositoryTest.java
@@ -145,7 +145,7 @@ void setup(@Autowired EntityManager entityManager) {
         // given
         //when
         GroupCapsuleSummaryDto capsuleSummaryDto = groupCapsuleQueryRepository.findGroupCapsuleSummaryDtoByCapsuleId(
-            groupId, capsule.getId()).orElseThrow();
+            capsule.getId()).orElseThrow();
 
         //then
         assertSoftly(
@@ -165,7 +165,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //when
         Optional<GroupCapsuleSummaryDto> detailDto = groupCapsuleQueryRepository.findGroupCapsuleSummaryDtoByCapsuleId(
-            notCapsuleId, groupId);
+            notCapsuleId);
         //then
         assertThat(detailDto).isEmpty();
     }