diff --git a/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java b/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java index e11dfbd..a14b5f1 100644 --- a/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java +++ b/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java @@ -3,22 +3,22 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.Date; import java.util.List; public class ScheduleDTO { private Integer scheduleID; - @JsonFormat(pattern = "dd-MM-yyyy HH:mm") - @DateTimeFormat(pattern = "dd-MM-yyyy HH:mm") - private LocalDateTime beginningDate; + @JsonFormat(pattern = "dd-MM-yyyy") + @DateTimeFormat(pattern = "dd-MM-yyyy") + private LocalDate beginningDate; private Integer doseFrequency; private Integer doseCount; public ScheduleDTO(){ } public ScheduleDTO(Integer scheduleID, List medications, - LocalDateTime beginningDate, Integer doseFrequency, Integer doseCount) { + LocalDate beginningDate, Integer doseFrequency, Integer doseCount) { this.scheduleID = scheduleID; this.beginningDate = beginningDate; this.doseFrequency = doseFrequency; @@ -33,11 +33,11 @@ public void setScheduleID(Integer scheduleID) { this.scheduleID = scheduleID; } - public LocalDateTime getBeginningDate() { + public LocalDate getBeginningDate() { return beginningDate; } - public void setBeginningDate(LocalDateTime beginningDate) { + public void setBeginningDate(LocalDate beginningDate) { this.beginningDate = beginningDate; } diff --git a/src/main/java/com/production/ehayvanbackendapi/DTO/request/CreateOrUpdateScheduleDTO.java b/src/main/java/com/production/ehayvanbackendapi/DTO/request/CreateOrUpdateScheduleDTO.java index 3b7cd66..1ed742f 100644 --- a/src/main/java/com/production/ehayvanbackendapi/DTO/request/CreateOrUpdateScheduleDTO.java +++ b/src/main/java/com/production/ehayvanbackendapi/DTO/request/CreateOrUpdateScheduleDTO.java @@ -4,22 +4,22 @@ import org.springframework.cglib.core.Local; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.Date; public class CreateOrUpdateScheduleDTO { - @JsonFormat(pattern = "dd-MM-yyyy HH:mm") - @DateTimeFormat(pattern = "dd-MM-yyyy HH:mm") - private LocalDateTime beginningDate; + @JsonFormat(pattern = "dd-MM-yyyy") + @DateTimeFormat(pattern = "dd-MM-yyyy") + private LocalDate beginningDate; private Integer doseFrequency; private Integer doseCount; - public LocalDateTime getBeginningDate() { + public LocalDate getBeginningDate() { return beginningDate; } - public void setBeginningDate(LocalDateTime beginningDate) { + public void setBeginningDate(LocalDate beginningDate) { this.beginningDate = beginningDate; } diff --git a/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java index 3dc7b19..46ad398 100644 --- a/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java @@ -6,7 +6,7 @@ import org.springframework.cglib.core.Local; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -19,10 +19,10 @@ public class Schedule { private Integer ScheduleID; @OneToMany(mappedBy = "ScheduleID", cascade = CascadeType.ALL) private List medications; - @JsonFormat(pattern = "dd-MM-yyyy HH:mm") - @DateTimeFormat(pattern = "dd-MM-yyyy HH:mm") + @JsonFormat(pattern = "dd-MM-yyyy") + @DateTimeFormat(pattern = "dd-MM-yyyy") @Column(nullable = false) - private LocalDateTime beginningDate; + private LocalDate beginningDate; @Column(nullable = false) private Integer doseFrequency; @Column(nullable = false) @@ -34,10 +34,10 @@ public Integer getScheduleID() { public void setScheduleID(Integer scheduleID) { ScheduleID = scheduleID; } - public LocalDateTime getBeginningDate() { + public LocalDate getBeginningDate() { return beginningDate; } - public void setBeginningDate(LocalDateTime beginningDate) { + public void setBeginningDate(LocalDate beginningDate) { this.beginningDate = beginningDate; } public Integer getDoseFrequency() { diff --git a/src/test/java/com/production/ehayvanbackendapi/TestUtils/DataSeed.java b/src/test/java/com/production/ehayvanbackendapi/TestUtils/DataSeed.java index cebca55..966b02e 100644 --- a/src/test/java/com/production/ehayvanbackendapi/TestUtils/DataSeed.java +++ b/src/test/java/com/production/ehayvanbackendapi/TestUtils/DataSeed.java @@ -177,7 +177,7 @@ public void loadSeedToDatabase() { //Create Schedule Schedule exampleSchedule = new Schedule(); - exampleSchedule.setBeginningDate(LocalDateTime.now()); + exampleSchedule.setBeginningDate(LocalDate.now()); exampleSchedule.setDoseCount(1); exampleSchedule.setDoseFrequency(1);