feat: update org user info

Author: xiaohuangdou666

server/src/main/java/datart/server/base/params/UserAddParam.java

@@ -16,6 +16,10 @@ public class UserAddParam {
 
     private String email;
 
+    private String name;
+
+    private String description;
+
     private Set<String> roleIds = new HashSet<>();
 
 }

server/src/main/java/datart/server/base/params/UserUpdateByIdParam.java

@@ -0,0 +1,35 @@
+/*
+ * Datart
+ * <p>
+ * Copyright 2021
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package datart.server.base.params;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class UserUpdateByIdParam extends UserUpdateParam {
+
+    private String password;
+
+    private Set<String> roleIds = new HashSet<>();
+
+}

server/src/main/java/datart/server/controller/UserController.java

@@ -140,6 +140,18 @@ public ResponseData<Boolean> addUser(@PathVariable String orgId, @Validated @Req
         return ResponseData.success(userService.addUserToOrg(userAddParam, orgId));
     }
 
+    @ApiOperation(value = "add User to organization")
+    @GetMapping("/{orgId}/getUser/{userId}")
+    public ResponseData<UserUpdateByIdParam> selectUserByIdFromOrg(@PathVariable String orgId, @PathVariable String userId) throws MessagingException, UnsupportedEncodingException {
+        return ResponseData.success(userService.selectUserById(userId, orgId));
+    }
+
+    @ApiOperation(value = "update user from organization")
+    @PutMapping(value = "/{orgId}/updateUser")
+    public ResponseData<Boolean> updateUserFromOrg(@PathVariable String orgId, @Validated @RequestBody UserUpdateByIdParam userUpdateParam) {
+        return ResponseData.success(userService.updateUserFromOrg(userUpdateParam, orgId));
+    }
+
     @ApiOperation(value = "User Delete from organization")
     @DeleteMapping(value = "/{orgId}/deleteUser")
     public ResponseData<Boolean> deleteUserFromOrg(@PathVariable String orgId, @RequestParam String userId) {

server/src/main/java/datart/server/service/UserService.java

@@ -64,4 +64,8 @@ public interface UserService extends BaseCRUDService<User, UserMapperExt> {
     boolean addUserToOrg(UserAddParam userAddParam, String orgId) throws MessagingException, UnsupportedEncodingException;
 
     boolean deleteUserFromOrg(String orgId, String userId);
+
+    boolean updateUserFromOrg(UserUpdateByIdParam userUpdateParam, String orgId);
+
+    UserUpdateByIdParam selectUserById(String userId, String orgId);
 }

server/src/main/java/datart/server/service/impl/UserServiceImpl.java

@@ -30,6 +30,7 @@
 import datart.core.common.Application;
 import datart.core.common.UUIDGenerator;
 import datart.core.entity.Organization;
+import datart.core.entity.Role;
 import datart.core.entity.User;
 import datart.core.entity.ext.UserBaseInfo;
 import datart.core.mappers.ext.OrganizationMapperExt;
@@ -39,10 +40,7 @@
 import datart.security.util.SecurityUtils;
 import datart.server.base.dto.OrganizationBaseInfo;
 import datart.server.base.dto.UserProfile;
-import datart.server.base.params.ChangeUserPasswordParam;
-import datart.server.base.params.UserAddParam;
-import datart.server.base.params.UserRegisterParam;
-import datart.server.base.params.UserResetPasswordParam;
+import datart.server.base.params.*;
 import datart.server.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -61,6 +59,7 @@
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static datart.core.common.Application.getProperty;
@@ -378,6 +377,9 @@ public boolean addUserToOrg(UserAddParam userAddParam, String orgId) throws Mess
         BeanUtils.copyProperties(userAddParam, userRegisterParam);
         register(userRegisterParam, false);
         User user = this.userMapper.selectByUsername(userAddParam.getUsername());
+        user.setName(userAddParam.getName());
+        user.setDescription(userAddParam.getDescription());
+        this.userMapper.updateByPrimaryKeySelective(user);
         orgService.addUserToOrg(user.getId(), orgId);
         roleService.updateRolesForUser(user.getId(), orgId, userAddParam.getRoleIds());
         return true;
@@ -392,6 +394,34 @@ public boolean deleteUserFromOrg(String orgId, String userId) {
         return true;
     }
 
+    @Override
+    public boolean updateUserFromOrg(UserUpdateByIdParam userUpdateParam, String orgId) {
+        securityManager.requireOrgOwner(orgId);
+        User user = retrieve(userUpdateParam.getId());
+        if (!user.getEmail().equals(userUpdateParam.getEmail()) && !checkEmail(userUpdateParam.getEmail())) {
+            log.error("The email({}) has been registered", userUpdateParam.getEmail());
+            Exceptions.tr(ParamException.class, "error.param.occupied", "resource.user.email");
+        }
+        if (StringUtils.isBlank(userUpdateParam.getPassword())) {
+            userUpdateParam.setPassword(user.getPassword());
+        } else if (!userUpdateParam.getPassword().equals(user.getPassword())){
+            userUpdateParam.setPassword(BCrypt.hashpw(userUpdateParam.getPassword(), BCrypt.gensalt()));
+        }
+        roleService.updateRolesForUser(user.getId(), orgId, userUpdateParam.getRoleIds());
+        return update(userUpdateParam);
+    }
+
+    @Override
+    public UserUpdateByIdParam selectUserById(String userId, String orgId) {
+        securityManager.requireOrgOwner(orgId);
+        UserUpdateByIdParam res = new UserUpdateByIdParam();
+        User user = this.userMapper.selectByPrimaryKey(userId);
+        BeanUtils.copyProperties(user, res);
+        Set<String> roleIds = roleService.listUserRoles(orgId, userId).stream().map(Role::getId).collect(Collectors.toSet());
+        res.setRoleIds(roleIds);
+        return res;
+    }
+
     @Override
     public void requirePermission(User entity, int permission) {