diff --git a/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java b/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java index 1c79c23..e11dfbd 100644 --- a/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java +++ b/src/main/java/com/production/ehayvanbackendapi/DTO/ScheduleDTO.java @@ -1,11 +1,16 @@ package com.production.ehayvanbackendapi.DTO; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; 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; private Integer doseFrequency; private Integer doseCount; 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 71736c4..3b7cd66 100644 --- a/src/main/java/com/production/ehayvanbackendapi/DTO/request/CreateOrUpdateScheduleDTO.java +++ b/src/main/java/com/production/ehayvanbackendapi/DTO/request/CreateOrUpdateScheduleDTO.java @@ -1,12 +1,16 @@ package com.production.ehayvanbackendapi.DTO.request; +import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.cglib.core.Local; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import java.util.Date; public class CreateOrUpdateScheduleDTO { + @JsonFormat(pattern = "dd-MM-yyyy HH:mm") + @DateTimeFormat(pattern = "dd-MM-yyyy HH:mm") private LocalDateTime beginningDate; private Integer doseFrequency; private Integer doseCount; diff --git a/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java index cbf3b47..3dc7b19 100644 --- a/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java @@ -1,8 +1,10 @@ package com.production.ehayvanbackendapi.Entities; +import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.persistence.*; import net.sf.jsqlparser.expression.DateTimeLiteralExpression; import org.springframework.cglib.core.Local; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import java.util.Date; @@ -17,6 +19,8 @@ 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") @Column(nullable = false) private LocalDateTime beginningDate; @Column(nullable = false)