完善 RoleServiceImpl 单元测试

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java

@@ -213,7 +213,7 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
 
     private void validTaskAssignRuleOptions(Integer type, Set<Long> options) {
         if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.ROLE.getType())) {
-            roleApi.validRoles(options);
+            roleApi.validRoleList(options);
         } else if (ObjectUtils.equalsAny(type, BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(),
             BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) {
             deptApi.validateDeptList(options);

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java

@@ -20,6 +20,6 @@ public interface RoleApi {
     @GetMapping(PREFIX + "/valid")
     @ApiOperation("校验角色是否合法")
     @ApiImplicitParam(name = "ids", value = "角色编号数组", example = "1,2", required = true, allowMultiple = true)
-    CommonResult<Boolean> validRoles(@RequestParam("ids") Collection<Long> ids);
+    CommonResult<Boolean> validRoleList(@RequestParam("ids") Collection<Long> ids);
 
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuIdEnum.java

-package cn.iocoder.yudao.module.system.enums.permission;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * Menu 编号枚举
- */
-@Getter
-@AllArgsConstructor
-public enum MenuIdEnum {
-
-    /**
-     * 根节点
-     */
-    ROOT(0L);
-
-    private final Long id;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApiImpl.java

@@ -22,8 +22,8 @@ public class RoleApiImpl implements RoleApi {
     private RoleService roleService;
 
     @Override
-    public CommonResult<Boolean> validRoles(Collection<Long> ids) {
-        roleService.validRoles(ids);
+    public CommonResult<Boolean> validRoleList(Collection<Long> ids) {
+        roleService.validateRoleList(ids);
         return success(true);
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -98,7 +98,7 @@ public class AuthController {
         }
         // 获得角色列表
         Set<Long> roleIds = permissionService.getUserRoleIdsFromCache(getLoginUserId(), singleton(CommonStatusEnum.ENABLE.getStatus()));
-        List<RoleDO> roleList = roleService.getRolesFromCache(roleIds);
+        List<RoleDO> roleList = roleService.getRoleListFromCache(roleIds);
         // 获得菜单列表
         List<MenuDO> menuList = permissionService.getRoleMenuListFromCache(roleIds,
                 SetUtils.asSet(MenuTypeEnum.DIR.getType(), MenuTypeEnum.MENU.getType(), MenuTypeEnum.BUTTON.getType()),

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java

@@ -20,12 +20,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static java.util.Collections.singleton;
 
 @Api(tags = "管理后台 - 角色")
 @RestController
@@ -85,9 +85,9 @@ public class RoleController {
 
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获取角色精简信息列表", notes = "只包含被开启的角色，主要用于前端的下拉选项")
-    public CommonResult<List<RoleSimpleRespVO>> getSimpleRoles() {
+    public CommonResult<List<RoleSimpleRespVO>> getSimpleRoleList() {
         // 获得角色列表，只要开启状态的
-        List<RoleDO> list = roleService.getRoles(Collections.singleton(CommonStatusEnum.ENABLE.getStatus()));
+        List<RoleDO> list = roleService.getRoleListByStatus(singleton(CommonStatusEnum.ENABLE.getStatus()));
         // 排序后，返回给前端
         list.sort(Comparator.comparing(RoleDO::getSort));
         return success(RoleConvert.INSTANCE.convertList02(list));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java

@@ -63,7 +63,7 @@ public class UserProfileController {
         AdminUserDO user = userService.getUser(getLoginUserId());
         UserProfileRespVO resp = UserConvert.INSTANCE.convert03(user);
         // 获得用户角色
-        List<RoleDO> userRoles = roleService.getRolesFromCache(permissionService.getUserRoleIdListByUserId(user.getId()));
+        List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(user.getId()));
         resp.setRoles(UserConvert.INSTANCE.convertList(userRoles));
         // 获得部门信息
         if (user.getDeptId() != null) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java

@@ -9,13 +9,15 @@ import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
-import cn.iocoder.yudao.module.system.enums.permission.MenuIdEnum;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT;
+
 @Mapper
 public interface AuthConvert {
 
@@ -26,8 +28,8 @@ public interface AuthConvert {
     default AuthPermissionInfoRespVO convert(AdminUserDO user, List<RoleDO> roleList, List<MenuDO> menuList) {
         return AuthPermissionInfoRespVO.builder()
             .user(AuthPermissionInfoRespVO.UserVO.builder().id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).build())
-            .roles(CollectionUtils.convertSet(roleList, RoleDO::getCode))
-            .permissions(CollectionUtils.convertSet(menuList, MenuDO::getPermission))
+            .roles(convertSet(roleList, RoleDO::getCode))
+            .permissions(convertSet(menuList, MenuDO::getPermission))
             .build();
     }
 
@@ -47,7 +49,7 @@ public interface AuthConvert {
         Map<Long, AuthMenuRespVO> treeNodeMap = new LinkedHashMap<>();
         menuList.forEach(menu -> treeNodeMap.put(menu.getId(), AuthConvert.INSTANCE.convertTreeNode(menu)));
         // 处理父子关系
-        treeNodeMap.values().stream().filter(node -> !node.getParentId().equals(MenuIdEnum.ROOT.getId())).forEach(childNode -> {
+        treeNodeMap.values().stream().filter(node -> !node.getParentId().equals(ID_ROOT)).forEach(childNode -> {
             // 获得父节点
             AuthMenuRespVO parentNode = treeNodeMap.get(childNode.getParentId());
             if (parentNode == null) {
@@ -62,7 +64,7 @@ public interface AuthConvert {
             parentNode.getChildren().add(childNode);
         });
         // 获得到所有的根节点
-        return CollectionUtils.filterList(treeNodeMap.values(), node -> MenuIdEnum.ROOT.getId().equals(node.getParentId()));
+        return filterList(treeNodeMap.values(), node -> ID_ROOT.equals(node.getParentId()));
     }
 
     SocialUserBindReqDTO convert(Long userId, Integer userType, AuthSocialBindLoginReqVO reqVO);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java

@@ -158,7 +158,7 @@ public class PermissionServiceImpl implements PermissionService {
         }
 
         // 判断角色是否包含超级管理员。如果是超级管理员，获取到全部
-        List<RoleDO> roleList = roleService.getRolesFromCache(roleIds);
+        List<RoleDO> roleList = roleService.getRoleListFromCache(roleIds);
         if (roleService.hasAnySuperAdmin(roleList)) {
             return menuService.getMenuListFromCache(menuTypes, menusStatuses);
         }
@@ -371,7 +371,7 @@ public class PermissionServiceImpl implements PermissionService {
         if (roleService.hasAnySuperAdmin(roleIds)) {
             return true;
         }
-        Set<String> userRoles = convertSet(roleService.getRolesFromCache(roleIds),
+        Set<String> userRoles = convertSet(roleService.getRoleListFromCache(roleIds),
                 RoleDO::getCode);
         return CollUtil.containsAny(userRoles, Sets.newHashSet(roles));
     }
@@ -388,7 +388,7 @@ public class PermissionServiceImpl implements PermissionService {
             result.setSelf(true);
             return result;
         }
-        List<RoleDO> roles = roleService.getRolesFromCache(roleIds);
+        List<RoleDO> roles = roleService.getRoleListFromCache(roleIds);
 
         // 获得用户的部门编号的缓存，通过 Guava 的 Suppliers 惰性求值，即有且仅有第一次发起 DB 的查询
         Supplier<Long> userDeptIdCache = Suppliers.memoize(() -> userService.getUser(userId).getDeptId());

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java

@@ -79,7 +79,7 @@ public interface RoleService {
      * @param statuses 筛选的状态。允许空，空时不筛选
      * @return 角色列表
      */
-    List<RoleDO> getRoles(@Nullable Collection<Integer> statuses);
+    List<RoleDO> getRoleListByStatus(@Nullable Collection<Integer> statuses);
 
     /**
      * 获得角色数组，从缓存中
@@ -87,7 +87,7 @@ public interface RoleService {
      * @param ids 角色编号数组
      * @return 角色数组
      */
-    List<RoleDO> getRolesFromCache(Collection<Long> ids);
+    List<RoleDO> getRoleListFromCache(Collection<Long> ids);
 
     /**
      * 判断角色数组中，是否有超级管理员
@@ -104,7 +104,7 @@ public interface RoleService {
      * @return 是否有管理员
      */
     default boolean hasAnySuperAdmin(Set<Long> ids) {
-        return hasAnySuperAdmin(getRolesFromCache(ids));
+        return hasAnySuperAdmin(getRoleListFromCache(ids));
     }
 
     /**
@@ -138,6 +138,6 @@ public interface RoleService {
      *
      * @param ids 角色编号数组
      */
-    void validRoles(Collection<Long> ids);
+    void validateRoleList(Collection<Long> ids);
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExportReqVO;
@@ -34,6 +33,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -76,7 +76,7 @@ public class RoleServiceImpl implements RoleService {
             log.info("[initLocalCache][缓存角色，数量为:{}]", roleList.size());
 
             // 第二步：构建缓存
-            roleCache = CollectionUtils.convertMap(roleList, RoleDO::getId);
+            roleCache = convertMap(roleList, RoleDO::getId);
         });
     }
 
@@ -84,7 +84,7 @@ public class RoleServiceImpl implements RoleService {
     @Transactional
     public Long createRole(RoleCreateReqVO reqVO, Integer type) {
         // 校验角色
-        checkDuplicateRole(reqVO.getName(), reqVO.getCode(), null);
+        validateRoleDuplicate(reqVO.getName(), reqVO.getCode(), null);
         // 插入到数据库
         RoleDO role = RoleConvert.INSTANCE.convert(reqVO);
         role.setType(ObjectUtil.defaultIfNull(type, RoleTypeEnum.CUSTOM.getType()));
@@ -105,13 +105,13 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public void updateRole(RoleUpdateReqVO reqVO) {
         // 校验是否可以更新
-        checkUpdateRole(reqVO.getId());
+        validateRoleForUpdate(reqVO.getId());
         // 校验角色的唯一字段是否重复
-        checkDuplicateRole(reqVO.getName(), reqVO.getCode(), reqVO.getId());
+        validateRoleDuplicate(reqVO.getName(), reqVO.getCode(), reqVO.getId());
 
         // 更新到数据库
-        RoleDO updateObject = RoleConvert.INSTANCE.convert(reqVO);
-        roleMapper.updateById(updateObject);
+        RoleDO updateObj = RoleConvert.INSTANCE.convert(reqVO);
+        roleMapper.updateById(updateObj);
         // 发送刷新消息
         roleProducer.sendRoleRefreshMessage();
     }
@@ -119,12 +119,11 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public void updateRoleStatus(Long id, Integer status) {
         // 校验是否可以更新
-        checkUpdateRole(id);
+        validateRoleForUpdate(id);
+
         // 更新状态
-        RoleDO updateObject = new RoleDO();
-        updateObject.setId(id);
-        updateObject.setStatus(status);
-        roleMapper.updateById(updateObject);
+        RoleDO updateObj = new RoleDO().setId(id).setStatus(status);
+        roleMapper.updateById(updateObj);
         // 发送刷新消息
         roleProducer.sendRoleRefreshMessage();
     }
@@ -132,7 +131,8 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public void updateRoleDataScope(Long id, Integer dataScope, Set<Long> dataScopeDeptIds) {
         // 校验是否可以更新
-        checkUpdateRole(id);
+        validateRoleForUpdate(id);
+
         // 更新数据范围
         RoleDO updateObject = new RoleDO();
         updateObject.setId(id);
@@ -147,7 +147,7 @@ public class RoleServiceImpl implements RoleService {
     @Transactional(rollbackFor = Exception.class)
     public void deleteRole(Long id) {
         // 校验是否可以更新
-        this.checkUpdateRole(id);
+        validateRoleForUpdate(id);
         // 标记删除
         roleMapper.deleteById(id);
         // 删除相关数据
@@ -169,7 +169,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public List<RoleDO> getRoles(@Nullable Collection<Integer> statuses) {
+    public List<RoleDO> getRoleListByStatus(@Nullable Collection<Integer> statuses) {
         if (CollUtil.isEmpty(statuses)) {
             return roleMapper.selectList();
         }
@@ -177,7 +177,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public List<RoleDO> getRolesFromCache(Collection<Long> ids) {
+    public List<RoleDO> getRoleListFromCache(Collection<Long> ids) {
         if (CollectionUtil.isEmpty(ids)) {
             return Collections.emptyList();
         }
@@ -219,7 +219,7 @@ public class RoleServiceImpl implements RoleService {
      * @param id 角色编号
      */
     @VisibleForTesting
-    public void checkDuplicateRole(String name, String code, Long id) {
+    void validateRoleDuplicate(String name, String code, Long id) {
         // 0. 超级管理员，不允许创建
         if (RoleCodeEnum.isSuperAdmin(code)) {
             throw exception(ROLE_ADMIN_CODE_ERROR, code);
@@ -246,7 +246,7 @@ public class RoleServiceImpl implements RoleService {
      * @param id 角色编号
      */
     @VisibleForTesting
-    public void checkUpdateRole(Long id) {
+    void validateRoleForUpdate(Long id) {
         RoleDO roleDO = roleMapper.selectById(id);
         if (roleDO == null) {
             throw exception(ROLE_NOT_EXISTS);
@@ -258,13 +258,13 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public void validRoles(Collection<Long> ids) {
+    public void validateRoleList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {
             return;
         }
         // 获得角色信息
         List<RoleDO> roles = roleMapper.selectBatchIds(ids);
-        Map<Long, RoleDO> roleMap = CollectionUtils.convertMap(roles, RoleDO::getId);
+        Map<Long, RoleDO> roleMap = convertMap(roles, RoleDO::getId);
         // 校验
         ids.forEach(id -> {
             RoleDO role = roleMap.get(id);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -158,7 +158,7 @@ public class TenantServiceImpl implements TenantService {
     public void updateTenantRoleMenu(Long tenantId, Set<Long> menuIds) {
         TenantUtils.execute(tenantId, () -> {
             // 获得所有角色
-            List<RoleDO> roles = roleService.getRoles(null);
+            List<RoleDO> roles = roleService.getRoleListByStatus(null);
             roles.forEach(role -> Assert.isTrue(tenantId.equals(role.getTenantId()), "角色({}/{}) 租户不匹配",
                     role.getId(), role.getTenantId(), tenantId)); // 兜底校验
             // 重新分配每个角色的权限

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java

@@ -106,7 +106,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         Collection<Integer> menusStatuses = asList(0, 1);
         // mock 方法
         List<RoleDO> roleList = singletonList(randomPojo(RoleDO.class, o -> o.setId(100L)));
-        when(roleService.getRolesFromCache(eq(roleIds))).thenReturn(roleList);
+        when(roleService.getRoleListFromCache(eq(roleIds))).thenReturn(roleList);
         when(roleService.hasAnySuperAdmin(same(roleList))).thenReturn(true);
         List<MenuDO> menuList = randomPojoList(MenuDO.class);
         when(menuService.getMenuListFromCache(eq(menuTypes), eq(menusStatuses))).thenReturn(menuList);
@@ -419,7 +419,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
                 .setStatus(CommonStatusEnum.ENABLE.getStatus()));
         when(roleService.getRoleFromCache(eq(100L))).thenReturn(role);
         // mock 其它方法
-        when(roleService.getRolesFromCache(eq(asSet(100L)))).thenReturn(singletonList(role));
+        when(roleService.getRoleListFromCache(eq(asSet(100L)))).thenReturn(singletonList(role));
 
         // 调用
         boolean has = permissionService.hasAnyRoles(userId, roles);
@@ -436,7 +436,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         // mock 获得用户的角色
         RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setDataScope(DataScopeEnum.ALL.getScope())
                 .setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        when(roleService.getRolesFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
+        when(roleService.getRoleListFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
         when(roleService.getRoleFromCache(eq(2L))).thenReturn(roleDO);
 
         // 调用
@@ -456,7 +456,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         // mock 获得用户的角色
         RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setDataScope(DataScopeEnum.DEPT_CUSTOM.getScope())
                 .setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        when(roleService.getRolesFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
+        when(roleService.getRoleListFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
         when(roleService.getRoleFromCache(eq(2L))).thenReturn(roleDO);
         // mock 部门的返回
         when(userService.getUser(eq(1L))).thenReturn(new AdminUserDO().setDeptId(3L), null, null); // 最后返回 null 的目的，看看会不会重复调用
@@ -480,7 +480,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         // mock 获得用户的角色
         RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setDataScope(DataScopeEnum.DEPT_ONLY.getScope())
                 .setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        when(roleService.getRolesFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
+        when(roleService.getRoleListFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
         when(roleService.getRoleFromCache(eq(2L))).thenReturn(roleDO);
         // mock 部门的返回
         when(userService.getUser(eq(1L))).thenReturn(new AdminUserDO().setDeptId(3L), null, null); // 最后返回 null 的目的，看看会不会重复调用
@@ -503,7 +503,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         // mock 获得用户的角色
         RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setDataScope(DataScopeEnum.DEPT_AND_CHILD.getScope())
                 .setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        when(roleService.getRolesFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
+        when(roleService.getRoleListFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
         when(roleService.getRoleFromCache(eq(2L))).thenReturn(roleDO);
         // mock 部门的返回
         when(userService.getUser(eq(1L))).thenReturn(new AdminUserDO().setDeptId(3L), null, null); // 最后返回 null 的目的，看看会不会重复调用
@@ -531,7 +531,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         // mock 获得用户的角色
         RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setDataScope(DataScopeEnum.SELF.getScope())
                 .setStatus(CommonStatusEnum.ENABLE.getStatus()));
-        when(roleService.getRolesFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
+        when(roleService.getRoleListFromCache(eq(singleton(2L)))).thenReturn(singletonList(roleDO));
         when(roleService.getRoleFromCache(eq(2L))).thenReturn(roleDO);
 
         // 调用

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceTest.java → yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java

 package cn.iocoder.yudao.module.system.service.permission;
 
-import cn.hutool.core.util.RandomUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
@@ -18,21 +17,26 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+import static java.util.Collections.singleton;
+import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.verify;
 
-// TODO @芋艿：单测的代码质量可以提升下
 @Import(RoleServiceImpl.class)
-public class RoleServiceTest extends BaseDbUnitTest {
+public class RoleServiceImplTest extends BaseDbUnitTest {
 
     @Resource
     private RoleServiceImpl roleService;
@@ -47,9 +51,9 @@ public class RoleServiceTest extends BaseDbUnitTest {
 
     @Test
     public void testInitLocalCache() {
-        RoleDO roleDO1 = randomRole();
+        RoleDO roleDO1 = randomPojo(RoleDO.class);
         roleMapper.insert(roleDO1);
-        RoleDO roleDO2 = randomRole();
+        RoleDO roleDO2 = randomPojo(RoleDO.class);
         roleMapper.insert(roleDO2);
 
         // 调用
@@ -68,7 +72,6 @@ public class RoleServiceTest extends BaseDbUnitTest {
         // 调用
         Long roleId = roleService.createRole(reqVO, null);
         // 断言
-        assertNotNull(roleId);
         RoleDO roleDO = roleMapper.selectById(roleId);
         assertPojoEquals(reqVO, roleDO);
         assertEquals(RoleTypeEnum.CUSTOM.getType(), roleDO.getType());
@@ -81,81 +84,158 @@ public class RoleServiceTest extends BaseDbUnitTest {
     @Test
     public void testUpdateRole_success() {
         // mock 数据
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.CUSTOM, DataScopeEnum.ALL);
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setType(RoleTypeEnum.CUSTOM.getType()));
         roleMapper.insert(roleDO);
-        Long roleId = roleDO.getId();
+        // 准备参数
+        Long id = roleDO.getId();
+        RoleUpdateReqVO reqVO = randomPojo(RoleUpdateReqVO.class, o -> o.setId(id));
 
-        //调用
-        RoleUpdateReqVO reqVO = randomPojo(RoleUpdateReqVO.class, o -> {
-            o.setId(roleId);
-            o.setCode("role_code");
-            o.setName("update_name");
-            o.setSort(999);
-        });
+        // 调用
         roleService.updateRole(reqVO);
-
-        //断言
-        RoleDO newRoleDO = roleMapper.selectById(roleId);
+        // 断言
+        RoleDO newRoleDO = roleMapper.selectById(id);
         assertPojoEquals(reqVO, newRoleDO);
-
+        // verify 发送刷新消息
         verify(roleProducer).sendRoleRefreshMessage();
     }
 
     @Test
     public void testUpdateRoleStatus_success() {
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.CUSTOM, DataScopeEnum.ALL, CommonStatusEnum.ENABLE.getStatus());
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
+                .setType(RoleTypeEnum.CUSTOM.getType()));
         roleMapper.insert(roleDO);
+
+        // 准备参数
         Long roleId = roleDO.getId();
 
-        //调用
+        // 调用
         roleService.updateRoleStatus(roleId, CommonStatusEnum.DISABLE.getStatus());
-
-        //断言
-        RoleDO newRoleDO = roleMapper.selectById(roleId);
-        assertEquals(CommonStatusEnum.DISABLE.getStatus(), newRoleDO.getStatus());
-
+        // 断言
+        RoleDO dbRoleDO = roleMapper.selectById(roleId);
+        assertEquals(CommonStatusEnum.DISABLE.getStatus(), dbRoleDO.getStatus());
+        // verify 发送刷新消息
         verify(roleProducer).sendRoleRefreshMessage();
     }
 
     @Test
     public void testUpdateRoleDataScope_success() {
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.CUSTOM, DataScopeEnum.ALL);
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setType(RoleTypeEnum.CUSTOM.getType()));
         roleMapper.insert(roleDO);
-        Long roleId = roleDO.getId();
-
-        //调用
-        Set<Long> deptIdSet = new HashSet<>(Arrays.asList(1L, 2L, 3L, 4L, 5L));
-        roleService.updateRoleDataScope(roleId, DataScopeEnum.DEPT_CUSTOM.getScope(), deptIdSet);
+        // 准备参数
+        Long id = roleDO.getId();
+        Integer dataScope = randomEle(DataScopeEnum.values()).getScope();
+        Set<Long> dataScopeRoleIds = randomSet(Long.class);
 
-        //断言
-        RoleDO newRoleDO = roleMapper.selectById(roleId);
-        assertEquals(DataScopeEnum.DEPT_CUSTOM.getScope(), newRoleDO.getDataScope());
+        // 调用
+        roleService.updateRoleDataScope(id, dataScope, dataScopeRoleIds);
+        // 断言
+        RoleDO dbRoleDO = roleMapper.selectById(id);
+        assertEquals(dataScope, dbRoleDO.getDataScope());
+        assertEquals(dataScopeRoleIds, dbRoleDO.getDataScopeDeptIds());
+        // verify 发送刷新消息
+        verify(roleProducer).sendRoleRefreshMessage();
+    }
 
-        Set<Long> newDeptIdSet = newRoleDO.getDataScopeDeptIds();
-        assertEquals(deptIdSet.size(), newDeptIdSet.size());
-        deptIdSet.stream().forEach(d -> assertTrue(newDeptIdSet.contains(d)));
+    @Test
+    public void testDeleteRole_success() {
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setType(RoleTypeEnum.CUSTOM.getType()));
+        roleMapper.insert(roleDO);
+        // 参数准备
+        Long id = roleDO.getId();
 
+        // 调用
+        roleService.deleteRole(id);
+        // 断言
+        assertNull(roleMapper.selectById(id));
+        // verify 删除相关数据
+        verify(permissionService).processRoleDeleted(id);
+        // verify 发送刷新消息
         verify(roleProducer).sendRoleRefreshMessage();
     }
 
     @Test
-    public void testDeleteRole_success() {
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.CUSTOM, DataScopeEnum.ALL);
+    public void testGetRoleFromCache() {
+        // mock 数据（缓存）
+        RoleDO roleDO = randomPojo(RoleDO.class);
         roleMapper.insert(roleDO);
-        Long roleId = roleDO.getId();
+        roleService.initLocalCache();
+        // 参数准备
+        Long id = roleDO.getId();
 
-        //调用
-        roleService.deleteRole(roleId);
+        // 调用
+        RoleDO dbRoleDO = roleService.getRoleFromCache(id);
+        // 断言
+        assertPojoEquals(roleDO, dbRoleDO);
+    }
 
-        //断言
-        RoleDO newRoleDO = roleMapper.selectById(roleId);
-        assertNull(newRoleDO);
+    @Test
+    public void testGetRole() {
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class);
+        roleMapper.insert(roleDO);
+        // 参数准备
+        Long id = roleDO.getId();
 
-        verify(roleProducer).sendRoleRefreshMessage();
+        // 调用
+        RoleDO dbRoleDO = roleService.getRole(id);
+        // 断言
+        assertPojoEquals(roleDO, dbRoleDO);
     }
 
     @Test
-    public void testGetRoles() {
+    public void testGetRoleListByStatus_statusNotEmpty() {
+        // mock 数据
+        RoleDO dbRole = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        roleMapper.insert(dbRole);
+        // 测试 status 不匹配
+        roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+
+        // 调用
+        List<RoleDO> list = roleService.getRoleListByStatus(singleton(CommonStatusEnum.ENABLE.getStatus()));
+        // 断言
+        assertEquals(1, list.size());
+        assertPojoEquals(dbRole, list.get(0));
+    }
+
+    @Test
+    public void testGetRoleListByStatus_statusEmpty() {
+        // mock 数据
+        RoleDO dbRole01 = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        roleMapper.insert(dbRole01);
+        RoleDO dbRole02 = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus()));
+        roleMapper.insert(dbRole02);
+
+        // 调用
+        List<RoleDO> list = roleService.getRoleListByStatus(null);
+        // 断言
+        assertEquals(2, list.size());
+        assertPojoEquals(dbRole01, list.get(0));
+        assertPojoEquals(dbRole02, list.get(1));
+    }
+
+    @Test
+    public void testGetRoleListFromCache() {
+        // mock 数据
+        RoleDO dbRole = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        roleMapper.insert(dbRole);
+        // 测试 id 不匹配
+        roleMapper.insert(cloneIgnoreId(dbRole, o -> {}));
+        roleService.initLocalCache();
+        // 准备参数
+        Collection<Long> ids = singleton(dbRole.getId());
+
+        // 调用
+        List<RoleDO> list = roleService.getRoleListFromCache(ids);
+        // 断言
+        assertEquals(1, list.size());
+        assertPojoEquals(dbRole, list.get(0));
+    }
+
+    @Test
+    public void testGetRoleList() {
         // mock 数据
         RoleDO dbRole = randomPojo(RoleDO.class, o -> { // 等会查询到
             o.setName("土豆");
@@ -175,7 +255,7 @@ public class RoleServiceTest extends BaseDbUnitTest {
         reqVO.setName("土豆");
         reqVO.setCode("tu");
         reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1),buildTime(2022, 2, 12)}));
+        reqVO.setCreateTime(buildBetweenTime(2022, 2, 1, 2022, 2, 12));
 
         // 调用
         List<RoleDO> list = roleService.getRoleList(reqVO);
@@ -205,7 +285,7 @@ public class RoleServiceTest extends BaseDbUnitTest {
         reqVO.setName("土豆");
         reqVO.setCode("tu");
         reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1),buildTime(2022, 2, 12)}));
+        reqVO.setCreateTime(buildBetweenTime(2022, 2, 1, 2022, 2, 12));
 
         // 调用
         PageResult<RoleDO> pageResult = roleService.getRolePage(reqVO);
@@ -216,86 +296,104 @@ public class RoleServiceTest extends BaseDbUnitTest {
     }
 
     @Test
-    public void testCheckDuplicateRole_success() {
-        roleService.checkDuplicateRole(randomString(), randomString(), null);
+    public void testHasAnySuperAdmin() {
+        // 是超级
+        assertTrue(roleService.hasAnySuperAdmin(singletonList(randomPojo(RoleDO.class,
+                o -> o.setCode("super_admin")))));
+        // 非超级
+        assertFalse(roleService.hasAnySuperAdmin(singletonList(randomPojo(RoleDO.class,
+                o -> o.setCode("tenant_admin")))));
     }
 
     @Test
-    public void testCheckDuplicateRole_nameDuplicate() {
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.CUSTOM, DataScopeEnum.ALL);
-        roleMapper.insert(roleDO);
+    public void testValidateRoleDuplicate_success() {
+        // 调用，不会抛异常
+        roleService.validateRoleDuplicate(randomString(), randomString(), null);
+    }
 
-        String duplicateName = "role_name";
+    @Test
+    public void testValidateRoleDuplicate_nameDuplicate() {
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setName("role_name"));
+        roleMapper.insert(roleDO);
+        // 准备参数
+        String name = "role_name";
 
-        assertServiceException(() -> roleService.checkDuplicateRole(duplicateName, randomString(), null), ROLE_NAME_DUPLICATE, duplicateName);
+        // 调用，并断言异常
+        assertServiceException(() -> roleService.validateRoleDuplicate(name, randomString(), null),
+                ROLE_NAME_DUPLICATE, name);
     }
 
     @Test
-    public void testCheckDuplicateRole_codeDuplicate() {
-        RoleDO roleDO = randomPojo(RoleDO.class, o -> {
-            o.setName("role_999");
-            o.setCode("code");
-            o.setType(RoleTypeEnum.CUSTOM.getType());
-            o.setStatus(1);
-            o.setDataScope(DataScopeEnum.ALL.getScope());
-        });
+    public void testValidateRoleDuplicate_codeDuplicate() {
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setCode("code"));
         roleMapper.insert(roleDO);
+        // 准备参数
+        String code = "code";
 
-        String randomName = randomString();
-        String duplicateCode = "code";
-
-        assertServiceException(() -> roleService.checkDuplicateRole(randomName, duplicateCode, null), ROLE_CODE_DUPLICATE, duplicateCode);
+        // 调用，并断言异常
+        assertServiceException(() -> roleService.validateRoleDuplicate(randomString(), code, null),
+                ROLE_CODE_DUPLICATE, code);
     }
 
     @Test
-    public void testCheckUpdateRole_success() {
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.CUSTOM, DataScopeEnum.ALL);
+    public void testValidateUpdateRole_success() {
+        RoleDO roleDO = randomPojo(RoleDO.class);
         roleMapper.insert(roleDO);
-        Long roleId = roleDO.getId();
+        // 准备参数
+        Long id = roleDO.getId();
 
-        roleService.checkUpdateRole(roleId);
+        // 调用，无异常
+        roleService.validateRoleForUpdate(id);
     }
 
     @Test
-    public void testCheckUpdateRole_roleIdNotExist() {
-        assertServiceException(() -> roleService.checkUpdateRole(randomLongId()), ROLE_NOT_EXISTS);
+    public void testValidateUpdateRole_roleIdNotExist() {
+        assertServiceException(() -> roleService.validateRoleForUpdate(randomLongId()), ROLE_NOT_EXISTS);
     }
 
     @Test
-    public void testCheckUpdateRole_systemRoleCanNotBeUpdate() {
-        RoleDO roleDO = createRoleDO("role_name", RoleTypeEnum.SYSTEM, DataScopeEnum.ALL);
+    public void testValidateUpdateRole_systemRoleCanNotBeUpdate() {
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setType(RoleTypeEnum.SYSTEM.getType()));
         roleMapper.insert(roleDO);
-        Long roleId = roleDO.getId();
+        // 准备参数
+        Long id = roleDO.getId();
 
-        assertServiceException(() -> roleService.checkUpdateRole(roleId), ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE);
+        assertServiceException(() -> roleService.validateRoleForUpdate(id),
+                ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE);
     }
 
-    private RoleDO createRoleDO(String name, RoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status) {
-        return createRoleDO( name, typeEnum, scopeEnum, status, randomString());
-    }
+    @Test
+    public void testValidateRoleList_success() {
+        // mock 数据
+        RoleDO roleDO = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        roleMapper.insert(roleDO);
+        // 准备参数
+        List<Long> ids = singletonList(roleDO.getId());
 
-    private RoleDO createRoleDO(String name, RoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status, String code) {
-        return createRoleDO(null, name, typeEnum, scopeEnum, status, code);
+        // 调用，无需断言
+        roleService.validateRoleList(ids);
     }
 
-    private RoleDO createRoleDO(String name, RoleTypeEnum typeEnum, DataScopeEnum scopeEnum) {
-        return createRoleDO(null, name, typeEnum, scopeEnum, randomCommonStatus(), randomString());
-    }
+    @Test
+    public void testValidateRoleList_notFound() {
+        // 准备参数
+        List<Long> ids = singletonList(randomLongId());
 
-    private RoleDO createRoleDO(Long id, String name, RoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status, String code) {
-        return randomPojo(RoleDO.class, o -> {
-            o.setId(id);
-            o.setName(name);
-            o.setType(typeEnum.getType());
-            o.setStatus(status);
-            o.setDataScope(scopeEnum.getScope());
-            o.setCode(code);
-        });
+        // 调用, 并断言异常
+        assertServiceException(() -> roleService.validateRoleList(ids), ROLE_NOT_EXISTS);
     }
 
-    private RoleDO randomRole() {
-        return randomPojo(RoleDO.class,
-                o -> o.setDataScope(RandomUtil.randomEle(DataScopeEnum.values()).getScope()));
-    }
+    @Test
+    public void testValidateRoleList_notEnable() {
+        // mock 数据
+        RoleDO RoleDO = randomPojo(RoleDO.class, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus()));
+        roleMapper.insert(RoleDO);
+        // 准备参数
+        List<Long> ids = singletonList(RoleDO.getId());
 
+        // 调用, 并断言异常
+        assertServiceException(() -> roleService.validateRoleList(ids), ROLE_IS_DISABLE, RoleDO.getName());
+    }
 }

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java

@@ -196,7 +196,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
         role100.setTenantId(dbTenant.getId());
         RoleDO role101 = randomPojo(RoleDO.class, o -> o.setId(101L));
         role101.setTenantId(dbTenant.getId());
-        when(roleService.getRoles(isNull())).thenReturn(asList(role100, role101));
+        when(roleService.getRoleList(isNull())).thenReturn(asList(role100, role101));
         // mock 每个角色的权限
         when(permissionService.getRoleMenuIds(eq(101L))).thenReturn(asSet(201L, 202L));