Merge pull request #10 from opendx/0.7.7

0.7.7

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.daxiang</groupId>
     <artifactId>server</artifactId>
-    <version>0.7.6</version>
+    <version>0.7.7</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/com/daxiang/service/ProjectService.java

@@ -130,4 +130,8 @@ private List<Project> selectByProject(Project project) {
     public Project getProjectById(Integer id) {
         return projectMapper.selectByPrimaryKey(id);
     }
+
+    public List<Project> getAll() {
+        return projectMapper.selectByExample(null);
+    }
 }

src/main/java/com/daxiang/service/UserService.java

@@ -1,6 +1,5 @@
 package com.daxiang.service;
 
-import com.daxiang.dao.UserDao;
 import com.daxiang.exception.BusinessException;
 import com.daxiang.mbg.mapper.UserMapper;
 import com.daxiang.mbg.po.Project;
@@ -42,13 +41,13 @@ public class UserService {
 
     @Autowired
     private UserMapper userMapper;
-    @Autowired
-    private UserDao userDao;
 
     @Autowired
     private UserRoleService userRoleService;
     @Autowired
     private UserProjectService userProjectService;
+    @Autowired
+    private ProjectService projectService;
 
     @Autowired
     private AuthenticationManager authenticationManager;
@@ -248,8 +247,40 @@ private List<User> selectByUser(User user) {
         return userMapper.selectByExample(example);
     }
 
-    public UserDto getUserDtoByUsername(String useranme) {
-        return userDao.selectUserDtoByUsername(useranme);
+    private User getUserByUsername(String username) {
+        UserExample example = new UserExample();
+        example.createCriteria().andUsernameEqualTo(username);
+        List<User> users = userMapper.selectByExample(example);
+        if (!users.isEmpty()) {
+            return users.get(0);
+        }
+        return null;
+    }
+
+    public UserDto getUserDtoByUsername(String username) {
+        User user = getUserByUsername(username);
+        if (user == null) {
+            return null;
+        }
+
+        UserDto userDto = new UserDto();
+        BeanUtils.copyProperties(user, userDto);
+        List<Integer> singleUid = Collections.singletonList(user.getId());
+
+        List<Role> roles = userRoleService.getUserRoleDtosByUserIds(singleUid).stream()
+                .map(UserRoleDto::getRole).collect(Collectors.toList());
+        userDto.setRoles(roles);
+
+        boolean isAdmin = roles.stream().map(Role::getName).anyMatch("admin"::equals);
+        if (isAdmin) {
+            userDto.setProjects(projectService.getAll());
+        } else {
+            List<Project> projects = userProjectService.getUserProjectDtosByUserIds(singleUid).stream()
+                    .map(UserProjectDto::getProject).collect(Collectors.toList());
+            userDto.setProjects(projects);
+        }
+
+        return userDto;
     }
 
     private List<User> getUsersByIds(List<Integer> userIds) {

src/main/resources/db/migration/V0.7.7__delete_admin_project.sql

@@ -0,0 +1 @@
+delete from `user_project` where user_id = 1;