From b4aa65269eebf3d81a1229bb420ca3e31def31dd Mon Sep 17 00:00:00 2001
From: Woongbin06 <kob05314@gmail.com>
Date: Sat, 27 Apr 2024 02:05:26 +0900
Subject: [PATCH] =?UTF-8?q?refactor(coffeechat)=20:=20=EA=B1=B0=EC=A0=88?=
 =?UTF-8?q?=20=EC=8B=9C=20=EA=B1=B0=EC=A0=88=20=EC=82=AC=EC=9C=A0=EB=8F=84?=
 =?UTF-8?q?=20=EB=B0=98=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/coffeechat/presentation/dto/AcceptResponse.java  | 2 +-
 .../presentation/dto/MySentCoffeeChatResponse.java          | 6 ++++--
 .../presentation/dto/ReceivedCoffeeChatResponse.java        | 6 ++++--
 .../src/main/java/com/sickgyun/server/mail/MailService.java | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/AcceptResponse.java b/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/AcceptResponse.java
index d691c76..51487dc 100644
--- a/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/AcceptResponse.java
+++ b/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/AcceptResponse.java
@@ -10,7 +10,7 @@ public record AcceptResponse(
 	public static AcceptResponse from(CoffeeChat accept) {
 		return new AcceptResponse(
 			ContactResponse.from(accept.getFromUser().getContact()),
-			accept.getMessage()
+			accept.getSendMessage()
 		);
 	}
 }
diff --git a/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/MySentCoffeeChatResponse.java b/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/MySentCoffeeChatResponse.java
index 2b8fc1d..3d40ffa 100644
--- a/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/MySentCoffeeChatResponse.java
+++ b/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/MySentCoffeeChatResponse.java
@@ -7,7 +7,8 @@
 public record MySentCoffeeChatResponse(
 	Long id,
 	State state,
-	String message,
+	String sendMessage,
+	String rejectMessage,
 	ContactResponse contact,
 	UserResponse toUser,
 	UserResponse fromUser
@@ -17,7 +18,8 @@ public static MySentCoffeeChatResponse from(CoffeeChat coffeeChat) {
 		return new MySentCoffeeChatResponse(
 			coffeeChat.getId(),
 			coffeeChat.getState(),
-			coffeeChat.getMessage(),
+			coffeeChat.getSendMessage(),
+			coffeeChat.getRejectMessage(),
 			coffeeChat.getState().equals(State.ACCEPT)
 				? ContactResponse.from(coffeeChat.getToUser().getContact()) : null,
 			UserResponse.from(coffeeChat.getToUser()),
diff --git a/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/ReceivedCoffeeChatResponse.java b/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/ReceivedCoffeeChatResponse.java
index 9c5e7c1..3965dc6 100644
--- a/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/ReceivedCoffeeChatResponse.java
+++ b/main-server/src/main/java/com/sickgyun/server/coffeechat/presentation/dto/ReceivedCoffeeChatResponse.java
@@ -9,7 +9,8 @@ public record ReceivedCoffeeChatResponse(
 	State state,
 	UserResponse toUser,
 	UserResponse fromUser,
-	String message,
+	String sendMessage,
+	String rejectMessage,
 	ContactResponse contact
 ) {
 
@@ -19,7 +20,8 @@ public static ReceivedCoffeeChatResponse from(CoffeeChat coffeeChat) {
 			coffeeChat.getState(),
 			UserResponse.from(coffeeChat.getToUser()),
 			UserResponse.from(coffeeChat.getFromUser()),
-			coffeeChat.getMessage(),
+			coffeeChat.getSendMessage(),
+			coffeeChat.getRejectMessage(),
 			coffeeChat.getState() == State.ACCEPT ? ContactResponse.from(coffeeChat.getFromUser().getContact()) : null
 		);
 	}
diff --git a/main-server/src/main/java/com/sickgyun/server/mail/MailService.java b/main-server/src/main/java/com/sickgyun/server/mail/MailService.java
index 7acd6a7..8140936 100644
--- a/main-server/src/main/java/com/sickgyun/server/mail/MailService.java
+++ b/main-server/src/main/java/com/sickgyun/server/mail/MailService.java
@@ -64,7 +64,9 @@ private String setContext(CoffeeChat coffeeChat) {
 		Context context = new Context();
 		context.setVariable("fromuser", coffeeChat.getFromUser().getName());
 		context.setVariable("touser", coffeeChat.getToUser().getName());
-		context.setVariable("message", coffeeChat.getMessage());
+		context.setVariable("message",
+			coffeeChat.getState().equals(State.REJECT)
+				? coffeeChat.getRejectMessage() : coffeeChat.getSendMessage());
 		return checkState(coffeeChat.getState(), context);
 	}