Merge branch 'develop_back_core' into fix/docs-B-core-#621

tukcomCD2024 · Aug 8, 2024 · 0dd69fa · 0dd69fa
2 parents 524f567 + c2fa16e
commit 0dd69fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...ite/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java b/...ite/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
@@ -2,10 +2,13 @@
 
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.Collections;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.locationtech.jts.geom.Point;
 import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import site.timecapsulearchive.core.domain.capsule.data.dto.CapsuleBasicInfoDto;
@@ -199,6 +202,10 @@ public Slice<GroupCapsuleDto> findGroupCapsuleSlice(
     ) {
         final List<Long> groupIds = memberGroupRepository.findGroupIdsByMemberId(memberId);
 
+        if (groupIds.isEmpty()) {
+            return new SliceImpl<>(Collections.emptyList());
+        }
+
         return groupCapsuleQueryRepository.findGroupCapsuleSlice(size, lastCapsuleId,
             groupIds);
     }

diff --git a/backend/core/src/main/resources/config b/backend/core/src/main/resources/config