Merge branch 'develop_back_core' into feat/friend_tag-B-#452

tukcomCD2024 · May 29, 2024 · 1824c1a · 1824c1a
2 parents 7a767b0 + 8b3b09f
commit 1824c1a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/...core/src/main/java/site/timecapsulearchive/core/domain/group/data/dto/GroupDetailDto.java b/...core/src/main/java/site/timecapsulearchive/core/domain/group/data/dto/GroupDetailDto.java
@@ -11,4 +11,14 @@ public record GroupDetailDto(
     List<GroupMemberDto> members
 ) {
 
+    public static GroupDetailDto as(
+        String groupName,
+        String groupDescription,
+        String groupProfileUrl,
+        ZonedDateTime createdAt,
+        List<GroupMemberDto> members
+    ) {
+        return new GroupDetailDto(groupName, groupDescription, groupProfileUrl, createdAt, members);
+    }
+
 }
diff --git a/...n/java/site/timecapsulearchive/core/domain/group/repository/GroupQueryRepositoryImpl.java b/...n/java/site/timecapsulearchive/core/domain/group/repository/GroupQueryRepositoryImpl.java
@@ -10,6 +10,7 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -59,12 +60,11 @@ public Slice<GroupSummaryDto> findGroupsSlice(
 
     public Optional<GroupDetailDto> findGroupDetailByGroupIdAndMemberId(final Long groupId,
         final Long memberId) {
-        return Optional.ofNullable(
+        GroupDetailDto groupDetailDtoIncludeMe =
             jpaQueryFactory
                 .selectFrom(group)
                 .join(memberGroup).on(memberGroup.group.id.eq(groupId))
                 .join(member).on(member.id.eq(memberGroup.member.id))
-                .where(member.id.ne(memberId))
                 .transform(
                     groupBy(group.id).as(
                         Projections.constructor(
@@ -86,7 +86,23 @@ public Optional<GroupDetailDto> findGroupDetailByGroupIdAndMemberId(final Long g
                         )
                     )
                 )
-                .get(groupId)
+                .get(groupId);
+
+        if (Objects.isNull(groupDetailDtoIncludeMe)) {
+            return Optional.empty();
+        }
+
+        List<GroupMemberDto> groupMemberDtosExcludeMe = groupDetailDtoIncludeMe.members().stream()
+            .filter(memberDto -> !memberDto.memberId().equals(memberId))
+            .toList();
+
+        return Optional.of(
+            GroupDetailDto.as(
+                groupDetailDtoIncludeMe.groupName(),
+                groupDetailDtoIncludeMe.groupDescription(),
+                groupDetailDtoIncludeMe.groupProfileUrl(),
+                groupDetailDtoIncludeMe.createdAt(),
+                groupMemberDtosExcludeMe)
         );
     }
 

diff --git a/.../main/java/site/timecapsulearchive/core/domain/group/service/query/GroupQueryService.java b/.../main/java/site/timecapsulearchive/core/domain/group/service/query/GroupQueryService.java
@@ -40,8 +40,7 @@ public Slice<GroupSummaryDto> findGroupsSlice(
 
     public GroupDetailTotalDto findGroupDetailByGroupId(final Long memberId, final Long groupId) {
         final GroupDetailDto groupDetailDto = groupRepository.findGroupDetailByGroupIdAndMemberId(
-            groupId,
-            memberId).orElseThrow(GroupNotFoundException::new);
+            groupId, memberId).orElseThrow(GroupNotFoundException::new);
 
         final Long groupCapsuleCount = groupCapsuleQueryRepository.findGroupCapsuleCount(groupId);
         final Boolean canGroupEdit = groupRepository.findGroupEditPermission(groupId, memberId);