From 2a36c86e023e8814dd20e055b22c9fbdca62f5b0 Mon Sep 17 00:00:00 2001 From: hysong4u Date: Fri, 1 Mar 2024 00:27:16 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[feat]=20#122=20tournament=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/sweet/domain/gift/controller/GiftController.java | 6 ++++++ .../org/sopt/sweet/domain/gift/service/GiftService.java | 8 ++++++++ src/main/java/org/sopt/sweet/domain/room/entity/Room.java | 3 +++ 3 files changed, 17 insertions(+) diff --git a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java index e614dd1..5dfe416 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java +++ b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java @@ -89,6 +89,12 @@ public ResponseEntity> getRanking(@PathVariable Long roomId) return SuccessResponse.ok(ranking); } + @PostMapping("/tournament/end/{roomId}") + public ResponseEntity> endTournament(@UserId Long userId, @PathVariable Long roomId) { + giftService.endTournament(roomId); + return SuccessResponse.created(null); + } + diff --git a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java b/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java index 1115fa0..b7844cc 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java +++ b/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java @@ -312,4 +312,12 @@ public String getGifteeName(Long roomId) { return gifteeName; } + public void endTournament(Long roomId) { + Room room = findRoomByIdOrThrow(roomId); + TournamentDuration tournamentDuration = room.getTournamentDuration(); + LocalDateTime newStartDate = LocalDateTime.now().minusHours(tournamentDuration.getHours()); + room.setTournamentStartDate(newStartDate); + + } + } \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/domain/room/entity/Room.java b/src/main/java/org/sopt/sweet/domain/room/entity/Room.java index 2d7f52a..91895ef 100644 --- a/src/main/java/org/sopt/sweet/domain/room/entity/Room.java +++ b/src/main/java/org/sopt/sweet/domain/room/entity/Room.java @@ -69,4 +69,7 @@ public void setImageUrl(String imageUrl) { public void setGifteeName(String gifteeName) { this.gifteeName = gifteeName; } + + public void setTournamentStartDate(LocalDateTime tournamentStartDate) { this.tournamentStartDate = tournamentStartDate; + } } From f8628898b1796e1cac8d61f17fdb20bcb35b6b43 Mon Sep 17 00:00:00 2001 From: hysong4u Date: Fri, 1 Mar 2024 00:38:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20#122=20=EC=97=94=EB=93=9C=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/sweet/domain/gift/controller/GiftController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java index 5dfe416..dfcf467 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java +++ b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java @@ -89,7 +89,7 @@ public ResponseEntity> getRanking(@PathVariable Long roomId) return SuccessResponse.ok(ranking); } - @PostMapping("/tournament/end/{roomId}") + @PostMapping("/tournament-end/{roomId}") public ResponseEntity> endTournament(@UserId Long userId, @PathVariable Long roomId) { giftService.endTournament(roomId); return SuccessResponse.created(null);