fix : 그룹 캡슐 조회 수정

- 사용자가 속한 그룹 캡슐도 나오도록 수정
tukcomCD2024 · Jun 19, 2024 · c92e952 · c92e952
1 parent 05805be
commit c92e952
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/...ve/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepositoryImpl.java b/...ve/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepositoryImpl.java
@@ -3,11 +3,13 @@
 import static site.timecapsulearchive.core.domain.capsule.entity.QCapsule.capsule;
 import static site.timecapsulearchive.core.domain.capsuleskin.entity.QCapsuleSkin.capsuleSkin;
 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.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.ComparablePath;
 import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import java.util.Optional;
@@ -19,6 +21,7 @@
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyARCapsuleSummaryDto;
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyCapsuleSummaryDto;
 import site.timecapsulearchive.core.domain.capsule.treasure_capsule.data.dto.TreasureCapsuleSummaryDto;
+import site.timecapsulearchive.core.domain.member_group.entity.MemberGroup;
 
 @Repository
 @RequiredArgsConstructor
@@ -41,6 +44,14 @@ public List<NearbyARCapsuleSummaryDto> findARCapsuleSummaryDtosByCurrentLocation
         final Polygon mbr,
         final CapsuleType capsuleType
     ) {
+        List<Long> groupIds = jpaQueryFactory
+            .select(
+                memberGroup.group.id
+            )
+            .from(memberGroup)
+            .where(memberGroup.member.id.eq(memberId))
+            .fetch();
+
         return jpaQueryFactory
             .select(
                 Projections.constructor(
@@ -58,14 +69,15 @@ public List<NearbyARCapsuleSummaryDto> findARCapsuleSummaryDtosByCurrentLocation
             .from(capsule)
             .join(capsule.capsuleSkin, capsuleSkin)
             .join(capsule.member, member)
-            .where(ST_Contains(mbr, capsule.point).and(capsuleFilter(capsuleType, memberId)))
+            .where(ST_Contains(mbr, capsule.point).and(capsuleFilter(capsuleType, memberId, groupIds)))
             .fetch();
     }
 
-    private BooleanExpression capsuleFilter(CapsuleType capsuleType, Long memberId) {
+    private BooleanExpression capsuleFilter(CapsuleType capsuleType, Long memberId, List<Long> groupIds) {
         return switch (capsuleType) {
-            case ALL -> capsule.member.id.eq(memberId);
+            case ALL -> capsule.member.id.eq(memberId).or(capsule.group.id.in(groupIds));
             case TREASURE -> capsule.type.eq(capsuleType);
+            case GROUP -> capsule.type.eq(CapsuleType.GROUP).and(capsule.group.id.in(groupIds));
             default -> capsule.type.eq(capsuleType).and(capsule.member.id.eq(memberId));
         };
     }
@@ -84,6 +96,14 @@ public List<NearbyCapsuleSummaryDto> findCapsuleSummaryDtosByCurrentLocationAndC
         final Polygon mbr,
         final CapsuleType capsuleType
     ) {
+        List<Long> groupIds = jpaQueryFactory
+            .select(
+                memberGroup.group.id
+            )
+            .from(memberGroup)
+            .where(memberGroup.member.id.eq(memberId))
+            .fetch();
+
         return jpaQueryFactory
             .select(
                 Projections.constructor(
@@ -96,7 +116,7 @@ public List<NearbyCapsuleSummaryDto> findCapsuleSummaryDtosByCurrentLocationAndC
             .from(capsule)
             .join(capsule.capsuleSkin, capsuleSkin)
             .join(capsule.member, member)
-            .where(ST_Contains(mbr, capsule.point).and(capsuleFilter(capsuleType, memberId)))
+            .where(ST_Contains(mbr, capsule.point).and(capsuleFilter(capsuleType, memberId, groupIds)))
             .fetch();
     }