Revize d6ff5bb6

Re #7551 Connection between database and frontend

server/init.sql

@@ -121 +121 @@
   DECLARE notification DATETIME;
 
   SELECT no_sick_days, alert INTO sickDaysCount, notification FROM default_settings ORDER BY id DESC LIMIT 1;
-  SELECT EU.id, EU.first_name, EU.last_name, EU.no_vacations, IFNULL(EU.no_sick_days, sickDaysCount), EU.taken_sick_days, IFNULL(EU.alert, notification), EU.email, EU.photo, EU.creation_date, R.name, APS.name
+  SELECT u.id, u.first_name, u.last_name, u.no_vacations, IFNULL(u.no_sick_days, sickDaysCount), u.taken_sick_days, IFNULL(u.alert, notification), u.email, u.photo, u.creation_date, r.name, s.name
      INTO out_id, out_first_name, out_last_name, out_no_vacations, out_no_sick_days, out_taken_sick_days, out_alert, out_email, out_photo, out_creation_date, out_role, out_status
-     FROM end_user EU
-     INNER JOIN role R ON EU.role_id=R.id
-     INNER JOIN approval_status APS ON EU.status_id=APS.id
-     WHERE EU.id=in_id;
+     FROM end_user u
+     INNER JOIN role r ON u.role_id=r.id
+     INNER JOIN approval_status s ON u.status_id=s.id
+     WHERE u.id=in_id;
 END $$
 
 DROP PROCEDURE IF EXISTS GetUserToken $$
@@ -149 +149 @@
   DECLARE notification DATETIME;
 
   SELECT no_sick_days, alert INTO sickDaysCount, notification FROM default_settings ORDER BY id DESC LIMIT 1;
-  SELECT EU.id, EU.first_name, EU.last_name, EU.no_vacations, IFNULL(EU.no_sick_days, sickDaysCount), EU.taken_sick_days, IFNULL(EU.alert, notification), EU.email, EU.photo, EU.creation_date, R.name, APS.name
+  SELECT u.id, u.first_name, u.last_name, u.no_vacations, IFNULL(u.no_sick_days, sickDaysCount), u.taken_sick_days, IFNULL(u.alert, notification), u.email, u.photo, u.creation_date, r.name, s.name
      INTO out_id, out_first_name, out_last_name, out_no_vacations, out_no_sick_days, out_taken_sick_days, out_alert, out_email, out_photo, out_creation_date, out_role, out_status
-     FROM end_user EU
-     INNER JOIN role R ON EU.role_id=R.id
-     INNER JOIN approval_status APS ON EU.status_id=APS.id
-     WHERE EU.token=p_token;
+     FROM end_user u
+     INNER JOIN role r ON u.role_id=r.id
+     INNER JOIN approval_status s ON u.status_id=s.id
+     WHERE u.token=p_token;
 END $$
 
 DELIMITER ;
@@ -182 +182 @@
 -- Insert table end_user
 -- -----------------------------------------------------
 INSERT INTO end_user (first_name, last_name, no_vacations, no_sick_days, taken_sick_days, alert, token, email, photo, role_id, status_id) VALUES ('admin', 'admin', 0, NULL, 0, NULL, '', '', '', 2, 1);
+INSERT INTO end_user (first_name, last_name, no_vacations, no_sick_days, taken_sick_days, alert, token, email, photo, role_id, status_id) VALUES ('test', 'test', 0, NULL, 0, NULL, '', '', '', 1, 2);
 
 -- -----------------------------------------------------
 -- Insert table vacation_day

server/src/main/java/cz/zcu/yamanager/business/ApiManager.java

