Skip to content

Commit 1c1d4e4

Browse files
authored
Merge pull request #47 from CHA-CALL/fix/#46-change-paging-request
[FIX] CursorPagingRequest 디폴트값 주입 로직 수정
2 parents e238553 + 178a5de commit 1c1d4e4

4 files changed

Lines changed: 14 additions & 5 deletions

File tree

src/main/java/konkuk/chacall/domain/member/application/MemberService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public CursorPagingResponse<SavedFoodTruckResponse> getSavedFoodTrucks(CursorPag
3838
// 멤버 유효성 검사 및 조회
3939
User member = memberValidator.validateAndGetMember(memberId);
4040

41-
return savedFoodTruckService.getSavedFoodTrucks(cursorPagingRequest, member);
41+
CursorPagingRequest request = cursorPagingRequest.pagingOrDefault(SortType.NEWEST);
42+
return savedFoodTruckService.getSavedFoodTrucks(request, member);
4243
}
4344

4445
@Transactional

src/main/java/konkuk/chacall/domain/owner/application/OwnerService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ public CursorPagingResponse<MyFoodTruckResponse> getMyFoodTrucks(CursorPagingReq
126126
ownerValidator.validateAndGetOwner(ownerId);
127127

128128
// 사장님 - 나의 푸드트럭 목록 조회 로직 호출
129-
return myFoodTruckService.getMyFoodTrucks(request, ownerId);
129+
CursorPagingRequest cursorPagingRequest = request.pagingOrDefault(SortType.NEWEST);
130+
return myFoodTruckService.getMyFoodTrucks(cursorPagingRequest, ownerId);
130131
}
131132

132133
@Transactional

src/main/java/konkuk/chacall/global/common/dto/CursorPagingRequest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,10 @@ public record CursorPagingRequest(
1515
minimum = "1")
1616
@Min(value = 1, message = "size 는 1 이상이어야 합니다.")
1717
Integer size
18-
) {
18+
) implements HasPaging {
19+
20+
@Override
21+
public CursorPagingRequest cursorPagingRequest() {
22+
return this;
23+
}
1924
}

src/main/java/konkuk/chacall/global/common/dto/HasPaging.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ default CursorPagingRequest pagingOrDefault(SortType sort) {
1313
}
1414

1515
if (req.cursor() == null) {
16+
int size = (req.size() == null) ? 20 : req.size();
17+
1618
return (sort == SortType.OLDEST)
17-
? new CursorPagingRequest(0L, req.size())
18-
: new CursorPagingRequest(Long.MAX_VALUE, req.size());
19+
? new CursorPagingRequest(0L, size)
20+
: new CursorPagingRequest(Long.MAX_VALUE, size);
1921
}
2022

2123
if (req.size() == null) {

0 commit comments

Comments
 (0)