feat(controller): add system role and project roles in the response of getting current user

server/controller/src/main/java/ai/starwhale/mlops/api/protocol/user/UserVo.java

@@ -17,6 +17,7 @@
 package ai.starwhale.mlops.api.protocol.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Map;
 import lombok.Builder;
 import lombok.Data;
 import org.springframework.validation.annotation.Validated;
@@ -35,8 +36,11 @@ public class UserVo {
 
     private Boolean isEnabled;
 
+    private String systemRole;
+
+    private Map<String, String> projectRoles;
 
     public static UserVo empty() {
-        return new UserVo("", "", -1L, false);
+        return new UserVo("", "", -1L, false, "", Map.of());
     }
 }

server/controller/src/main/java/ai/starwhale/mlops/domain/user/UserService.java

@@ -20,6 +20,7 @@
 import ai.starwhale.mlops.api.protocol.user.SystemRoleVo;
 import ai.starwhale.mlops.api.protocol.user.UserRoleVo;
 import ai.starwhale.mlops.api.protocol.user.UserVo;
+import ai.starwhale.mlops.common.IdConvertor;
 import ai.starwhale.mlops.common.PageParams;
 import ai.starwhale.mlops.common.util.PageUtil;
 import ai.starwhale.mlops.configuration.security.SwPasswordEncoder;
@@ -45,7 +46,9 @@
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
@@ -68,21 +71,25 @@ public class UserService implements UserDetailsService {
     private final ProjectMapper projectMapper;
     private final ProjectRoleMapper projectRoleMapper;
     private final ProjectManager projectManager;
+
+    private final IdConvertor idConvertor;
     private final UserConvertor userConvertor;
     private final RoleConvertor roleConvertor;
     private final UserRoleConvertor userRoleConvertor;
     private final SystemRoleConvertor systemRoleConvertor;
     private final SaltGenerator saltGenerator;
 
     public UserService(UserMapper userMapper, RoleMapper roleMapper, ProjectMapper projectMapper,
-            ProjectRoleMapper projectRoleMapper, ProjectManager projectManager, UserConvertor userConvertor,
+            ProjectRoleMapper projectRoleMapper, ProjectManager projectManager, IdConvertor idConvertor,
+            UserConvertor userConvertor,
             RoleConvertor roleConvertor, UserRoleConvertor userRoleConvertor, SystemRoleConvertor systemRoleConvertor,
             SaltGenerator saltGenerator) {
         this.userMapper = userMapper;
         this.roleMapper = roleMapper;
         this.projectMapper = projectMapper;
         this.projectRoleMapper = projectRoleMapper;
         this.projectManager = projectManager;
+        this.idConvertor = idConvertor;
         this.userConvertor = userConvertor;
         this.roleConvertor = roleConvertor;
         this.userRoleConvertor = userRoleConvertor;
@@ -138,7 +145,20 @@ public UserVo currentUser() {
                     .tip(String.format("Unable to find user by name %s", user.getName())),
                     HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return userConvertor.convert(userEntity);
+        UserVo userVo = userConvertor.convert(userEntity);
+        List<ProjectRoleEntity> roleEntities = projectRoleMapper.listUserRoles(userEntity.getId(),
+                null);
+        Map<String, String> roles = new HashMap<>();
+        roleEntities.forEach(entity -> {
+            if (entity.getProject().getId() == 0) {
+                userVo.setSystemRole(entity.getRole().getRoleCode());
+                return;
+            }
+            String key = idConvertor.convert(entity.getProject().getId());
+            roles.put(key, entity.getRole().getRoleCode());
+        });
+        userVo.setProjectRoles(roles);
+        return userVo;
     }
 
     public User currentUserDetail() {

server/controller/src/test/java/ai/starwhale/mlops/domain/user/UserServiceTest.java

@@ -18,6 +18,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.is;
@@ -35,6 +36,7 @@
 import ai.starwhale.mlops.api.protocol.user.SystemRoleVo;
 import ai.starwhale.mlops.api.protocol.user.UserRoleVo;
 import ai.starwhale.mlops.api.protocol.user.UserVo;
+import ai.starwhale.mlops.common.IdConvertor;
 import ai.starwhale.mlops.common.PageParams;
 import ai.starwhale.mlops.configuration.security.SwPasswordEncoder;
 import ai.starwhale.mlops.domain.project.ProjectManager;
@@ -118,7 +120,7 @@ public void setUp() {
         SaltGenerator saltGenerator = mock(SaltGenerator.class);
         given(saltGenerator.salt()).willReturn("salt");
         service = new UserService(userMapper, roleMapper, projectMapper, projectRoleMapper, projectManager,
-                userConvertor, roleConvertor, userRoleConvertor, systemRoleConvertor, saltGenerator);
+                new IdConvertor(), userConvertor, roleConvertor, userRoleConvertor, systemRoleConvertor, saltGenerator);
 
         User current = User.builder().id(1L).name("current").active(true).build();
         var token = new UsernamePasswordAuthenticationToken(current, null);
@@ -143,12 +145,32 @@ public void testCurrentUserDetail() {
 
     @Test
     public void testCurrentUser() {
+        given(projectRoleMapper.listUserRoles(same(1L), isNull()))
+                .willReturn(List.of(
+                        ProjectRoleEntity.builder()
+                                .project(ProjectEntity.builder().id(0L).build())
+                                .role(RoleEntity.builder().roleCode("OWNER").build())
+                                .build(),
+                        ProjectRoleEntity.builder()
+                                .project(ProjectEntity.builder().id(1L).build())
+                                .role(RoleEntity.builder().roleCode("MAINTAINER").build())
+                                .build(),
+                        ProjectRoleEntity.builder()
+                                .project(ProjectEntity.builder().id(2L).build())
+                                .role(RoleEntity.builder().roleCode("GUEST").build())
+                                .build()
+                ));
         var res = service.currentUser();
         assertThat(res, allOf(
                 notNullValue(),
                 hasProperty("id", is("1")),
                 hasProperty("name", is("current")),
-                hasProperty("isEnabled", is(true))
+                hasProperty("isEnabled", is(true)),
+                hasProperty("systemRole", is("OWNER")),
+                hasProperty("projectRoles", allOf(
+                        hasEntry("1", "MAINTAINER"),
+                        hasEntry("2", "GUEST")
+                ))
         ));
     }