Revize 6ba63156

re #37 reimplement UserRepository getUser queries back into sanity

Add possibility to search by email.

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

@@ +1 @@
+package org.danekja.ymanager.repository;
+
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
+
+import java.util.List;
+
+public class RepositoryUtils {
+
+    /**
+     * Method which extracts single result from a list which is expected to contains 0 or 1 results.
+     *
+     * @param queryResult query result in form of {@link List}
+     * @param <T>         type of object expected in the list
+     * @return the object from the list or null (when empty)
+     * @throws IncorrectResultSizeDataAccessException when #queryResult contains more than 1 object
+     */
+    public static <T> T singleResult(List<T> queryResult) {
+        switch (queryResult.size()) {
+            case 0:
+                return null;
+            case 1:
+                return queryResult.get(0);
+            default:
+                throw new IncorrectResultSizeDataAccessException(1, queryResult.size());
+        }
+    }
+}

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

@@ -2 +2 @@
 
 import org.danekja.ymanager.domain.User;
 import org.danekja.ymanager.dto.*;
+import org.danekja.ymanager.repository.jdbc.mappers.UserRowMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25 +26 @@
 @Repository
 public class UserRepository {
 
+    private final RowMapper<User> USER_MAPPER = new UserRowMapper();
+
     /**
      * The mapper maps a row from a result of a query to an BasicProfileUser.
      */
@@ -228 +231 @@
 
     }
 
-    public FullUserProfile getFullUser(final String token) {
-        UserRepository.log.trace("Selecting full profile of a user with the specified token from a database: {}", token);
-
-        final Map<String, Object> resultMap = this.getUserColumns(token);
-
-        final FullUserProfile user = new FullUserProfile();
-        user.setId((Long) resultMap.get("out_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.getStatus((String) resultMap.get("out_status")));
-        return user;
-    }
 
     public Optional<DefaultSettings> getLastDefaultSettings() {
         return Optional.ofNullable(this.jdbc.queryForObject("SELECT * FROM default_settings ORDER BY id DESC LIMIT 1", new DefaultSettingsMapper()));
@@ -254 +238 @@
 
     //---------------------------------- DOMAIN -----------------------------------
 
+    /**
+     * Gets user from database based on its email
+     *
+     * @param email email value, used as search key
+     * @return found user object or null (if not found)
+     */
+    public User getUser(final String email) {
+        List<User> users = this.jdbc.query("SELECT * FROM end_user WHERE email = ?", USER_MAPPER, email);
+
+        return RepositoryUtils.singleResult(users);
+    }
+
+    /**
+     * Gets user from database based on its id
+     *
+     * @param id id value, used as search key
+     * @return found user object or null (if not found)
+     */
     public User getUser(final long id) {
-        final Map<String, Object> resultMap = this.getUserColumns(id);
-        User user = new User();
-        user.setId((Long) resultMap.get("out_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.setTotalSickDayCount((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.setToken((String)resultMap.get("out_token"));
-        user.setEmail((String)resultMap.get("out_email"));
-        user.setPhoto((String)resultMap.get("out_photo"));
-        user.setCreationDate(((Timestamp)resultMap.get("out_creation_date")).toLocalDateTime());
-        user.setRole(getUserRole((String)resultMap.get("out_role")));
-        user.setStatus(Status.getStatus((String)resultMap.get("out_status")));
-        return user;
+        List<User> users = this.jdbc.query("SELECT * FROM end_user WHERE id = ?", USER_MAPPER, id);
+
+        return RepositoryUtils.singleResult(users);
     }
 
     public void updateUser(final User user) {

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

@@ +1 @@
+package org.danekja.ymanager.repository.jdbc.mappers;
+
+import org.danekja.ymanager.domain.User;
+import org.danekja.ymanager.dto.Status;
+import org.danekja.ymanager.dto.UserRole;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+/**
+ * Maps "end_user" query rows into User object.
+ */
+public class UserRowMapper implements RowMapper<User> {
+
+    @Override
+    public User mapRow(ResultSet resultSet, int i) throws SQLException {
+        Long id = resultSet.getLong("id");
+        String firstName = resultSet.getString("first_name");
+        String lastName = resultSet.getString("last_name");
+        float vacations = resultSet.getFloat("no_vacations");
+        int sickDays = resultSet.getInt("no_sick_days");
+        int takenSickDays = resultSet.getInt("taken_sick_days");
+
+        Timestamp date = resultSet.getTimestamp("alert");
+        LocalDateTime alert = date != null ? ((Timestamp) date).toLocalDateTime() : null;
+
+        String token = resultSet.getNString("token");
+        String email = resultSet.getString("email");
+        String photo = resultSet.getNString("photo");
+
+        date = resultSet.getTimestamp("creation_date");
+        LocalDateTime creationDate = date.toLocalDateTime();
+        UserRole role = UserRole.valueOf(resultSet.getString("user_role"));
+        Status status = Status.valueOf(resultSet.getString("status"));
+
+        return new User(id, firstName, lastName, vacations, sickDays, takenSickDays, alert, token, email, photo, creationDate, role, status);
+    }
+}