Revize 1ef59cb8

Re #7551 Remove taken vacations from api and db

server/init.sql

@@ -36 +36 @@
   id BIGINT NOT NULL AUTO_INCREMENT,
   first_name VARCHAR(45) NOT NULL,
   last_name VARCHAR(45) NOT NULL,
-  no_vacations FLOAT,
+  no_vacations FLOAT NOT NULL,
   no_sick_days INT,
-  taken_vacations FLOAT NOT NULL,
   taken_sick_days INT NOT NULL,
   alert DATETIME,
   token TEXT NOT NULL,
@@ -111 +110 @@
   OUT out_last_name VARCHAR(45),
   OUT out_no_vacations FLOAT,
   OUT out_no_sick_days INT,
-  OUT out_taken_vacations FLOAT,
   OUT out_taken_sick_days INT,
   OUT out_alert DATETIME,
   OUT out_email VARCHAR(100),
@@ -124 +122 @@
   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_vacation, IFNULL(EU.no_sick_days, sickDaysCount), EU.taken_vacations, EU.taken_sick_days, IFNULL(EU.alert, notification), EU.email, EU.photo, EU.creation_date, R.name, APS.name
-     INTO out_id, out_first_name, out_last_name, out_no_vacations, out_no_sick_days, out_taken_vacations, out_taken_sick_days, out_alert, out_email, out_photo, out_creation_date, out_role, out_status
+  SELECT EU.id, EU.first_name, EU.last_name, EU.no_vacation, 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
+     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
@@ -140 +138 @@
   OUT out_last_name VARCHAR(45),
   OUT out_no_vacations FLOAT,
   OUT out_no_sick_days INT,
-  OUT out_taken_vacations FLOAT,
   OUT out_taken_sick_days INT,
   OUT out_alert DATETIME,
   OUT out_email VARCHAR(100),
@@ -153 +150 @@
   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_vacation, IFNULL(EU.no_sick_days, sickDaysCount), EU.taken_vacations, EU.taken_sick_days, IFNULL(EU.alert, notification), EU.email, EU.photo, EU.creation_date, R.name, APS.name
-     INTO out_id, out_first_name, out_last_name, out_no_vacations, out_no_sick_days, out_taken_vacations, out_taken_sick_days, out_alert, out_email, out_photo, out_creation_date, out_role, out_status
+  SELECT EU.id, EU.first_name, EU.last_name, EU.no_vacation, 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
+     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
@@ -185 +182 @@
 -- -----------------------------------------------------
 -- Insert table end_user
 -- -----------------------------------------------------
-INSERT INTO end_user (first_name, last_name, no_vacations, no_sick_days, taken_vacations, taken_sick_days, alert, token, email, photo, role_id, status_id) VALUES ('admin', 'admin', NULL, 5, 0, 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 ('admin', 'admin', 0, NULL, 0, NULL, '', '', '', 2, 1);
 
 -- -----------------------------------------------------
 -- Insert table vacation_day

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

@@ -11 +11 @@
     private String photo;
     private Float vacationCount;
     private Integer sickdayCount;
-    private Float takenVacationCount;
     private Integer takenSickdayCount;
     private Status status;
     private UserRole role;
@@ -38 +37 @@
         return firstName;
     }
 
-    public Float getTakenVacationCount() {
-        return takenVacationCount;
-    }
-
-    public void setTakenVacationCount(Float takenVacationCount) {
-        this.takenVacationCount = takenVacationCount;
-    }
-
     public Integer getTakenSickdayCount() {
         return takenSickdayCount;
     }

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

@@ -60 +60 @@
         paramList.add(new SqlOutParameter("out_last_name", Types.VARCHAR));
         paramList.add(new SqlOutParameter("out_no_vacations", Types.FLOAT));
         paramList.add(new SqlOutParameter("out_no_sick_days", Types.INTEGER));
-        paramList.add(new SqlOutParameter("out_taken_vacations", Types.FLOAT));
         paramList.add(new SqlOutParameter("out_taken_sick_days", Types.INTEGER));
         paramList.add(new SqlOutParameter("out_alert", Types.DATE));
         paramList.add(new SqlOutParameter("out_email", Types.VARCHAR));
