Merge branch '1-create-table-for-medtype' of https://github.com/E-Hay…

…van/e-hayvan-backend into 1-create-table-for-medtype
E-Hayvan · Jan 1, 2024 · d3a9f22 · d3a9f22
2 parents b864aa8 + c9cfa3c
commit d3a9f22
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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<Medication> medications;
+    @JsonFormat(pattern = "dd-MM-yyyy HH:mm")
+    @DateTimeFormat(pattern = "dd-MM-yyyy HH:mm")
     @Column(nullable = false)
     private LocalDateTime beginningDate;
     @Column(nullable = false)