From d113f2ee6c77a590a9e46ef89acb781a009fcc8d Mon Sep 17 00:00:00 2001 From: xrabcde Date: Sun, 24 Jul 2022 19:44:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=8A=AC=EB=9E=99=EC=98=88?= =?UTF-8?q?=EC=95=BD=EC=95=8C=EB=A6=BC=20=EB=A9=94=EC=8B=9C=EC=A7=80?= =?UTF-8?q?=EC=97=90=20=EA=B5=90=EC=9C=A1=EC=9E=A5=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/woowacourse/zzimkkong/dto/slack/SlackResponse.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java b/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java index 98a960135..6ad962b6d 100644 --- a/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java +++ b/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java @@ -13,6 +13,7 @@ @Getter @NoArgsConstructor public class SlackResponse { + private String mapName; private String spaceName; private String userName; private String reservationTime; @@ -21,6 +22,7 @@ public class SlackResponse { private String slackUrl; private SlackResponse( + final String mapName, final String spaceName, final String userName, final LocalDateTime startTime, @@ -28,6 +30,7 @@ private SlackResponse( final String description, final String sharingMapId, final String slackUrl) { + this.mapName = "교육장명 : " + mapName; this.spaceName = "회의실명 : " + spaceName; this.userName = "예약자명 : " + userName; this.reservationTime = "예약시간 : " + startTime + " ~ " + endTime; @@ -41,6 +44,7 @@ public static SlackResponse of(final Reservation reservation, final String shari LocalDateTime reservationEndTimeKST = TimeZoneUtils.convert(reservation.getEndTime(), UTC, KST); return new SlackResponse( + reservation.getSpace().getMap().getName(), reservation.getSpace().getName(), reservation.getUserName(), reservationStartTimeKST, From b594b8ea708f08eee1c20a0e39284bbe8fd64171 Mon Sep 17 00:00:00 2001 From: xrabcde Date: Mon, 1 Aug 2022 11:12:09 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20slackResponse=20toString=EC=97=90?= =?UTF-8?q?=20mapName=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/woowacourse/zzimkkong/dto/slack/SlackResponse.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java b/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java index 6ad962b6d..fb9918faa 100644 --- a/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java +++ b/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java @@ -56,7 +56,8 @@ public static SlackResponse of(final Reservation reservation, final String shari @Override public String toString() { - return spaceName + "\\n " + + return mapName + "\\n " + + spaceName + "\\n " + userName + "\\n " + reservationTime + "\\n " + description; From 14e730fff0bad430be3951ae9bda78f2dd86fa37 Mon Sep 17 00:00:00 2001 From: xrabcde Date: Thu, 4 Aug 2022 01:46:01 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=EB=B2=94=EC=9A=A9=EC=A0=81=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9D=84=20=EC=9C=84=ED=95=B4=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EB=AA=85=EC=9D=84=20=EA=B5=90=EC=9C=A1=EC=9E=A5?= =?UTF-8?q?=EB=AA=85=20>=20=EC=9E=A5=EC=86=8C=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java b/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java index fb9918faa..886cbbd46 100644 --- a/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java +++ b/backend/src/main/java/com/woowacourse/zzimkkong/dto/slack/SlackResponse.java @@ -30,7 +30,7 @@ private SlackResponse( final String description, final String sharingMapId, final String slackUrl) { - this.mapName = "교육장명 : " + mapName; + this.mapName = "장소 : " + mapName; this.spaceName = "회의실명 : " + spaceName; this.userName = "예약자명 : " + userName; this.reservationTime = "예약시간 : " + startTime + " ~ " + endTime;