Revize 159626c0

Re #7471 edited design of APIs based on consultation

server/src/main/java/cz/zcu/yamanager/dto/CalendarItem.java

@@ -9 +9 @@
     private LocalTime from;
     private LocalTime to;
     private VacationType type;
+    private RequestStatus status;
 
     public LocalDate getDate() {
         return date;
@@ -41 +42 @@
     public void setType(VacationType type) {
         this.type = type;
     }
+
+    public RequestStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(RequestStatus status) {
+        this.status = status;
+    }
 }

server/src/main/java/cz/zcu/yamanager/dto/CalendarView.java

@@ -1 @@
-package cz.zcu.yamanager.dto;
-
-import java.time.LocalDate;
-import java.time.LocalTime;
-
-public class CalendarView {
-
-    private LocalDate date;
-    private LocalTime from;
-    private LocalTime to;
-    private VacationType type;
-    private RequestStatus status;
-
-    public LocalDate getDate() {
-        return date;
-    }
-
-    public void setDate(LocalDate date) {
-        this.date = date;
-    }
-
-    public LocalTime getFrom() {
-        return from;
-    }
-
-    public void setFrom(LocalTime from) {
-        this.from = from;
-    }
-
-    public LocalTime getTo() {
-        return to;
-    }
-
-    public void setTo(LocalTime to) {
-        this.to = to;
-    }
-
-    public VacationType getType() {
-        return type;
-    }
-
-    public void setType(VacationType type) {
-        this.type = type;
-    }
-
-    public RequestStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(RequestStatus status) {
-        this.status = status;
-    }
-}

server/src/main/java/cz/zcu/yamanager/dto/DefaultSettings.java

@@ -3 +3 @@
 import java.time.LocalDateTime;
 
 public class DefaultSettings {
+
     private VacationInfo sickDay;
     private LocalDateTime notification;
 

server/src/main/java/cz/zcu/yamanager/dto/RequestType.java

@@ -1 +1 @@
 package cz.zcu.yamanager.dto;
 
 public enum  RequestType {
-    VACATION, AUTHORIZATION
+    VACATION, SICK_DAY, AUTHORIZATION
 }

server/src/main/java/cz/zcu/yamanager/ws/rest/ApiController.java

@@ -38 +38 @@
 
         CalendarItem calendarItem = new CalendarItem();
         calendarItem.setType(VacationType.SICKDAY);
+        calendarItem.setStatus(RequestStatus.ACCEPTED);
         calendarItem.setDate(LocalDate.now());
         calendarItem.setFrom(LocalTime.now());
         calendarItem.setTo(LocalTime.now());
@@ -75 +76 @@
     }
 
     @RequestMapping(value = "/users/requests", method=GET)
-    public UserRequest userRequests(@RequestParam("type") String type) {
+    public UserRequest userRequests(@RequestParam(value = "type", required = false) String type) {
         RequestType requestType = RequestType.valueOf(type);
 
         UserName userName = new UserName();
@@ -111 +112 @@
 
 
     @RequestMapping(value = "/user/calendar", method=GET)
-    public List<CalendarView> personalCalendarView(@RequestParam("viewType") String viewType, @RequestParam("value") String value) {
+    public List<CalendarItem> personalCalendarView(@RequestParam("viewType") String viewType, @RequestParam("value") String value) {
         CalendarViewType calendarViewType = CalendarViewType.valueOf(viewType);
         int numberOfView = Integer.valueOf(value);
 
-        List<CalendarView> calendarViews = new ArrayList<>();
+        List<CalendarItem> calendarItems = new ArrayList<>();
 
-        CalendarView view = new CalendarView();
+        CalendarItem view = new CalendarItem();
         view.setStatus(RequestStatus.PENDING);
         view.setType(VacationType.SICKDAY);
         view.setDate(LocalDate.now());
         view.setFrom(LocalTime.of(9, 30));
         view.setTo(LocalTime.of(18, 30));
 
-        calendarViews.add(view);
+        calendarItems.add(view);
 
-        return calendarViews;
+        return calendarItems;
     }
 
     @RequestMapping(value = "/user/{id}/calendar", method=GET)
-    public List<CalendarView> userCalendarView(@PathVariable("id") String id, @RequestParam("viewType") String viewType, @RequestParam("value") String value) {
+    public List<CalendarItem> userCalendarView(@PathVariable("id") String id, @RequestParam("viewType") String viewType, @RequestParam("value") String value) {
         CalendarViewType calendarViewType = CalendarViewType.valueOf(viewType);
         int numberOfView = Integer.valueOf(value);
         long userId = Long.valueOf(id);
 
-        List<CalendarView> calendarViews = new ArrayList<>();
+        List<CalendarItem> calendarItems = new ArrayList<>();
 
-        CalendarView view = new CalendarView();
+        CalendarItem view = new CalendarItem();
         view.setStatus(RequestStatus.PENDING);
         view.setType(VacationType.SICKDAY);
         view.setDate(LocalDate.now());
         view.setFrom(LocalTime.of(9, 30));
         view.setTo(LocalTime.of(18, 30));
 
-        calendarViews.add(view);
+        calendarItems.add(view);
 
-        return calendarViews;
+        return calendarItems;
     }
 
     @RequestMapping(value = "/settings/default", method=GET)
@@ -166 +167 @@
     // *********************** POST ****************************
 
     @RequestMapping(value = "/user/calendar", method=POST)
-    public ResponseEntity personalCalendarView(@RequestBody CalendarView calendarView) {
+    public ResponseEntity personalCalendarView(@RequestBody CalendarItem calendarItem) {
 
-        if (calendarView == null) {
+        if (calendarItem == null) {
             return ResponseEntity.badRequest().build();
         }