From 859a6d31eba8c65946030a096e17dea1216cc505 Mon Sep 17 00:00:00 2001 From: Woongbin06 Date: Sat, 27 Apr 2024 01:55:02 +0900 Subject: [PATCH] =?UTF-8?q?refactor(coffeechat)=20:=20=EB=B3=B4=EB=82=B8?= =?UTF-8?q?=20=EB=A9=94=EC=84=B8=EC=A7=80=EC=99=80=20=EA=B1=B0=EC=A0=88=20?= =?UTF-8?q?=EC=82=AC=EC=9C=A0=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/coffeechat/domain/CoffeeChat.java | 12 +++++++----- .../coffeechat/service/CommandCoffeeChatService.java | 2 +- .../service/implementation/CoffeeChatUpdater.java | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/main-server/src/main/java/com/sickgyun/server/coffeechat/domain/CoffeeChat.java b/main-server/src/main/java/com/sickgyun/server/coffeechat/domain/CoffeeChat.java index 58098b6..0ca15ec 100644 --- a/main-server/src/main/java/com/sickgyun/server/coffeechat/domain/CoffeeChat.java +++ b/main-server/src/main/java/com/sickgyun/server/coffeechat/domain/CoffeeChat.java @@ -26,7 +26,9 @@ public class CoffeeChat { @Column(name = "coffee_chat_id") private Long id; - private String message; + private String sendMessage; + + private String rejectMessage; @Enumerated(EnumType.STRING) private State state; @@ -39,8 +41,8 @@ public class CoffeeChat { @JoinColumn(name = "from_user_id") private User fromUser; - public CoffeeChat(String message, State state, User fromUser) { - this.message = message; + public CoffeeChat(String sendMessage, State state, User fromUser) { + this.sendMessage = sendMessage; this.state = state; this.fromUser = fromUser; } @@ -49,9 +51,9 @@ public void updateToUser(User toUser) { this.toUser = toUser; } - public void updateState(State state, String message) { + public void reject(State state, String rejectMessage) { this.state = state; - this.message = message; + this.rejectMessage = rejectMessage; } public void updateState(State state) { diff --git a/main-server/src/main/java/com/sickgyun/server/coffeechat/service/CommandCoffeeChatService.java b/main-server/src/main/java/com/sickgyun/server/coffeechat/service/CommandCoffeeChatService.java index e89ac52..eb7d136 100644 --- a/main-server/src/main/java/com/sickgyun/server/coffeechat/service/CommandCoffeeChatService.java +++ b/main-server/src/main/java/com/sickgyun/server/coffeechat/service/CommandCoffeeChatService.java @@ -51,7 +51,7 @@ public void reject(User user, Long coffeeChatId, String message) { CoffeeChat coffeeChat = coffeeChatReader.read(coffeeChatId); coffeeChatValidator.shouldBeSameUser(user, coffeeChat.getToUser()); coffeeChatValidator.shouldBePending(coffeeChat); - coffeeChatUpdater.updateState(coffeeChat, REJECT, message); + coffeeChatUpdater.reject(coffeeChat, REJECT, message); mailService.sendMail(coffeeChat); } diff --git a/main-server/src/main/java/com/sickgyun/server/coffeechat/service/implementation/CoffeeChatUpdater.java b/main-server/src/main/java/com/sickgyun/server/coffeechat/service/implementation/CoffeeChatUpdater.java index b83cd6c..24e6a8d 100644 --- a/main-server/src/main/java/com/sickgyun/server/coffeechat/service/implementation/CoffeeChatUpdater.java +++ b/main-server/src/main/java/com/sickgyun/server/coffeechat/service/implementation/CoffeeChatUpdater.java @@ -11,8 +11,8 @@ @RequiredArgsConstructor public class CoffeeChatUpdater { - public void updateState(CoffeeChat coffeeChat, State state, String message) { - coffeeChat.updateState(state, message); + public void reject(CoffeeChat coffeeChat, State state, String message) { + coffeeChat.reject(state, message); } public void updateState(CoffeeChat coffeeChat, State state) {