From bf4daf0f91d58c30939cc9e211430a85400ffd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8E=E1=85=AC=E1=84=89=E1=85=AE=E1=84=8B=E1=85=AF?= =?UTF-8?q?=E1=86=AB?= Date: Thu, 4 Apr 2024 09:39:39 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20commit=20=EB=88=84=EB=9D=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nightstudy/application/dto/req/RejectNightStudyReq.java | 3 +++ .../nightstudy/application/dto/res/NightStudyRes.java | 2 ++ .../outgoing/application/dto/req/RejectOutGoingReq.java | 3 +++ .../dodamcore/outgoing/application/dto/res/OutGoingRes.java | 3 ++- .../outsleeping/application/dto/req/RejectOutSleepingReq.java | 3 +++ .../outsleeping/application/dto/res/OutSleepingRes.java | 2 ++ 6 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/req/RejectNightStudyReq.java create mode 100644 dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/req/RejectOutGoingReq.java create mode 100644 dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/req/RejectOutSleepingReq.java diff --git a/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/req/RejectNightStudyReq.java b/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/req/RejectNightStudyReq.java new file mode 100644 index 00000000..a3ccc5a4 --- /dev/null +++ b/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/req/RejectNightStudyReq.java @@ -0,0 +1,3 @@ +package b1nd.dodamcore.nightstudy.application.dto.req; + +public record RejectNightStudyReq(String rejectReason) {} \ No newline at end of file diff --git a/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/res/NightStudyRes.java b/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/res/NightStudyRes.java index fb8c5c6c..1ba9da03 100644 --- a/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/res/NightStudyRes.java +++ b/dodam-core/src/main/java/b1nd/dodamcore/nightstudy/application/dto/res/NightStudyRes.java @@ -14,6 +14,7 @@ public record NightStudyRes(Long id, Boolean doNeedPhone, String reasonForPhone, StudentRes student, String place, + String rejectReason, LocalDate startAt, LocalDate endAt, LocalDateTime createdAt, LocalDateTime modifiedAt) { public static List of(List nightStudies) { @@ -30,6 +31,7 @@ public static NightStudyRes of(NightStudy nightStudy) { nightStudy.getDoNeedPhone(), nightStudy.getReasonForPhone(), StudentRes.of(nightStudy.getStudent()), nightStudy.getPlace().getPlace(), + nightStudy.getRejectReason(), nightStudy.getStartAt(), nightStudy.getEndAt(), nightStudy.getCreatedAt(), nightStudy.getModifiedAt() ); diff --git a/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/req/RejectOutGoingReq.java b/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/req/RejectOutGoingReq.java new file mode 100644 index 00000000..97eb0798 --- /dev/null +++ b/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/req/RejectOutGoingReq.java @@ -0,0 +1,3 @@ +package b1nd.dodamcore.outgoing.application.dto.req; + +public record RejectOutGoingReq(String rejectReason) {} \ No newline at end of file diff --git a/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/res/OutGoingRes.java b/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/res/OutGoingRes.java index 113a052a..5ca70415 100644 --- a/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/res/OutGoingRes.java +++ b/dodam-core/src/main/java/b1nd/dodamcore/outgoing/application/dto/res/OutGoingRes.java @@ -8,7 +8,7 @@ import java.util.List; public record OutGoingRes(Long id, String reason, OutGoingStatus status, LocalDateTime startAt, LocalDateTime endAt, - StudentRes student, LocalDateTime createdAt, LocalDateTime modifiedAt) { + StudentRes student, String rejectReason, LocalDateTime createdAt, LocalDateTime modifiedAt) { public static List of(List oList) { return oList.stream() .map(OutGoingRes::of) @@ -23,6 +23,7 @@ public static OutGoingRes of(OutGoing o) { o.getStartAt(), o.getEndAt(), StudentRes.of(o.getStudent()), + o.getRejectReason(), o.getCreatedAt(), o.getModifiedAt() ); diff --git a/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/req/RejectOutSleepingReq.java b/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/req/RejectOutSleepingReq.java new file mode 100644 index 00000000..36ec78bc --- /dev/null +++ b/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/req/RejectOutSleepingReq.java @@ -0,0 +1,3 @@ +package b1nd.dodamcore.outsleeping.application.dto.req; + +public record RejectOutSleepingReq(String rejectReason) {} \ No newline at end of file diff --git a/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/res/OutSleepingRes.java b/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/res/OutSleepingRes.java index 58c2e18e..ee579845 100644 --- a/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/res/OutSleepingRes.java +++ b/dodam-core/src/main/java/b1nd/dodamcore/outsleeping/application/dto/res/OutSleepingRes.java @@ -15,6 +15,7 @@ public record OutSleepingRes( LocalDate startAt, LocalDate endAt, StudentRes student, + String rejectReason, LocalDateTime createdAt, LocalDateTime modifiedAt) { public static List of(List outSleepings) { @@ -31,6 +32,7 @@ public static OutSleepingRes of(OutSleeping outSleeping) { outSleeping.getStartAt(), outSleeping.getEndAt(), StudentRes.of(outSleeping.getStudent()), + outSleeping.getRejectReason(), outSleeping.getCreatedAt(), outSleeping.getModifiedAt() );