@@ -70 +69 @@
         paramList.add(new SqlOutParameter("out_status", Types.VARCHAR));
 
         Map<String, Object> resultMap = this.jdbc.call(con -> {
-            CallableStatement callableStatement = con.prepareCall("{call GetUserId(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}");
+            CallableStatement callableStatement = con.prepareCall("{call GetUserId(?,?,?,?,?,?,?,?,?,?,?,?,?)}");
             callableStatement.setLong(1, id);
             callableStatement.registerOutParameter(2, Types.BIGINT);
             callableStatement.registerOutParameter(3, Types.VARCHAR);
             callableStatement.registerOutParameter(4, Types.VARCHAR);
             callableStatement.registerOutParameter(5, Types.FLOAT);
             callableStatement.registerOutParameter(6, Types.INTEGER);
-            callableStatement.registerOutParameter(7, Types.FLOAT);
-            callableStatement.registerOutParameter(8, Types.INTEGER);
-            callableStatement.registerOutParameter(9, Types.DATE);
-            callableStatement.registerOutParameter(10, Types.VARCHAR);
-            callableStatement.registerOutParameter(11, Types.LONGNVARCHAR);
-            callableStatement.registerOutParameter(12, Types.DATE);
+            callableStatement.registerOutParameter(7, Types.INTEGER);
+            callableStatement.registerOutParameter(8, Types.DATE);
+            callableStatement.registerOutParameter(9, Types.VARCHAR);
+            callableStatement.registerOutParameter(10, Types.LONGNVARCHAR);
+            callableStatement.registerOutParameter(11, Types.DATE);
+            callableStatement.registerOutParameter(12, Types.VARCHAR);
             callableStatement.registerOutParameter(13, Types.VARCHAR);
-            callableStatement.registerOutParameter(14, Types.VARCHAR);
             return callableStatement;
         }, paramList);
 
@@ -94 +92 @@
         user.setLastName((String)resultMap.get("out_last_name"));
         user.setVacationCount((float)resultMap.get("out_no_vacations"));
         user.setSickdayCount((int)resultMap.get("out_no_sick_days"));
-        user.setTakenVacationCount((float)resultMap.get("out_taken_vacations"));
         user.setTakenSickdayCount((int)resultMap.get("out_taken_sick_days"));
         user.setNotification(((Timestamp)resultMap.get("out_alert")).toLocalDateTime());
         user.setEmail((String)resultMap.get(("out_email")));
@@ -113 +110 @@
         paramList.add(new SqlOutParameter("out_last_name", Types.VARCHAR));
         paramList.add(new SqlOutParameter("out_no_vacations", Types.FLOAT));
         paramList.add(new SqlOutParameter("out_no_sick_days", Types.INTEGER));
-        paramList.add(new SqlOutParameter("out_taken_vacations", Types.FLOAT));
         paramList.add(new SqlOutParameter("out_taken_sick_days", Types.INTEGER));
         paramList.add(new SqlOutParameter("out_alert", Types.DATE));
         paramList.add(new SqlOutParameter("out_email", Types.VARCHAR));
@@ -123 +119 @@
         paramList.add(new SqlOutParameter("out_status", Types.VARCHAR));
 
         Map<String, Object> resultMap = this.jdbc.call(con -> {
-            CallableStatement callableStatement = con.prepareCall("{call GetUserToken(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}");
+            CallableStatement callableStatement = con.prepareCall("{call GetUserToken(?,?,?,?,?,?,?,?,?,?,?,?,?)}");
             callableStatement.setString(1, token);
             callableStatement.registerOutParameter(2, Types.BIGINT);
             callableStatement.registerOutParameter(3, Types.VARCHAR);
             callableStatement.registerOutParameter(4, Types.VARCHAR);
             callableStatement.registerOutParameter(5, Types.FLOAT);
             callableStatement.registerOutParameter(6, Types.INTEGER);
-            callableStatement.registerOutParameter(7, Types.FLOAT);
-            callableStatement.registerOutParameter(8, Types.INTEGER);
-            callableStatement.registerOutParameter(9, Types.DATE);
-            callableStatement.registerOutParameter(10, Types.VARCHAR);
-            callableStatement.registerOutParameter(11, Types.LONGNVARCHAR);
-            callableStatement.registerOutParameter(12, Types.DATE);
+            callableStatement.registerOutParameter(7, Types.INTEGER);
+            callableStatement.registerOutParameter(8, Types.DATE);
+            callableStatement.registerOutParameter(9, Types.VARCHAR);
+            callableStatement.registerOutParameter(10, Types.LONGNVARCHAR);
+            callableStatement.registerOutParameter(11, Types.DATE);
+            callableStatement.registerOutParameter(12, Types.VARCHAR);
             callableStatement.registerOutParameter(13, Types.VARCHAR);
-            callableStatement.registerOutParameter(14, Types.VARCHAR);
             return callableStatement;
         }, paramList);
 
@@ -147 +142 @@
         user.setLastName((String)resultMap.get("out_last_name"));
         user.setVacationCount((float)resultMap.get("out_no_vacations"));
         user.setSickdayCount((int)resultMap.get("out_no_sick_days"));
-        user.setTakenVacationCount((float)resultMap.get("out_taken_vacations"));
         user.setTakenSickdayCount((int)resultMap.get("out_taken_sick_days"));
         user.setNotification(((Timestamp)resultMap.get("out_alert")).toLocalDateTime());
         user.setEmail((String)resultMap.get(("out_email")));