diff --git a/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java b/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java index 36e80c4..ab2be80 100644 --- a/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java +++ b/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java @@ -1,7 +1,5 @@ package slvtwn.khu.toyouserver.application; -import static java.lang.Long.MIN_VALUE; - import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; @@ -67,10 +65,9 @@ public RollingPaperResponse findById(Long userId, Long rollingPaperId) { public List findReceivedRollingPapers(Long userId, Long groupId, Long targetId, Integer limit) { - Long currentCursor = targetId != null ? targetId : MIN_VALUE; List memberIds = getMemberIds(userId, groupId); PageRequest pageRequest = PageRequest.ofSize(limit); - return rollingPaperRepository.findAllByMembersAfterCursor(memberIds, currentCursor, pageRequest).stream() + return rollingPaperRepository.findAllByMembersAfterCursor(memberIds, targetId, pageRequest).stream() .map(RollingPaperResponse::from) .toList(); } diff --git a/src/main/java/slvtwn/khu/toyouserver/presentation/RollingPaperController.java b/src/main/java/slvtwn/khu/toyouserver/presentation/RollingPaperController.java index c51f2c4..0479c52 100644 --- a/src/main/java/slvtwn/khu/toyouserver/presentation/RollingPaperController.java +++ b/src/main/java/slvtwn/khu/toyouserver/presentation/RollingPaperController.java @@ -29,7 +29,7 @@ public ToyouResponse findById(@UserAuthentication Long use @GetMapping("/rollingpapers") public ToyouResponse> findReceivedRollingPapers(@UserAuthentication Long userId, - @RequestParam Long groupId, + @RequestParam(required = false) Long groupId, @RequestParam(defaultValue = "0") Long targetId, @RequestParam(defaultValue = "10") int limit) { return ToyouResponse.from(rollingPaperService.findReceivedRollingPapers(userId, groupId, targetId, limit)); diff --git a/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java b/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java index 995f4ea..75e0a97 100644 --- a/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java +++ b/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java @@ -121,7 +121,7 @@ class RollingPaperServiceTest { // when List response = rollingPaperService.findReceivedRollingPapers(user.getId(), group.getId(), - null, 10); + 0L, 10); // then assertThat(response).usingRecursiveComparison() @@ -251,7 +251,7 @@ class RollingPaperServiceTest { List response = rollingPaperService.findReceivedRollingPapers( user.getId(), group.getId(), - null, 10); + 0L, 10); // then List expectedResponse = List.of(