Revize d83c5707

re #32 use domain classes in repositories

server/src/main/java/org/danekja/ymanager/business/ApiManager.java

@@ -4 +4 @@
 import org.danekja.ymanager.business.auth.anot.IsEmployer;
 import org.danekja.ymanager.business.auth.anot.IsOwner;
 import org.danekja.ymanager.business.auth.anot.IsSignedIn;
-import org.danekja.ymanager.domain.DefaultSettings;
 import org.danekja.ymanager.domain.*;
-import org.danekja.ymanager.dto.*;
+import org.danekja.ymanager.dto.BasicRequestDTO;
+import org.danekja.ymanager.dto.UserSettingsDTO;
+import org.danekja.ymanager.dto.VacationDayDTO;
 import org.danekja.ymanager.repository.RequestRepository;
 import org.danekja.ymanager.repository.SettingsRepository;
 import org.danekja.ymanager.repository.UserRepository;
@@ -49 +50 @@
 
     @Override
     @IsEmployer
-    public List<VacationRequestDTO> getVacationRequests(Status status) {
+    public List<VacationRequest> getVacationRequests(Status status) {
         if (status == null) {
             return requestRepository.getAllVacationRequests();
         } else {
@@ -59 +60 @@
 
     @Override
     @IsEmployer
-    public List<AuthorizationRequestDTO> getAuthorizationRequests(Status status) {
+    public List<AuthorizationRequest> getAuthorizationRequests(Status status) {
         if (status == null) {
             return requestRepository.getAllAuthorizations();
         } else {
@@ -75 +76 @@
 
     @Override
     @IsOwner
-    public List<VacationDayDTO> getUserCalendar(long userId, LocalDate fromDate, LocalDate toDate, Status status) {
-        List<VacationDayDTO> vacations;
+    public List<Vacation> getUserCalendar(long userId, LocalDate fromDate, LocalDate toDate, Status status) {
+        List<Vacation> vacations;
         if (status == null && toDate == null) {
             vacations = vacationRepository.getVacationDays(userId, fromDate);
         } else if (status == null) {

server/src/main/java/org/danekja/ymanager/business/Manager.java

@@ -1 +1 @@
 package org.danekja.ymanager.business;
 
-import org.danekja.ymanager.domain.DefaultSettings;
-import org.danekja.ymanager.domain.RequestType;
-import org.danekja.ymanager.domain.Status;
-import org.danekja.ymanager.dto.*;
+import org.danekja.ymanager.domain.*;
+import org.danekja.ymanager.dto.BasicRequestDTO;
+import org.danekja.ymanager.dto.UserSettingsDTO;
+import org.danekja.ymanager.dto.VacationDayDTO;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -11 +11 @@
 public interface Manager {
 
 
-    List<VacationRequestDTO> getVacationRequests(Status status);
+    List<VacationRequest> getVacationRequests(Status status);
 
-    List<AuthorizationRequestDTO> getAuthorizationRequests(Status status);
+    List<AuthorizationRequest> getAuthorizationRequests(Status status);
 
     DefaultSettings getDefaultSettings();
 
-    List<VacationDayDTO> getUserCalendar(long userId, LocalDate fromDate, LocalDate toDate, Status status);
+    List<Vacation> getUserCalendar(long userId, LocalDate fromDate, LocalDate toDate, Status status);
 
     void createSettings(DefaultSettings settings);
 

server/src/main/java/org/danekja/ymanager/business/UserManager.java

@@ -3 +3 @@
 import org.danekja.ymanager.domain.GoogleUser;
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.User;
-import org.danekja.ymanager.dto.BasicProfileUserDTO;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 
 import java.util.List;
@@ -15 +14 @@
 
     /**
      * List all users with given status.
-     * <p>
-     * TODO: refactor to return domain class instead of DTO as part of #32
      *
      * @param status status filter value
      * @return list of users or empty list if none found
      */
-    List<BasicProfileUserDTO> getUsers(Status status);
+    List<? extends User> getUsers(Status status);
 
     /**
      * Gets user by id (PK)

server/src/main/java/org/danekja/ymanager/business/impl/DefaultUserManager.java

@@ -4 +4 @@
 import org.danekja.ymanager.business.auth.anot.IsEmployer;
 import org.danekja.ymanager.business.auth.anot.IsOwner;
 import org.danekja.ymanager.domain.*;
-import org.danekja.ymanager.dto.BasicProfileUserDTO;
 import org.danekja.ymanager.repository.SettingsRepository;
 import org.danekja.ymanager.repository.UserRepository;
 import org.danekja.ymanager.repository.VacationRepository;
@@ -16 +15 @@
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -60 +58 @@
 
     @Override
     @IsEmployer
-    public List<BasicProfileUserDTO> getUsers(Status status) {
-        List<BasicProfileUserDTO> users = userRepository.getAllBasicUsers(status == null ? Status.ACCEPTED : status);
-
-        LocalDate today = LocalDate.now();
-        LocalDate weekBefore = today.minusWeeks(1);
-        LocalDate weekAfter = today.plusWeeks(1);
-        for (BasicProfileUserDTO user : users) {
-            user.setCalendar(vacationRepository.getVacationDays(user.getId(), weekBefore, weekAfter));
+    public List<? extends User> getUsers(Status status) {
+        if (status == null) {
+            return userRepository.getUsers(Status.ACCEPTED);
+        } else {
+            return userRepository.getUsers(status);
         }
-
-        return users;
     }
 
     @Override

server/src/main/java/org/danekja/ymanager/domain/AuthorizationRequest.java

@@ +1 @@
+package org.danekja.ymanager.domain;
+
+import java.time.LocalDateTime;
+
+/**
+ * User authorization request.
+ */
+public class AuthorizationRequest {
+
+    /**
+     * The user's ID.
+     */
+    private Long id;
+    /**
+     * The user's first name.
+     */
+    private String firstName;
+
+    /**
+     * The user's last name.
+     */
+    private String lastName;
+
+    /**
+     * The date and time of a creation of this authorization request.
+     */
+    private LocalDateTime creationDate;
+
+    /**
+     * The approval status of this authorization request.
+     */
+    private Status status;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public LocalDateTime getCreationDate() {
+        return creationDate;
+    }
+
+    public void setCreationDate(LocalDateTime creationDate) {
+        this.creationDate = creationDate;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "AuthorizationRequest{" +
+                "id=" + id +
+                ", firstName='" + firstName + '\'' +
+                ", lastName='" + lastName + '\'' +
+                ", creationDate=" + creationDate +
+                ", status=" + status +
+                '}';
+    }
+}

server/src/main/java/org/danekja/ymanager/domain/VacationRequest.java

@@ +1 @@
+package org.danekja.ymanager.domain;
+
+/**
+ * Vacation request domain.
+ */
+public class VacationRequest extends Vacation {
+
+    /**
+     * The user's first name.
+     */
+    private String firstName;
+
+    /**
+     * The user's last name.
+     */
+    private String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+}

server/src/main/java/org/danekja/ymanager/dto/AuthorizationRequestDTO.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.AuthorizationRequest;
 import org.danekja.ymanager.domain.Status;
 
 import java.time.LocalDateTime;
@@ -35 +36 @@
      */
     private LocalDateTime timestamp;
 
+    public AuthorizationRequestDTO() {
+    }
+
+    public AuthorizationRequestDTO(AuthorizationRequest authorizationRequest) {
+        this.id = authorizationRequest.getId();
+        this.firstName = authorizationRequest.getFirstName();
+        this.lastName = authorizationRequest.getLastName();
+        this.status = authorizationRequest.getStatus();
+        this.timestamp = authorizationRequest.getCreationDate();
+    }
+
     /**
      * Returns the user's ID.
      *

server/src/main/java/org/danekja/ymanager/dto/BasicProfileUserDTO.java

@@ -1 @@
-package org.danekja.ymanager.dto;
-
-import java.util.List;
-
-/**
- * An instance of the messenger class {@code BasicProfileUser} represents a basic profile of a user in a database.
- * The basic profile contains default, the most important informations which helps identify a user like a name or photo.
- * This class is used to communicate with a frontend.
- */
-public class BasicProfileUserDTO {
-    /**
-     * The user's ID.
-     */
-    private Long id;
-
-    /**
-     * The user's first name.
-     */
-    private String firstName;
-
-    /**
-     * The user's last name.
-     */
-    private String lastName;
-
-    /**
-     * The URL of a user's photo.
-     */
-    private String photo;
-
-    /**
-     * The list of user's vacations.
-     */
-    private List<VacationDayDTO> calendar;
-
-    /**
-     * Returns the user's ID.
-     *
-     * @return the user's ID
-     */
-    public Long getId() {
-        return this.id;
-    }
-
-    /**
-     * Replaces the user's ID with the specified value.
-     *
-     * @param id the new user's ID
-     */
-    public void setId(final Long id) {
-        this.id = id;
-    }
-
-    /**
-     * Returns the user's first name.
-     *
-     * @return the user's first name
-     */
-    public String getFirstName() {
-        return this.firstName;
-    }
-
-    /**
-     * Replaces the user's first name with the new specified value.
-     *
-     * @param firstName the new first name
-     */
-    public void setFirstName(final String firstName) {
-        this.firstName = firstName;
-    }
-
-    /**
-     * Returns the user's last name.
-     *
-     * @return the user's last name
-     */
-    public String getLastName() {
-        return this.lastName;
-    }
-
-    /**
-     * Replaces the user's last name with the given one.
-     *
-     * @param lastName the new last name
-     */
-    public void setLastName(final String lastName) {
-        this.lastName = lastName;
-    }
-
-    /**
-     * Returns the URL of a user's photo.
-     *
-     * @return the URL of the user's photo
-     */
-    public String getPhoto() {
-        return this.photo;
-    }
-
-    /**
-     * Replaces the URL of a user's photo with the given link.
-     *
-     * @param photo the new URL of the user's photo
-     */
-    public void setPhoto(final String photo) {
-        this.photo = photo;
-    }
-
-    /**
-     * Returns the list of user's vacations.
-     *
-     * @return the list of user's vacations
-     */
-    public List<VacationDayDTO> getCalendar() {
-        return this.calendar;
-    }
-
-    /**
-     * Replaces the list of user's vacations with the given list.
-     *
-     * @param calendar the new list of vacations
-     */
-    public void setCalendar(final List<VacationDayDTO> calendar) {
-        this.calendar = calendar;
-    }
-}

server/src/main/java/org/danekja/ymanager/dto/VacationDayDTO.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
 import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.Vacation;
 import org.danekja.ymanager.domain.VacationType;
 
 import java.time.LocalDate;
@@ -41 +42 @@
      */
     private Status status;
 
+    public VacationDayDTO() {
+    }
+
+    public VacationDayDTO(Vacation vacation) {
+        this.id = vacation.getId();
+        this.date = vacation.getDate();
+        this.from = vacation.getFrom();
+        this.to = vacation.getTo();
+        this.type = vacation.getType();
+        this.status = vacation.getStatus();
+    }
+
     /**
      * Returns the ID of this vacation.
      *

server/src/main/java/org/danekja/ymanager/dto/VacationRequestDTO.java

@@ -2 +2 @@
 
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.VacationType;
+import org.danekja.ymanager.domain.VacationRequest;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -58 +59 @@
      */
     private LocalDateTime timestamp;
 
+    public VacationRequestDTO() {
+    }
+
+    public VacationRequestDTO(VacationRequest vacation) {
+        this.id = vacation.getId();
+        this.firstName = vacation.getFirstName();
+        this.lastName = vacation.getLastName();
+        this.date = vacation.getDate();
+        this.from = vacation.getFrom();
+        this.to = vacation.getTo();
+        this.type = vacation.getType();
+        this.status = vacation.getStatus();
+        this.timestamp = vacation.getCreationDate();
+    }
+
     /**
      * Returns the ID of this vacation request.
      *

server/src/main/java/org/danekja/ymanager/repository/RequestRepository.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository;
 
+import org.danekja.ymanager.domain.AuthorizationRequest;
 import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.VacationRequest;
 import org.danekja.ymanager.dto.AuthorizationRequestDTO;
 import org.danekja.ymanager.dto.BasicRequestDTO;
-import org.danekja.ymanager.dto.VacationRequestDTO;
 
 import java.util.List;
 
@@ -24 +25 @@
      *
      * @return the list of all authorization requests
      */
-    List<AuthorizationRequestDTO> getAllAuthorizations();
+    List<AuthorizationRequest> getAllAuthorizations();
 
     /**
      * Gets all authorization request with the given authorization status from a database.
@@ -35 +36 @@
      * @param status the approval status of the requests
      * @return the list of all authorization requests with the given status
      */
-    List<AuthorizationRequestDTO> getAllAuthorizations(final Status status);
+    List<AuthorizationRequest> getAllAuthorizations(final Status status);
 
     /**
      * Updates the status of an authorization request with the given id.
@@ -60 +61 @@
      *
      * @return the list of all vacation requests
      */
-    List<VacationRequestDTO> getAllVacationRequests();
+    List<VacationRequest> getAllVacationRequests();
 
     /**
      * Gets all vacation requests with the given approval status from a database.
@@ -70 +71 @@
      * @param status the approval status of the requests
      * @return the list of all vacation requests with the given status
      */
-    List<VacationRequestDTO> getAllVacationRequests(final Status status);
+    List<VacationRequest> getAllVacationRequests(final Status status);
 
     /**
      * Updates a status of a vacation request with the given id.

server/src/main/java/org/danekja/ymanager/repository/UserRepository.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository;
 
 import org.danekja.ymanager.domain.*;
-import org.danekja.ymanager.dto.BasicProfileUserDTO;
-import org.danekja.ymanager.dto.FullUserProfileDTO;
 
 import java.util.List;
 
@@ -11 +9 @@
  */
 public interface UserRepository {
     /**
-     * Gets basic profile of each user from a database. The basic profile contains default, the most important
-     * informations which helps identify a user like a name or photo. Every line of output is converted to a BasicProfileUser
-     * object filled with data from the database. If there aren't any users in the database, the method returns an empty list.
-     *
-     * @return A list of all basic profiles.
-     */
-    List<BasicProfileUserDTO> getAllBasicUsers();
-
-    /**
-     * Gets basic profile of each user with the given authorization status from a database. The basic profile contains
-     * default, the most important informations which helps identify a user like a name or a photo.
-     * Every line of output is converted to a BasicProfileUser object filled with data from the database.
-     * If there aren't any users with the given authorization status in the database, the method returns an empty list.
+     * Gets users with the given authorization status from a database. If there aren't any users with
+     * the given authorization status in the database, the method returns an empty list.
      *
      * @param status The authentication status.
-     * @return A list of all basic profiles with the given status.
-     */
-    List<BasicProfileUserDTO> getAllBasicUsers(final Status status);
-
-    UserRole getPermission(Long id);
-
-    /**
-     *
-     * @param id
-     * @return
+     * @return A list of all users with the given status.
      */
-    FullUserProfileDTO getFullUser(final long id);
+    List<RegisteredUser> getUsers(final Status status);
 
     /**
      * Gets user from database based on its email

server/src/main/java/org/danekja/ymanager/repository/VacationRepository.java

@@ -2 +2 @@
 
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.Vacation;
-import org.danekja.ymanager.dto.VacationDayDTO;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -10 +9 @@
 
 public interface VacationRepository {
 
-    List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from);
+    List<Vacation> getVacationDays(final long userId, final LocalDate from);
 
-    List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from, final Status status);
+    List<Vacation> getVacationDays(final long userId, final LocalDate from, final Status status);
 
-    List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from, final LocalDate to);
+    List<Vacation> getVacationDays(final long userId, final LocalDate from, final LocalDate to);
 
-    List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from, final LocalDate to, final Status status);
+    List<Vacation> getVacationDays(final long userId, final LocalDate from, final LocalDate to, final Status status);
 
     Optional<Vacation> getVacationDay(final long id);
 

server/src/main/java/org/danekja/ymanager/repository/jdbc/JdbcRequestRepository.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository.jdbc;
 
+import org.danekja.ymanager.domain.AuthorizationRequest;
 import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.VacationRequest;
 import org.danekja.ymanager.dto.AuthorizationRequestDTO;
 import org.danekja.ymanager.dto.BasicRequestDTO;
-import org.danekja.ymanager.dto.VacationRequestDTO;
 import org.danekja.ymanager.repository.RequestRepository;
 import org.danekja.ymanager.repository.jdbc.mappers.AuthorizationRequestMapper;
 import org.danekja.ymanager.repository.jdbc.mappers.VacationRequestMapper;
@@ -23 +24 @@
      */
     private static final Logger log = LoggerFactory.getLogger(JdbcRequestRepository.class);
 
-    private static final VacationRequestMapper VACATION_REQUEST_MAPPER = new VacationRequestMapper();
+    private static final VacationRequestMapper VACATION_WITH_USER_MAPPER = new VacationRequestMapper();
     private static final AuthorizationRequestMapper AUTHORIZATION_REQUEST_MAPPER = new AuthorizationRequestMapper();
 
     /**
@@ -44 +45 @@
     }
 
     @Override
-    public List<AuthorizationRequestDTO> getAllAuthorizations() {
+    public List<AuthorizationRequest> getAllAuthorizations() {
         JdbcRequestRepository.log.trace("Selecting all authorization requests from a database.");
 
         return this.jdbc.query("SELECT id, first_name, last_name, creation_date, status FROM end_user", AUTHORIZATION_REQUEST_MAPPER);
     }
 
     @Override
-    public List<AuthorizationRequestDTO> getAllAuthorizations(final Status status) {
+    public List<AuthorizationRequest> getAllAuthorizations(final Status status) {
         JdbcRequestRepository.log.trace("Selecting all authorization requests from a database with requested status.");
         JdbcRequestRepository.log.debug("Status: {}", status);
 
@@ -72 +73 @@
     }
 
     @Override
-    public List<VacationRequestDTO> getAllVacationRequests() {
+    public List<VacationRequest> getAllVacationRequests() {
         JdbcRequestRepository.log.trace("Selecting all vacation requests from a database.");
 
         return this.jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.creation_date, v.vacation_type, v.status, u.first_name, u.last_name " +
                 "FROM vacation_day v " +
-                "INNER JOIN end_user u ON v.user_id = u.id", VACATION_REQUEST_MAPPER);
+                "INNER JOIN end_user u ON v.user_id = u.id", VACATION_WITH_USER_MAPPER);
     }
 
     @Override
-    public List<VacationRequestDTO> getAllVacationRequests(final Status status) {
+    public List<VacationRequest> getAllVacationRequests(final Status status) {
         JdbcRequestRepository.log.trace("Selecting all vacation requests from a database with requested status.");
         JdbcRequestRepository.log.debug("Status: {}", status);
 
         return this.jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.creation_date, v.vacation_type, v.status, u.first_name, u.last_name " +
                         "FROM vacation_day v " +
                         "INNER JOIN end_user u ON v.user_id = u.id " +
-                        "WHERE v.status=?", VACATION_REQUEST_MAPPER, status.name());
+                        "WHERE v.status=?", VACATION_WITH_USER_MAPPER, status.name());
     }
 
     @Override

server/src/main/java/org/danekja/ymanager/repository/jdbc/JdbcUserRepository.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository.jdbc;
 
 import org.danekja.ymanager.domain.*;
-import org.danekja.ymanager.dto.BasicProfileUserDTO;
-import org.danekja.ymanager.dto.FullUserProfileDTO;
 import org.danekja.ymanager.repository.UserRepository;
-import org.danekja.ymanager.repository.jdbc.mappers.BasicProfileUserMapper;
 import org.danekja.ymanager.repository.jdbc.mappers.UserDataRowMapper;
 import org.danekja.ymanager.repository.jdbc.mappers.UserRowMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.*;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.core.PreparedStatementCreatorFactory;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.stereotype.Repository;
 
-import java.sql.CallableStatement;
-import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
-import static org.danekja.ymanager.domain.UserRole.getUserRole;
-
 @Repository
 public class JdbcUserRepository implements UserRepository {
 
-    private static final RowMapper<BasicProfileUserDTO> BASIC_PROFILE_USER_MAPPER = new BasicProfileUserMapper();
     private static final RowMapper<UserData> USER_DATA_MAPPER = new UserDataRowMapper();
     private static final RowMapper<RegisteredUser> USER_MAPPER = new UserRowMapper(USER_DATA_MAPPER);
 
@@ -52 +45 @@
         this.jdbc = jdbc;
     }
 
-    private Map<String, Object> getUserColumns(final long id) {
-        final List<SqlParameter> paramList = new ArrayList<>();
-        paramList.add(new SqlParameter("in_id", Types.BIGINT));
-        paramList.add(new SqlOutParameter("out_id", Types.BIGINT));
-        paramList.add(new SqlOutParameter("out_first_name", Types.VARCHAR));
-        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_sick_days", Types.INTEGER));
-        paramList.add(new SqlOutParameter("out_alert", Types.TIMESTAMP));
-        paramList.add(new SqlOutParameter("out_token", Types.LONGVARCHAR));
-        paramList.add(new SqlOutParameter("out_email", Types.VARCHAR));
-        paramList.add(new SqlOutParameter("out_photo", Types.LONGVARCHAR));
-        paramList.add(new SqlOutParameter("out_creation_date", Types.TIMESTAMP));
-        paramList.add(new SqlOutParameter("out_role", Types.VARCHAR));
-        paramList.add(new SqlOutParameter("out_status", Types.VARCHAR));
-
-        return jdbc.call(con -> {
-            final 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.INTEGER);
-            callableStatement.registerOutParameter(8, Types.TIMESTAMP);
-            callableStatement.registerOutParameter(9, Types.LONGVARCHAR);
-            callableStatement.registerOutParameter(10, Types.VARCHAR);
-            callableStatement.registerOutParameter(11, Types.LONGVARCHAR);
-            callableStatement.registerOutParameter(12, Types.TIMESTAMP);
-            callableStatement.registerOutParameter(13, Types.VARCHAR);
-            callableStatement.registerOutParameter(14, Types.VARCHAR);
-            return callableStatement;
-        }, paramList);
-    }
-
-    //---------------------------------- DTO -----------------------------------
-
     @Override
-    public List<BasicProfileUserDTO> getAllBasicUsers() {
-        JdbcUserRepository.log.trace("Selecting basic profiles of all users from a database.");
-
-        return this.jdbc.query("SELECT id, first_name, last_name, photo FROM end_user", BASIC_PROFILE_USER_MAPPER);
-    }
-
-    @Override
-    public List<BasicProfileUserDTO> getAllBasicUsers(final Status status) {
-        JdbcUserRepository.log.trace("Selecting basic profiles of all users with a required status from a database.");
-        JdbcUserRepository.log.debug("Status: {}", status);
-
-        return this.jdbc.query("SELECT id, first_name, last_name, photo FROM end_user WHERE status = ?",
-                BASIC_PROFILE_USER_MAPPER, status.name());
+    public List<RegisteredUser> getUsers(final Status status) {
+        return this.jdbc.query("SELECT * FROM end_user WHERE status = ?", USER_MAPPER, status.name());
     }
 
-    @Override
-    public UserRole getPermission(Long id) {
-        return jdbc.queryForObject("SELECT user_role FROM end_user WHERE id = ?" ,new Object[]{id}, (rs, rowNum) ->
-            getUserRole(rs.getString("user_role"))
-        );
-    }
-
-    @Override
-    public FullUserProfileDTO getFullUser(final long id) {
-        JdbcUserRepository.log.debug("Selecting full profile of a user with the specified id from a database: {}", id);
-
-        final Map<String, Object> resultMap = this.getUserColumns(id);
-
-        final FullUserProfileDTO user = new FullUserProfileDTO();
-        user.setId(id);
-        user.setFirstName((String) resultMap.get("out_first_name"));
-        user.setLastName((String) resultMap.get("out_last_name"));
-        user.setVacationCount(((Double) resultMap.get("out_no_vacations")).floatValue());
-        user.setSickDayCount((Integer) resultMap.get("out_no_sick_days"));
-        user.setTakenSickDayCount((Integer) resultMap.get("out_taken_sick_days"));
-        user.setNotification(((Timestamp) resultMap.get("out_alert")).toLocalDateTime());
-        user.setEmail((String) resultMap.get("out_email"));
-        user.setPhoto((String) resultMap.get("out_photo"));
-        user.setRole(getUserRole((String) resultMap.get("out_role")));
-        user.setStatus(Status.valueOf((String) resultMap.get("out_status")));
-        return user;
-
-    }
-
-    //---------------------------------- DOMAIN -----------------------------------
-
     @Override
     public RegisteredUser getUser(final String email) {
         return this.jdbc.queryForObject("SELECT * FROM end_user WHERE email = ?", USER_MAPPER, email);

server/src/main/java/org/danekja/ymanager/repository/jdbc/JdbcVacationRepository.java

@@ -2 +2 @@
 
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.Vacation;
-import org.danekja.ymanager.domain.VacationType;
-import org.danekja.ymanager.dto.VacationDayDTO;
 import org.danekja.ymanager.repository.VacationRepository;
-import org.danekja.ymanager.repository.jdbc.mappers.VacationDayMapper;
 import org.danekja.ymanager.repository.jdbc.mappers.VacationMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14 +11 @@
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
-import java.sql.ResultSet;
-import java.sql.Time;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
@@ -26 +21 @@
 public class JdbcVacationRepository implements VacationRepository {
 
     private static final RowMapper<Vacation> VACATION_MAPPER = new VacationMapper();
-    private static final RowMapper<VacationDayDTO> VACATION_DAY_MAPPER = new VacationDayMapper();
 
     /**
      * The logger.
@@ -51 +45 @@
     }
 
     @Override
-    public List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from) {
-        return jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.status, v.vacation_type " +
-                        "FROM vacation_day v " +
-                        "INNER JOIN end_user u ON v.user_id = u.id " +
-                        "WHERE v.user_id = ? AND v.vacation_date >= ?",
-                VACATION_DAY_MAPPER, userId, from);
+    public List<Vacation> getVacationDays(final long userId, final LocalDate from) {
+        return jdbc.query("SELECT * FROM vacation_day WHERE user_id = ? AND vacation_date >= ?", VACATION_MAPPER, userId, from);
     }
 
     @Override
-    public List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from, final Status status) {
-        return jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.status, v.vacation_type " +
-                        "FROM vacation_day v " +
-                        "INNER JOIN end_user u ON v.user_id = u.id " +
-                        "WHERE v.user_id = ? AND v.vacation_date >= ? AND v.status = ?",
-                VACATION_DAY_MAPPER, userId, from, status.name());
+    public List<Vacation> getVacationDays(final long userId, final LocalDate from, final Status status) {
+        return jdbc.query("SELECT * FROM vacation_day WHERE user_id = ? AND vacation_date >= ? AND status = ?", VACATION_MAPPER, userId, from, status.name());
     }
 
     @Override
-    public List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from, final LocalDate to) {
-        return jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.status, v.vacation_type " +
-                        "FROM vacation_day v " +
-                        "INNER JOIN end_user u ON v.user_id = u.id " +
-                        "WHERE v.user_id=? AND v.vacation_date >= ? AND v.vacation_date <= ?",
-                VACATION_DAY_MAPPER, userId, from, to);
-
+    public List<Vacation> getVacationDays(final long userId, final LocalDate from, final LocalDate to) {
+        return jdbc.query("SELECT * FROM vacation_day WHERE user_id=? AND vacation_date >= ? AND vacation_date <= ?", VACATION_MAPPER, userId, from, to);
     }
 
     @Override
-    public List<VacationDayDTO> getVacationDays(final long userId, final LocalDate from, final LocalDate to, final Status status) {
-        return jdbc.query("SELECT v.id, v.vacation_date, v.time_from, v.time_to, v.status, v.vacation_type " +
-                        "FROM vacation_day v " +
-                        "INNER JOIN end_user u ON v.user_id = u.id " +
-                        "WHERE v.user_id=? AND v.vacation_date >= ? AND v.vacation_date <= ? AND v.status = ?",
-                VACATION_DAY_MAPPER, userId, from, to, status.name());
+    public List<Vacation> getVacationDays(final long userId, final LocalDate from, final LocalDate to, final Status status) {
+        return jdbc.query("SELECT * FROM vacation_day WHERE user_id=? AND vacation_date >= ? AND vacation_date <= ? AND status = ?", VACATION_MAPPER, userId, from, to, status.name());
     }
 
     @Override

server/src/main/java/org/danekja/ymanager/repository/jdbc/mappers/AuthorizationRequestMapper.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository.jdbc.mappers;
 
+import org.danekja.ymanager.domain.AuthorizationRequest;
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.dto.AuthorizationRequestDTO;
 import org.springframework.jdbc.core.RowMapper;
@@ -10 +11 @@
 /**
  * The mapper maps a row from a result of a query to an AuthorizationRequest.
  */
-public class AuthorizationRequestMapper implements RowMapper<AuthorizationRequestDTO> {
+public class AuthorizationRequestMapper implements RowMapper<AuthorizationRequest> {
 
     /**
      * Maps a row from a result of a query to an AuthorizationRequest.
@@ -20 +21 @@
      * @throws SQLException if the columnLabel is not valid; if a database access error occurs or this method is called on a closed result set
      */
     @Override
-    public AuthorizationRequestDTO mapRow(ResultSet resultSet, int i) throws SQLException {
-        final AuthorizationRequestDTO request = new AuthorizationRequestDTO();
+    public AuthorizationRequest mapRow(ResultSet resultSet, int i) throws SQLException {
+        final AuthorizationRequest request = new AuthorizationRequest();
         request.setId(resultSet.getLong("id"));
         request.setFirstName(resultSet.getString("first_name"));
         request.setLastName(resultSet.getString("last_name"));
-        request.setTimestamp(resultSet.getTimestamp("creation_date").toLocalDateTime());
+        request.setCreationDate(resultSet.getTimestamp("creation_date").toLocalDateTime());
         request.setStatus(Status.valueOf(resultSet.getString("status")));
         return request;
     }

server/src/main/java/org/danekja/ymanager/repository/jdbc/mappers/BasicProfileUserMapper.java

@@ -1 @@
-package org.danekja.ymanager.repository.jdbc.mappers;
-
-import org.danekja.ymanager.dto.BasicProfileUserDTO;
-import org.springframework.jdbc.core.RowMapper;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * The mapper maps a row from a result of a query to an BasicProfileUser.
- */
-public class BasicProfileUserMapper implements RowMapper<BasicProfileUserDTO> {
-
-    /**
-     * Maps a row from a result of a query to an BasicProfileUser.
-     * @param resultSet the row from the result
-     * @param i the index of the row
-     * @return the BasicProfileUser object
-     * @throws SQLException if the columnLabel is not valid; if a database access error occurs or this method is called on a closed result set
-     */
-    @Override
-    public BasicProfileUserDTO mapRow(ResultSet resultSet, int i) throws SQLException {
-        final BasicProfileUserDTO user = new BasicProfileUserDTO();
-        user.setId(resultSet.getLong("id"));
-        user.setFirstName(resultSet.getString("first_name"));
-        user.setLastName(resultSet.getString("last_name"));
-        user.setPhoto(resultSet.getString("photo"));
-        return user;
-    }
-}

server/src/main/java/org/danekja/ymanager/repository/jdbc/mappers/VacationDayMapper.java

@@ -1 @@
-package org.danekja.ymanager.repository.jdbc.mappers;
-
-import org.danekja.ymanager.domain.Status;
-import org.danekja.ymanager.domain.VacationType;
-import org.danekja.ymanager.dto.VacationDayDTO;
-import org.springframework.jdbc.core.RowMapper;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Time;
-
-/**
- * The mapper maps a row from a result of a query to an Vacation.
- */
-public class VacationDayMapper implements RowMapper<VacationDayDTO> {
-
-    /**
-     * Maps a row from a result of a query to an Vacation.
-     * @param resultSet the row from the result
-     * @param i the index of the row
-     * @return the Vacation object
-     * @throws SQLException if the columnLabel is not valid; if a database access error occurs or this method is called on a closed result set
-     */
-    @Override
-    public VacationDayDTO mapRow(ResultSet resultSet, int i) throws SQLException {
-        final VacationDayDTO item = new VacationDayDTO();
-        item.setId(resultSet.getLong("v.id"));
-        item.setDate(resultSet.getDate("v.vacation_date").toLocalDate());
-
-        /*
-            When a result contains a sick day it doesn't have specified a start and end time because
-            it can be taken only as a whole day. In this case the v.time_from and v.time_to are null.
-            Which must be handled.
-        */
-        final Time timeFrom = resultSet.getTime("v.time_from");
-        if (timeFrom != null) {
-            item.setFrom(timeFrom.toLocalTime());
-        }
-
-        final Time timeTo = resultSet.getTime("v.time_to");
-        if (timeTo != null) {
-            item.setTo(timeTo.toLocalTime());
-        }
-
-        item.setStatus(Status.valueOf(resultSet.getString("v.status")));
-        item.setType(VacationType.getVacationType(resultSet.getString("v.vacation_type")));
-        return item;
-    }
-}

server/src/main/java/org/danekja/ymanager/repository/jdbc/mappers/VacationRequestMapper.java

@@ -2 +2 @@
 
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.VacationType;
-import org.danekja.ymanager.dto.VacationRequestDTO;
+import org.danekja.ymanager.domain.VacationRequest;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;
@@ -12 +12 @@
 /**
  * The mapper maps each row from a result of a query to a VacationRequest.
  */
-public class VacationRequestMapper implements RowMapper<VacationRequestDTO> {
+public class VacationRequestMapper implements RowMapper<VacationRequest> {
 
     /**
      * Maps a row from a result of a query to an VacationRequest.
@@ -22 +22 @@
      * @throws SQLException if the columnLabel is not valid; if a database access error occurs or this method is called on a closed result set
      */
     @Override
-    public VacationRequestDTO mapRow(ResultSet resultSet, int i) throws SQLException {
-        final VacationRequestDTO request = new VacationRequestDTO();
+    public VacationRequest mapRow(ResultSet resultSet, int i) throws SQLException {
+        final VacationRequest request = new VacationRequest();
         request.setId(resultSet.getLong("v.id"));
         request.setFirstName(resultSet.getString("u.first_name"));
         request.setLastName(resultSet.getString("u.last_name"));
@@ -44 +44 @@
             request.setTo(timeTo.toLocalTime());
         }
 
-        request.setTimestamp(resultSet.getTimestamp("v.creation_date").toLocalDateTime());
+        request.setCreationDate(resultSet.getTimestamp("v.creation_date").toLocalDateTime());
         request.setType(VacationType.getVacationType(resultSet.getString("v.vacation_type")));
         request.setStatus(Status.valueOf(resultSet.getString("v.status")));
         return request;

server/src/main/java/org/danekja/ymanager/ws/rest/ApiController.java

@@ -3 +3 @@
 import org.danekja.ymanager.business.FileExportResult;
 import org.danekja.ymanager.business.FileService;
 import org.danekja.ymanager.business.Manager;
-import org.danekja.ymanager.domain.RequestType;
-import org.danekja.ymanager.domain.Status;
-import org.danekja.ymanager.domain.User;
+import org.danekja.ymanager.domain.*;
 import org.danekja.ymanager.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -17 +15 @@
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 public class ApiController {
@@ -35 +34 @@
 
     @GetMapping("/users/requests/vacation")
     public List<VacationRequestDTO> usersRequestsVacation(@RequestParam(value = "status", required = false) Status status) {
-        return manager.getVacationRequests(status);
+        List<VacationRequest> requests = manager.getVacationRequests(status);
+
+        return requests.stream()
+                .map(VacationRequestDTO::new)
+                .collect(Collectors.toList());
     }
 
     @GetMapping("/users/requests/authorization")
     public List<AuthorizationRequestDTO> userRequestsAuthorization(@RequestParam(value = "status", required = false) Status status) {
-        return manager.getAuthorizationRequests(status);
+        List<AuthorizationRequest> requests = manager.getAuthorizationRequests(status);
+
+        return requests.stream()
+                .map(AuthorizationRequestDTO::new)
+                .collect(Collectors.toList());
     }
 
     @GetMapping("/user/{id}/calendar")
@@ -48 +55 @@
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
         LocalDate fromDate = LocalDate.parse(from, formatter);
         LocalDate toDate = to != null ? LocalDate.parse(to, formatter) : null;
-        return manager.getUserCalendar(id, fromDate, toDate, status);
+        List<Vacation> vacations = manager.getUserCalendar(id, fromDate, toDate, status);
+
+        return vacations.stream()
+                .map(VacationDayDTO::new)
+                .collect(Collectors.toList());
     }
 
     @GetMapping("/settings")

server/src/main/java/org/danekja/ymanager/ws/rest/UserController.java

@@ -3 +3 @@
 import org.danekja.ymanager.business.UserManager;
 import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.User;
-import org.danekja.ymanager.dto.BasicProfileUserDTO;
 import org.danekja.ymanager.dto.FullUserProfileDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
@@ -11 +10 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Controller for Users collection of WS API.
@@ -27 +27 @@
     }
 
     @GetMapping
-    public List<BasicProfileUserDTO> users(@RequestParam(value = "status", required = false) Status status) {
-        return userManager.getUsers(status);
+    public List<FullUserProfileDTO> getUsers(@RequestParam(value = "status", required = false) Status status) {
+        List<? extends User> users = userManager.getUsers(status);
+
+        return users.stream()
+                .map(FullUserProfileDTO::new)
+                .collect(Collectors.toList());
     }