Skip to content

Commit db001f4

Browse files
committed
CLAP-150 Fix: merge confliction
1 parent 7cee8a6 commit db001f4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/clap/server/adapter/inbound/web/dto/common/SliceResponse.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
public record SliceResponse<T> (
77
List<T> content,
8-
int currentPage,
9-
int size,
8+
boolean hasNext,
109
boolean isFirst,
1110
boolean isLast
1211
) {

src/main/java/clap/server/application/mapper/NotificationMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ public static FindNotificationListResponse toFindNoticeListResponse(Notification
2323
public static SliceResponse<FindNotificationListResponse> toSliceOfFindNoticeListResponse(Slice<FindNotificationListResponse> slice) {
2424
return new SliceResponse<>(
2525
slice.getContent(),
26-
slice.getNumber(),
27-
slice.getSize(),
26+
slice.hasNext(),
2827
slice.isFirst(),
2928
slice.isLast()
3029
);

src/main/resources/application.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ server:
4141

4242
web:
4343
domain:
44-
local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:3O00}
45-
service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:3000}
44+
local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
45+
service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
4646

4747

4848
# 카카오워크 및 agit url, accessKey값 환경 변수로 설정
@@ -53,6 +53,8 @@ kakaowork:
5353
agit:
5454
url: https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
5555

56+
local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
57+
service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
5658

5759
#logging:
5860
# level:

0 commit comments

Comments
 (0)