@@ -6 +6 @@
 import cz.zcu.yamanager.repository.VacationRepository;
 import cz.zcu.yamanager.ws.rest.RESTFullException;
 import org.apache.tomcat.jni.Local;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -17 +19 @@
 @Component
 public class ApiManager implements Manager {
 
+    /**
+     * The logger.
+     */
+    private static final Logger log = LoggerFactory.getLogger(UserRepository.class);
+
     private static final int DAYS_IN_WEEK = 7;
 
     private RequestRepository requestRepository;
@@ -32 +39 @@
 
     @Override
     public List<BasicProfileUser> getUsers(Status status) throws RESTFullException {
-        List<BasicProfileUser> users = this.userRepository.getAllBasicUsers();
-        LocalDate today = LocalDate.now();
-        LocalDate weekBefore = today.minusDays(ApiManager.DAYS_IN_WEEK);
-        LocalDate weekAfter = today.plusDays(ApiManager.DAYS_IN_WEEK);
-        for (BasicProfileUser user : users) {
-            user.setCalendar(this.vacationRepository.getVacationDays(user.getId(), weekBefore, weekAfter));
+        List<BasicProfileUser> users;
+        if(status == null) {
+            users = this.userRepository.getAllBasicUsers();
+        } else {
+            users = this.userRepository.getAllBasicUsers(status);
         }
 
-        return users;
+        if(users == null) {
+            return Collections.emptyList();
+        } else {
+            LocalDate today = LocalDate.now();
+            LocalDate weekBefore = today.minusDays(ApiManager.DAYS_IN_WEEK);
+            LocalDate weekAfter = today.plusDays(ApiManager.DAYS_IN_WEEK);
+            for (BasicProfileUser user : users) {
+                user.setCalendar(this.vacationRepository.getVacationDays(user.getId(), weekBefore, weekAfter));
+            }
+
+            return users;
+        }
     }
 
     @Override
     public List<VacationRequest> getVacationRequests(Status status) throws RESTFullException {
-        List<VacationRequest> requests = this.requestRepository.getAllVacationRequests(status);
+        List<VacationRequest> requests;
+        if(status == null) {
+            requests = this.requestRepository.getAllVacationRequests();
+        } else {
+            requests = this.requestRepository.getAllVacationRequests(status);
+        }
+
         return requests == null ? Collections.emptyList() : requests;
     }
 
     @Override
     public List<AuthorizationRequest> getAuthorizationRequests(Status status) throws RESTFullException {
-        List<AuthorizationRequest> requests = this.requestRepository.getAllAuthorizations(status);
+        List<AuthorizationRequest> requests;
+        if(status == null) {
+            requests = this.requestRepository.getAllAuthorizations();
+        } else {
+            requests = this.requestRepository.getAllAuthorizations(status);
+        }
+
         return requests == null ? Collections.emptyList() : requests;
     }
 
     @Override
     public FullUserProfile getUserProfile(Long userId) throws RESTFullException {
         FullUserProfile userProfile = this.userRepository.getFullUser(userId);
+        System.out.println("Notification: " + userProfile.getNotification());
+        System.out.println("Approval: " + userProfile.getStatus());
         return userProfile == null ? new FullUserProfile() : userProfile;
     }
 
@@ -69 +100 @@
 
     @Override
     public List<VacationDay> getUserCalendar(Long userId, LocalDate fromDate, LocalDate toDate, Status status) throws RESTFullException {
-        List<VacationDay> vacations = this.vacationRepository.getVacationDays(userId, fromDate, toDate, status);
+        List<VacationDay> vacations;
+        if(status == null && toDate == null) {
+            vacations = this.vacationRepository.getVacationDays(userId, fromDate);
+        } else if(status == null) {
+            vacations = this.vacationRepository.getVacationDays(userId, fromDate, toDate);
+        } else if(toDate != null) {
+            vacations = this.vacationRepository.getVacationDays(userId, fromDate, toDate, status);
+        } else {
+            vacations = this.vacationRepository.getVacationDays(userId, fromDate, status);
+        }
+
         return vacations == null ? Collections.emptyList() : vacations;
     }
 
@@ -85 +126 @@
 
     @Override
     public void changeSettings(Long userId, UserSettings settings) throws RESTFullException {
-        this.userRepository.updateUserSettings(settings);
+        settings.setId(userId);
+        if(settings.getRole() == null && settings.getSickdayCount() == null && settings.getVacationCount() == null) {
+            this.userRepository.updateNotification(settings);
+        } else {
+            this.userRepository.updateUserSettings(settings);
+        }
     }
 
     @Override
@@ -100 +146 @@
         } else {
             this.requestRepository.updateAuthorization(request);
         }
-
     }
 
     @Override

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

