From 319371798e27850be8282dd9eef3361049025fba Mon Sep 17 00:00:00 2001 From: Kimhannah Date: Thu, 11 Jan 2024 10:19:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20fix:=20=ED=86=A0=EB=84=88=EB=A8=BC?= =?UTF-8?q?=ED=8A=B8=20=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/tournament/controller/TournamentController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gg/server/domain/tournament/controller/TournamentController.java b/src/main/java/com/gg/server/domain/tournament/controller/TournamentController.java index c670119e9..42859da36 100644 --- a/src/main/java/com/gg/server/domain/tournament/controller/TournamentController.java +++ b/src/main/java/com/gg/server/domain/tournament/controller/TournamentController.java @@ -35,7 +35,7 @@ public class TournamentController { */ @GetMapping public ResponseEntity getAllTournamentList(@ModelAttribute @Valid TournamentFilterRequestDto tournamentFilterRequestDto){ - Pageable pageRequest = PageRequest.of(tournamentFilterRequestDto.getPage() - 1, tournamentFilterRequestDto.getSize(), Sort.by("startTime").descending()); + Pageable pageRequest = PageRequest.of(tournamentFilterRequestDto.getPage() - 1, tournamentFilterRequestDto.getSize(), Sort.by("startTime").ascending()); return ResponseEntity.status(HttpStatus.OK). body(tournamentService.getAllTournamentList(pageRequest, tournamentFilterRequestDto.getType(), tournamentFilterRequestDto.getStatus())); } From c99110cc6631493e218c198c053e9a1ed809b6b1 Mon Sep 17 00:00:00 2001 From: hannkim Date: Thu, 11 Jan 2024 10:35:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20[Fix]=20=ED=86=A0=EB=84=88=EB=A8=BC?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#503)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tournament/controller/TournamentFindControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/gg/server/domain/tournament/controller/TournamentFindControllerTest.java b/src/test/java/com/gg/server/domain/tournament/controller/TournamentFindControllerTest.java index 45cbf8325..a8fabcfd7 100644 --- a/src/test/java/com/gg/server/domain/tournament/controller/TournamentFindControllerTest.java +++ b/src/test/java/com/gg/server/domain/tournament/controller/TournamentFindControllerTest.java @@ -102,7 +102,7 @@ public void getTournamentList() throws Exception { assertThat(tournamentInfoList.get(i).getPlayerCnt()).isEqualTo(tournamentResponseDto.getPlayerCnt()); } if (i > 0) - assertThat(tournamentInfoList.get(i).getStartTime()).isBefore(tournamentInfoList.get(i - 1).getEndTime()); + assertThat(tournamentInfoList.get(i).getStartTime()).isAfter(tournamentInfoList.get(i - 1).getEndTime()); } }