Edit user info admin service

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/UserSettings.java

@@ -6,9 +6,11 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import lombok.Data;
 import lombok.NonNull;
+import org.broadinstitute.dsm.exception.DsmInternalError;
 import org.broadinstitute.dsm.statics.DBConstants;
 import org.broadinstitute.dsm.statics.QueryExtension;
 import org.broadinstitute.lddp.db.SimpleResult;
@@ -27,6 +29,8 @@ public class UserSettings {
                     + "WHERE user.user_id = settings.user_id AND user.is_active = 1";
     private static final String SQL_INSERT_USER_SETTINGS = "INSERT INTO user_settings SET user_id = ?";
 
+    private static final String SQL_DELETE_USER_SETTINGS = "DELETE FROM user_settings WHERE user_id = ?";
+
     private static final String USER_ID = "userId";
 
     private int rowsOnPage;
@@ -104,12 +108,38 @@ public static UserSettings getUserSettings(@NonNull String email) {
         return us;
     }
 
-    public static void insertUserSetting(Connection conn, int userId) {
-        try (PreparedStatement insertKit = conn.prepareStatement(SQL_INSERT_USER_SETTINGS)) {
-            insertKit.setInt(1, userId);
-            insertKit.executeUpdate();
-        } catch (SQLException e) {
-            throw new RuntimeException("Error inserting new user_settings ", e);
+    public static int createUserSettings(int userId) {
+        return inTransaction(conn -> insertUserSetting(conn, userId));
+    }
+
+    public static int insertUserSetting(Connection conn, int userId) {
+        int id = -1;
+        try (PreparedStatement stmt = conn.prepareStatement(SQL_INSERT_USER_SETTINGS, Statement.RETURN_GENERATED_KEYS)) {
+            stmt.setInt(1, userId);
+            int result = stmt.executeUpdate();
+            if (result != 1) {
+                throw new DsmInternalError("Error inserting user setting. Result count was " + result);
+            }
+            try (ResultSet rs = stmt.getGeneratedKeys()) {
+                if (rs.next()) {
+                    id = rs.getInt(1);
+                }
+            }
+        } catch (SQLException ex) {
+            throw new DsmInternalError("Error inserting user setting", ex);
         }
+        return id;
+    }
+
+    public static int deleteUserSettings(int userId) {
+        return inTransaction(conn -> {
+            try (PreparedStatement stmt = conn.prepareStatement(SQL_DELETE_USER_SETTINGS)) {
+                stmt.setInt(1, userId);
+                return stmt.executeUpdate();
+            } catch (SQLException ex) {
+                String msg = String.format("Error deleting user settings: userId=%d", userId);
+                throw new DsmInternalError(msg, ex);
+            }
+        });
     }
 }

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/user/UserDao.java

@@ -24,6 +24,8 @@ public class UserDao implements Dao<UserDto> {
     public static final String PHONE_NUMBER = "phone_number";
     public static final String IS_ACTIVE = "is_active";
     private static final String SQL_INSERT_USER = "INSERT INTO access_user (name, email, phone_number, is_active) VALUES (?,?,?,?)";
+    private static final String SQL_UPDATE_USER =
+            "UPDATE access_user SET name = ?, phone_number = ?, is_active = ? WHERE user_id = ?";
     private static final String SQL_DELETE_USER_BY_ID = "DELETE FROM access_user WHERE user_id = ?";
     private static final String SQL_SELECT_USER_BY_EMAIL =
             "SELECT user.user_id, user.name, user.email, user.phone_number, user.is_active FROM access_user user "
@@ -87,7 +89,7 @@ public Optional<UserDto> get(long userId) {
 
     @Override
     public int create(UserDto userDto) {
-        String email = userDto.getEmail().orElse(null);
+        String email = userDto.getEmailOrThrow();
         if (StringUtils.isBlank(email)) {
             throw new DsmInternalError("Error inserting user: email is blank");
         }
@@ -110,6 +112,26 @@ public int create(UserDto userDto) {
         });
     }
 
+    public static void update(int userId, UserDto userDto) {
+        String email = userDto.getEmailOrThrow();
+        String errorMsg = "Error updating user " + email;
+        int res = inTransaction(conn -> {
+            try (PreparedStatement stmt = conn.prepareStatement(SQL_UPDATE_USER)) {
+                stmt.setString(1, userDto.getName().orElse(null));
+                stmt.setString(2, userDto.getPhoneNumber().orElse(null));
+                stmt.setInt(3, userDto.getIsActive().orElse(1));
+                stmt.setInt(4, userId);
+                int result = stmt.executeUpdate();
+                if (result != 1) {
+                    throw new DsmInternalError(errorMsg + " Result count was " + result);
+                }
+                return result;
+            } catch (SQLException ex) {
+                throw new DsmInternalError(errorMsg, ex);
+            }
+        });
+    }
+
     @Override
     public int delete(int id) {
         SimpleResult simpleResult = DaoUtil.deleteById(id, SQL_DELETE_USER_BY_ID);

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dto/user/UserDto.java

@@ -4,6 +4,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Setter;
+import org.broadinstitute.dsm.exception.DsmInternalError;
 
 @Setter
 @AllArgsConstructor
@@ -36,10 +37,20 @@ public Optional<String> getEmail() {
         return Optional.ofNullable(email);
     }
 
+    // TODO: getEmail should always throw on a missing email since it is not nullable
+    // but there are a lot of callers. Feel free to chase them all down and rename this method -DC
+    public String getEmailOrThrow() {
+        return getEmail().orElseThrow(() -> new DsmInternalError("User email cannot be null"));
+    }
+
     public Optional<String> getPhoneNumber() {
         return Optional.ofNullable(phoneNumber);
     }
     public Optional<Integer> getIsActive() {
         return Optional.ofNullable(isActive);
     }
+
+    public boolean isActive() {
+        return getIsActive().orElse(0) == 1;
+    }
 }

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/route/OncHistoryUploadRoute.java

@@ -40,7 +40,7 @@ protected Object processRequest(Request request, Response response, String userI
         String oncHistoryUserId;
         try {
             UserDto user = new UserDao().get(Integer.parseInt(userId)).orElseThrow();
-            oncHistoryUserId = user.getEmail().orElseThrow();
+            oncHistoryUserId = user.getEmailOrThrow();
             if (oncHistoryUserId.isEmpty()) {
                 throw new DsmInternalError("Empty email address");
             }

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/route/admin/UserRoute.java

@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.broadinstitute.dsm.security.RequestHandler;
 import org.broadinstitute.dsm.service.admin.AddUserRequest;
+import org.broadinstitute.dsm.service.admin.UpdateUserRequest;
 import org.broadinstitute.dsm.service.admin.UserAdminService;
 import org.broadinstitute.dsm.service.admin.UserRequest;
 import org.broadinstitute.dsm.statics.RoutePath;
@@ -47,6 +48,20 @@ public Object processRequest(Request request, Response response, String userId)
             } catch (Exception e) {
                 return UserRoleRoute.handleError(e, "adding user", response);
             }
+        } else if (requestMethod.equals(RoutePath.RequestMethod.PUT.toString())) {
+            UpdateUserRequest req;
+            try {
+                req = new Gson().fromJson(body, UpdateUserRequest.class);
+            } catch (Exception e) {
+                log.info("Invalid request format for {}", body);
+                response.status(400);
+                return "Invalid request format";
+            }
+            try {
+                adminService.updateUser(req);
+            } catch (Exception e) {
+                return UserRoleRoute.handleError(e, "updating user", response);
+            }
         } else if (requestMethod.equals(RoutePath.RequestMethod.DELETE.toString())) {
             UserRequest req;
             try {

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/service/admin/AddUserRequest.java

@@ -3,7 +3,9 @@
 import java.util.List;
 
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 import org.broadinstitute.dsm.db.dto.user.UserDto;
+import org.broadinstitute.dsm.exception.DsmInternalError;
 
 @Data
 public class AddUserRequest {
@@ -31,5 +33,18 @@ public User(String email, String name, String phone, List<String> roles) {
         public UserDto asUserDto() {
             return new UserDto(name, email, phone);
         }
+
+        public UserDto asUpdatedUserDto(UserDto userDto) {
+            if (!email.equalsIgnoreCase(userDto.getEmailOrThrow())) {
+                throw new DsmInternalError("Assert: email addresses do not match");
+            }
+            if (!StringUtils.isBlank(name)) {
+                userDto.setName(name);
+            }
+            if (!StringUtils.isBlank(phone)) {
+                userDto.setPhoneNumber(phone);
+            }
+            return userDto;
+        }
     }
 }

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/service/admin/UpdateUserRequest.java

@@ -0,0 +1,33 @@
+package org.broadinstitute.dsm.service.admin;
+
+import java.util.List;
+
+import lombok.Data;
+import org.broadinstitute.dsm.db.dto.user.UserDto;
+
+@Data
+public class UpdateUserRequest {
+
+    private final List<UpdateUserRequest.User> users;
+
+    public UpdateUserRequest(List<UpdateUserRequest.User> users) {
+        this.users = users;
+    }
+
+    @Data
+    public static class User {
+        private final String email;
+        private final String name;
+        private final String phone;
+
+        public User(String email, String name, String phone) {
+            this.email = email;
+            this.name = name;
+            this.phone = phone;
+        }
+
+        public UserDto asUserDto() {
+            return new UserDto(name, email, phone);
+        }
+    }
+}