@@ -1 +1 @@
 package cz.zcu.yamanager.dto;
 
 public enum VacationType {
-    VACATION, SICKDAY;
+    SICKDAY, VACATION;
 
     public static VacationType getVacationType(String type) {
         if (type == null || type.isEmpty()) return null;

server/src/main/java/cz/zcu/yamanager/repository/RequestRepository.java

@@ -7 +7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
+import java.security.InvalidParameterException;
 import java.sql.ResultSet;
+import java.sql.Time;
 import java.util.List;
 
 /**
@@ -42 +44 @@
     public List<AuthorizationRequest> getAllAuthorizations() {
         log.trace("Selecting all authorization requests from a database.");
 
-        return jdbc.query("SELECT EU.id, EU.first_name, EU.last_name, EU.creation_date, APS.name " +
-                "FROM end_user EU " +
-                "INNER JOIN approval_status APS ON EU.status_id = APS.id",
+        return jdbc.query("SELECT u.id, u.first_name, u.last_name, u.creation_date, s.name " +
+                "FROM end_user u " +
+                "INNER JOIN approval_status s ON u.status_id = s.id",
                 (ResultSet rs, int rowNum) -> {
-            AuthorizationRequest request = new AuthorizationRequest();
-            request.setId(rs.getLong("EU.id"));
-            request.setFirstName(rs.getString("EU.first_name"));
-            request.setLastName(rs.getString("EU.last_name"));
-            request.setStatus(Status.getStatus(rs.getString("APS.name")));
-            request.setTimestamp(rs.getTimestamp("EU.creation_date").toLocalDateTime());
-            return request;
-        });
+                    AuthorizationRequest request = new AuthorizationRequest();
+                    request.setId(rs.getLong("u.id"));
+                    request.setFirstName(rs.getString("u.first_name"));
+                    request.setLastName(rs.getString("u.last_name"));
+                    request.setStatus(Status.getStatus(rs.getString("s.name")));
+                    request.setTimestamp(rs.getTimestamp("u.creation_date").toLocalDateTime());
+                    return request;
+                });
     }
 
     /**
@@ -64 +66 @@
     public List<AuthorizationRequest> getAllAuthorizations(Status status) {
         log.debug("Selecting all authorization requests from a database with requested status: {}", status);
 
-        return jdbc.query("SELECT EU.id, EU.first_name, EU.last_name, EU.creation_date " +
-                "FROM end_user EU " +
-                "INNER JOIN approval_status APS ON EU.status_id = APS.id " +
-                "WHERE APS.name=?",
+        if(status == null) throw new InvalidParameterException();
+        return jdbc.query("SELECT u.id, u.first_name, u.last_name, u.creation_date, s.name " +
+                "FROM end_user u " +
+                "INNER JOIN approval_status s ON u.status_id = s.id " +
+                "WHERE s.name = ?",
                 new Object[]{status.name()},
                 (ResultSet rs, int rowNum) -> {
-            AuthorizationRequest request = new AuthorizationRequest();
-            request.setId(rs.getLong("EU.id"));
-            request.setFirstName(rs.getString("EU.first_name"));
-            request.setLastName(rs.getString("EU.last_name"));
-            request.setStatus(status);
-            request.setTimestamp(rs.getTimestamp("EU.creation_date").toLocalDateTime());
-            return request;
-        });
+                    AuthorizationRequest request = new AuthorizationRequest();
+                    request.setId(rs.getLong("u.id"));
+                    request.setFirstName(rs.getString("u.first_name"));
+                    request.setLastName(rs.getString("u.last_name"));
+                    request.setStatus(Status.getStatus(rs.getString("s.name")));
+                    request.setTimestamp(rs.getTimestamp("u.creation_date").toLocalDateTime());
+                    return request;
+                });
     }
 
     /**
@@ -114 +117 @@
     public List<VacationRequest> getAllVacationRequests() {
         log.trace("Selecting all vacation requests from a database.");
 
-        return jdbc.query("SELECT VD.id, VD.vacation_date, VD.time_from, VD.time_to, VD.creation_date, VT.name, APS.name, EU.first_name, EU.last_name " +
-                "FROM vacation_day VD " +
-                "INNER JOIN vacation_type VT on VD.type_id=VT.id " +
-                "INNER JOIN approval_status APS ON VD.status_id=APS.id" +
-                "INNER JOIN end_user EU ON VD.user_id=EU.id",
+        return jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.creation_date, t.name, s.name, u.first_name, u.last_name " +
+                "FROM vacation_day v " +
+                "INNER JOIN vacation_type t on v.type_id = t.id " +
+                "INNER JOIN approval_status s ON v.status_id = s.id " +
+                "INNER JOIN end_user u ON v.user_id = u.id",
                 (ResultSet rs, int rowNum) -> {
-            VacationRequest request = new VacationRequest();
-            request.setId(rs.getLong("VD.id"));
-            request.setFirstName(rs.getString("EU.first_name"));
-            request.setLastName(rs.getString("EU.last_name"));
-            request.setDate(rs.getDate("VD.vacation_date").toLocalDate());
-            request.setFrom(rs.getTime("VD.time_from").toLocalTime());
-            request.setTo(rs.getTime("VD.time_to").toLocalTime());
-            request.setType(VacationType.getVacationType("VT.name"));
-            request.setStatus(Status.getStatus("APS.name"));
-            return request;
-        });
+                    VacationRequest request = new VacationRequest();
+                    request.setId(rs.getLong("v.id"));
+                    request.setFirstName(rs.getString("u.first_name"));
+                    request.setLastName(rs.getString("u.last_name"));
+                    request.setDate(rs.getDate("v.vacation_date").toLocalDate());
+                    Time timeFrom = rs.getTime("v.time_from");
+                    if(timeFrom != null) {
+                        request.setFrom(timeFrom.toLocalTime());
+                    }
+
+                    Time timeTo = rs.getTime("v.time_to");
+                    if(timeTo != null) {
+                        request.setTo(timeTo.toLocalTime());
+                    }
+                    request.setTimestamp(rs.getTimestamp("v.creation_date").toLocalDateTime());
+                    request.setType(VacationType.getVacationType(rs.getString("t.name")));
+                    request.setStatus(Status.getStatus(rs.getString("s.name")));
+                    return request;
+                });
     }
 
     /**
@@ -141 +152 @@
     public List<VacationRequest> getAllVacationRequests(Status status) {
         log.debug("Selecting all vacation requests from a database with requested status: {}", status);
 
-        return jdbc.query("SELECT VD.id, VD.vacation_date, VD.time_from, VD.time_to, VD.creation_date, VT.name, APS.name, EU.first_name, EU.last_name " +
-                "FROM vacation_day VD " +
-                "INNER JOIN vacation_type VT on VD.type_id=VT.id " +
-                "INNER JOIN approval_status APS ON VD.status_id=APS.id" +
-                "INNER JOIN end_user EU ON VD.user_id=EU.id" +
-                "WHERE APS.name=?",
+        if(status == null) throw new InvalidParameterException();
+        return jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.creation_date, t.name, s.name, u.first_name, u.last_name " +
+                "FROM vacation_day v " +
+                "INNER JOIN vacation_type t on v.type_id = t.id " +
+                "INNER JOIN approval_status s ON v.status_id = s.id " +
+                "INNER JOIN end_user u ON v.user_id = u.id " +
+                "WHERE s.name=?",
                 new Object[]{status.name()},
                 (ResultSet rs, int rowNum) -> {
-            VacationRequest request = new VacationRequest();
-            request.setId(rs.getLong("VD.id"));
-            request.setFirstName(rs.getString("EU.first_name"));
-            request.setLastName(rs.getString("EU.last_name"));
-            request.setDate(rs.getDate("VD.vacation_date").toLocalDate());
-            request.setFrom(rs.getTime("VD.time_from").toLocalTime());
-            request.setTo(rs.getTime("VD.time_to").toLocalTime());
-            request.setType(VacationType.getVacationType("VT.name"));
-            request.setStatus(status);
-            return request;
-        });
+                    VacationRequest request = new VacationRequest();
+                    request.setId(rs.getLong("v.id"));
+                    request.setFirstName(rs.getString("u.first_name"));
+                    request.setLastName(rs.getString("u.last_name"));
+                    request.setDate(rs.getDate("v.vacation_date").toLocalDate());
+                    Time timeFrom = rs.getTime("v.time_from");
+                    if(timeFrom != null) {
+                        request.setFrom(timeFrom.toLocalTime());
+                    }
+
+                    Time timeTo = rs.getTime("v.time_to");
+                    if(timeTo != null) {
+                        request.setTo(timeTo.toLocalTime());
+                    }
+
+                    request.setTimestamp(rs.getTimestamp("v.creation_date").toLocalDateTime());
+                    request.setType(VacationType.getVacationType(rs.getString("t.name")));
+                    request.setStatus(Status.getStatus(rs.getString("s.name")));
+                    return request;
+                });
     }
 
     /**

server/src/main/java/cz/zcu/yamanager/repository/UserRepository.java

@@ -49 +49 @@
         });
     }
 
+    public List<BasicProfileUser> getAllBasicUsers(Status status) {
+        if(status == null) throw new IllegalArgumentException();
+
+        return jdbc.query("SELECT u.id, u.first_name, u.last_name, u.photo" +
+                "FROM end_user u " +
+                "INNER JOIN approval_status s ON u.status_id = s.id " +
+                "WHERE s.name = ?",
+                new Object[]{status.name()}, (ResultSet rs, int rowNum) -> {
+            BasicProfileUser user = new BasicProfileUser();
+            user.setId(rs.getLong("u.id"));
+            user.setFirstName(rs.getString("u.first_name"));
+            user.setLastName(rs.getString("u.last_name"));
+            user.setPhoto(rs.getString("u.photo"));
+            return user;
+        });
+    }
+
     public FullUserProfile getFullUser(long id) {
         List<SqlParameter> paramList = new ArrayList<>();
         paramList.add(new SqlParameter("in_id", Types.BIGINT));
@@ -160 +177 @@
         });
     }
 
+    public void updateNotification(UserSettings settings) {
+        jdbc.update("UPDATE end_user SET alert = ? WHERE id = ?", settings.getNotification(), settings.getId());
+    }
+
     public void updateUserSettings(UserSettings settings) {
-        jdbc.update("UPDATE end_user EU, role R SET EU.no_vacations=?, EU.no_sick_days=?, EU.role_id=R.id WHERE EU.id = ? AND R.name=?",
+        jdbc.update("UPDATE end_user u, role r SET u.no_vacations=?, u.no_sick_days=?, u.role_id=r.id WHERE u.id = ? AND r.name=?",
                 settings.getVacationCount(), settings.getSickdayCount(), settings.getId(), settings.getRole().name());
     }
 

server/src/main/java/cz/zcu/yamanager/repository/VacationRepository.java

@@ -11 +11 @@
 import org.springframework.stereotype.Repository;
 
 import java.sql.ResultSet;
+import java.sql.Time;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -73 +74 @@
     }
 
     public List<VacationDay> getVacationDays(long userId, LocalDate from) {
-        return jdbc.query("SELECT VD.vacation_date, VD.time_from, VD.time_to, VT.name, APS.name " +
-                        "FROM vacation_day VD " +
-                        "INNER JOIN end_user EU ON VD.user_id = EU.id " +
-                        "INNER JOIN vacation_type VT ON VD.type_id = VT.id " +
-                        "INNER JOIN approval_status APS ON VD.status_id = APS.id " +
-                        "WHERE VD.user_id = ? AND VD.vacation_date >= ?",
+        return jdbc.query("SELECT v.vacation_date, v.time_from, v.time_to, t.name, s.name " +
+                        "FROM vacation_day v " +
+                        "INNER JOIN end_user u ON v.user_id = u.id " +
+                        "INNER JOIN vacation_type t ON v.type_id = t.id " +
+                        "INNER JOIN approval_status s ON v.status_id = s.id " +
+                        "WHERE v.user_id = ? AND v.vacation_date >= ?",
                 new Object[]{userId, from}, (ResultSet rs, int rowNum) -> {
                     VacationDay item = new VacationDay();
-                    item.setDate(rs.getDate("VD.vacation_date").toLocalDate());
-                    item.setFrom(rs.getTime("VD.time_from").toLocalTime());
-                    item.setTo(rs.getTime("VD.time_to").toLocalTime());
-                    item.setType(VacationType.getVacationType(rs.getString("VT.name")));
-                    item.setStatus(Status.getStatus(rs.getString("APS.name")));
+                    item.setDate(rs.getDate("v.vacation_date").toLocalDate());
+                    Time timeFrom = rs.getTime("v.time_from");
+                    if(timeFrom != null) {
+                        item.setFrom(timeFrom.toLocalTime());
+                    }
+
+                    Time timeTo = rs.getTime("v.time_to");
+                    if(timeTo != null) {
+                        item.setTo(timeTo.toLocalTime());
+                    }
+                    item.setType(VacationType.getVacationType(rs.getString("t.name")));
+                    item.setStatus(Status.getStatus(rs.getString("s.name")));
+                    return item;
+                });
+    }
+
+    public List<VacationDay> getVacationDays(long userId, LocalDate from, Status status) {
+        if(status == null) throw new IllegalArgumentException();
+
+        return jdbc.query("SELECT v.vacation_date, v.time_from, v.time_to, t.name, s.name " +
+                        "FROM vacation_day v " +
+                        "INNER JOIN end_user u ON v.user_id = u.id " +
+                        "INNER JOIN vacation_type t ON v.type_id = t.id " +
+                        "INNER JOIN approval_status s ON v.status_id = s.id " +
+                        "WHERE v.user_id = ? AND v.vacation_date >= ? AND s.name = ?",
+                new Object[]{userId, from, status.name()}, (ResultSet rs, int rowNum) -> {
+                    VacationDay item = new VacationDay();
+                    item.setDate(rs.getDate("v.vacation_date").toLocalDate());
+                    Time timeFrom = rs.getTime("v.time_from");
+                    if(timeFrom != null) {
+                        item.setFrom(timeFrom.toLocalTime());
+                    }
+
+                    Time timeTo = rs.getTime("v.time_to");
+                    if(timeTo != null) {
+                        item.setTo(timeTo.toLocalTime());
+                    }
+                    item.setType(VacationType.getVacationType(rs.getString("t.name")));
+                    item.setStatus(Status.getStatus(rs.getString("s.name")));
                     return item;
                 });
     }
 
     public List<VacationDay> getVacationDays(long userId, LocalDate from, LocalDate to) {
-        return jdbc.query("SELECT VD.vacation_date, VD.time_from, VD.time_to, VT.name, APS.name " +
-                        "FROM vacation_day VD " +
-                        "INNER JOIN end_user EU ON VD.user_id = EU.id " +
-                        "INNER JOIN vacation_type VT ON VD.type_id = VT.id " +
-                        "INNER JOIN approval_status APS ON VD.status_id = APS.id " +
-                        "WHERE VD.user_id=? AND VD.vacation_date >= ? AND VD.vacation_date <= ?",
+        return jdbc.query("SELECT v.vacation_date, v.time_from, v.time_to, t.name, s.name " +
+                        "FROM vacation_day v " +
+                        "INNER JOIN end_user u ON v.user_id = u.id " +
+                        "INNER JOIN vacation_type t ON v.type_id = t.id " +
+                        "INNER JOIN approval_status s ON v.status_id = s.id " +
+                        "WHERE v.user_id=? AND v.vacation_date >= ? AND v.vacation_date <= ?",
                 new Object[]{userId, from, to}, (ResultSet rs, int rowNum) -> {
                     VacationDay item = new VacationDay();
-                    item.setDate(rs.getDate("VD.vacation_date").toLocalDate());
-                    item.setFrom(rs.getTime("VD.time_from").toLocalTime());
-                    item.setTo(rs.getTime("VD.time_to").toLocalTime());
-                    item.setType(VacationType.getVacationType(rs.getString("VT.name")));
-                    item.setStatus(Status.getStatus(rs.getString("APS.name")));
+                    item.setDate(rs.getDate("v.vacation_date").toLocalDate());
+                    Time timeFrom = rs.getTime("v.time_from");
+                    if(timeFrom != null) {
+                        item.setFrom(timeFrom.toLocalTime());
+                    }
+
+                    Time timeTo = rs.getTime("v.time_to");
+                    if(timeTo != null) {
+                        item.setTo(timeTo.toLocalTime());
+                    }
+                    item.setType(VacationType.getVacationType(rs.getString("t.name")));
+                    item.setStatus(Status.getStatus(rs.getString("s.name")));
                     return item;
                 });
+
     }
 
     public List<VacationDay> getVacationDays(long userId, LocalDate from, LocalDate to, Status status) {
-        return jdbc.query("SELECT VD.vacation_date, VD.time_from, VD.time_to, VT.name, APS.name " +
-                        "FROM vacation_day VD " +
-                        "INNER JOIN end_user EU ON VD.user_id = EU.id " +
-                        "INNER JOIN vacation_type VT ON VD.type_id = VT.id " +
-                        "INNER JOIN approval_status APS ON VD.status_id = APS.id " +
-                        "WHERE VD.user_id=? AND VD.vacation_date >= ? AND VD.vacation_date <= ? AND APS.name = ?",
+        if(status == null) throw new IllegalArgumentException();
+
+        return jdbc.query("SELECT v.vacation_date, v.time_from, v.time_to, t.name, s.name " +
+                        "FROM vacation_day v " +
+                        "INNER JOIN end_user u ON v.user_id = u.id " +
+                        "INNER JOIN vacation_type t ON v.type_id = t.id " +
+                        "INNER JOIN approval_status s ON v.status_id = s.id " +
+                        "WHERE v.user_id=? AND v.vacation_date >= ? AND v.vacation_date <= ? AND s.name = ?",
                 new Object[]{userId, from, to, status.name()}, (ResultSet rs, int rowNum) -> {
                     VacationDay item = new VacationDay();
-                    item.setDate(rs.getDate("VD.vacation_date").toLocalDate());
-                    item.setFrom(rs.getTime("VD.time_from").toLocalTime());
-                    item.setTo(rs.getTime("VD.time_to").toLocalTime());
-                    item.setType(VacationType.getVacationType(rs.getString("VT.name")));
-                    item.setStatus(Status.getStatus(rs.getString("APS.name")));
+                    item.setDate(rs.getDate("v.vacation_date").toLocalDate());
+
+                    Time timeFrom = rs.getTime("v.time_from");
+                    if(timeFrom != null) {
+                        item.setFrom(timeFrom.toLocalTime());
+                    }
+
+                    Time timeTo = rs.getTime("v.time_to");
+                    if(timeTo != null) {
+                        item.setTo(timeTo.toLocalTime());
+                    }
+
+                    item.setType(VacationType.getVacationType(rs.getString("t.name")));
+                    item.setStatus(Status.getStatus(rs.getString("s.name")));
                     return item;
                 });
     }
 
     public void insertVacationDay(Long userId, VacationDay day) {
         jdbc.update("INSERT INTO vacation_day (vacation_date, time_from, time_to, user_id, status_id, type_id) VALUES (?,?,?,?,?,?)",
-                day.getDate(), day.getFrom(), day.getTo(), userId, day.getStatus().ordinal(), day.getType().ordinal());
+                day.getDate(), day.getFrom(), day.getTo(), userId, 2, day.getType().ordinal() + 1);
     }
 
     public void updateVacationDay(VacationDay item) {
         jdbc.update("UPDATE vacation_day SET vacation_date=?, time_from=?, time_to=?, status_id=?, type_id=? WHERE id=?",
-                item.getDate(), item.getFrom(), item.getTo(), item.getStatus().ordinal(), item.getType().ordinal(), item.getId());
+                item.getDate(), item.getFrom(), item.getTo(), item.getStatus().ordinal() + 1, item.getType().ordinal() + 1, item.getId());
     }
 
     public void deleteVacationDay(long id) {

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

@@ -121 +121 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestParam(value = "status", required = false) String status)
     {
+        System.out.println("/users");
         return handle(getLanguage(lang), () ->
                 manager.getUsers(getStatus(status))
         );
@@ -131 +132 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestParam(value = "status", required = false) String status)
     {
+        System.out.println("/users/requests/vacation");
+        System.out.println("Status" + status);
         return handle(getLanguage(lang), () ->
                 manager.getVacationRequests(getStatus(status))
         );
@@ -141 +144 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestParam(value = "status", required = false) String status)
     {
+        System.out.println("/users/requests/authorization");
         return handle(getLanguage(lang), () ->
                 manager.getAuthorizationRequests(getStatus(status))
          );
@@ -151 +155 @@
             @PathVariable("id") String id,
             @RequestParam(value = "lang", required = false) String lang)
     {
+        System.out.println("/user/{id}/profile");
         return handle(getLanguage(lang), () ->
                 manager.getUserProfile(getUserId(id))
         );
@@ -164 +169 @@
             @RequestParam(value = "to", required = false) String to,
             @RequestParam(value = "status", required = false) String status)
     {
+        System.out.println("user/id/calendar");
         return handle(getLanguage(lang), () -> {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
             LocalDate fromDate = LocalDate.parse(from, formatter);
@@ -176 +182 @@
     public ResponseEntity settings(
             @RequestParam(value = "lang", required = false) String lang)
     {
+        System.out.println("/settings");
         return handle(getLanguage(lang), () ->
                 manager.getDefaultSettings()
         );
@@ -188 +195 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestBody DefaultSettings settings)
     {
+        System.out.println("POST /settings");
         return handle(getLanguage(lang), () ->
                 manager.createSettings(settings)
         );
@@ -198 +206 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestBody VacationDay vacationDay)
     {
+        System.out.println("/user/calendar/create");
         return handle(getLanguage(lang), () ->
                 manager.createVacation(getUserId("me"), vacationDay)
         );
@@ -211 +220 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestBody UserSettings settings)
     {
+        System.out.println("/user/settings");
+        System.out.println(settings.getNotification());
         return handle(getLanguage(lang), () ->
                 manager.changeSettings(getUserId(settings.getId()), settings)
         );
@@ -221 +232 @@
             @RequestParam(value = "lang", required = false) String lang,
             @RequestBody VacationDay vacationDay)
     {
+        System.out.println("/user/calendar/edit");
         return handle(getLanguage(lang), () ->
                 manager.changeVacation(getUserId("me"), vacationDay)
         );
@@ -232 +244 @@
             @RequestParam(value = "type", required = true) String type,
             @RequestBody BasicRequest request)
     {
+        System.out.println("/user/requests");
         return handle(getLanguage(lang), () ->
                 manager.changeRequest(getType(type), request)
         );
@@ -244 +257 @@
             @PathVariable("id") String id,
             @RequestParam(value = "lang", required = false) String lang)
     {
+        System.out.println("/calendar/{id}/delete");
         return handle(getLanguage(lang), () ->
             manager.deleteVacation(getUserId("me"), StringUtils.isNumeric(id) ? Long.parseLong(id) : -1)
         );