Merge remote-tracking branch 'origin/main'

Leets-Official · Aug 7, 2024 · 8f12d80 · 8f12d80
2 parents 6df66fc + 1a7a8ae
commit 8f12d80
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/leets/weeth/domain/schedule/application/dto/EventDTO.java b/src/main/java/leets/weeth/domain/schedule/application/dto/EventDTO.java
@@ -2,7 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import leets.weeth.domain.schedule.application.annotation.ScheduleTimeCheck;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
@@ -28,7 +28,8 @@ public record Save(
             @NotBlank String location,
             @NotBlank String requiredItem,
             @NotNull String memberCount,
-            @ScheduleTimeCheck ScheduleDTO.Time time
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start,
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end
     ) {}
 
     public record Update(
@@ -37,6 +38,7 @@ public record Update(
             @NotBlank String location,
             @NotBlank String requiredItem,
             @NotNull String memberCount,
-            @ScheduleTimeCheck ScheduleDTO.Time time
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start,
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end
     ) {}
 }
diff --git a/src/main/java/leets/weeth/domain/schedule/application/dto/MeetingDTO.java b/src/main/java/leets/weeth/domain/schedule/application/dto/MeetingDTO.java
@@ -2,12 +2,10 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import leets.weeth.domain.schedule.application.annotation.ScheduleTimeCheck;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
-import static leets.weeth.domain.schedule.application.dto.ScheduleDTO.Time;
-
 public class MeetingDTO {
 
     public record Response(
@@ -30,7 +28,8 @@ public record Save(
             @NotBlank String title,
             @NotBlank String content,
             @NotBlank String location,
-            @ScheduleTimeCheck Time time,
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start,
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end,
             @NotNull Integer weekNumber,
             @NotNull Integer cardinal
     ) {}
@@ -39,7 +38,8 @@ public record Update(
             @NotBlank String title,
             @NotBlank String content,
             @NotBlank String location,
-            @ScheduleTimeCheck Time time,
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start,
+            @NotNull @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end,
             @NotNull Integer weekNumber,
             @NotNull Integer cardinal
     ) {}

diff --git a/src/main/java/leets/weeth/domain/schedule/domain/entity/Schedule.java b/src/main/java/leets/weeth/domain/schedule/domain/entity/Schedule.java
@@ -44,17 +44,17 @@ public void updateUpperClass(EventDTO.Update dto, User user) {
         this.title = dto.title();
         this.content = dto.content();
         this.location = dto.location();
-        this.start = dto.time().start();
-        this.end = dto.time().end();
+        this.start = dto.start();
+        this.end = dto.end();
         this.user = user;
     }
 
     public void updateUpperClass(MeetingDTO.Update dto, User user) {
         this.title = dto.title();
         this.content = dto.content();
         this.location = dto.location();
-        this.start = dto.time().start();
-        this.end = dto.time().end();
+        this.start = dto.start();
+        this.end = dto.end();
         this.user = user;
     }
 }