菜单修改优化

2026-07-28 13:40:19 +08:00
parent 4ddb8b47b0
commit 7c3c9e53a0
90 changed files with 9388 additions and 1545 deletions
@@ -0,0 +1,99 @@
+package com.nanri.aiimage.modules.admin.service;
+
+import com.nanri.aiimage.modules.admin.model.dto.AdminUserCreateRequest;
+import com.nanri.aiimage.modules.admin.model.dto.AdminUserUpdateRequest;
+import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
+import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
+import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
+import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest;
+import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
+import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class AdminUserServiceTest {
+
+    @Test
+    void createUserStoresSuppliedDirectPermissionsInSameTransactionalMethod() throws Exception {
+        AdminUserMapper userMapper = mock(AdminUserMapper.class);
+        WerkzeugPasswordEncoder passwordEncoder = mock(WerkzeugPasswordEncoder.class);
+        AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
+        PermissionMenuService permissionService = mock(PermissionMenuService.class);
+        AdminUserService service = new AdminUserService(
+                userMapper, passwordEncoder, authSupport, permissionService);
+        AdminUserEntity operator = user(10L, "admin", 1, null);
+        AdminUserCreateRequest request = new AdminUserCreateRequest();
+        request.setUsername("created-user");
+        request.setPassword("secret1");
+        request.setRole("normal");
+        request.setColumnIds(List.of(11L, 12L));
+
+        when(authSupport.currentRole(operator)).thenReturn("admin");
+        when(passwordEncoder.hash("secret1")).thenReturn("hashed");
+        when(userMapper.insert(any(AdminUserEntity.class))).thenAnswer(invocation -> {
+            invocation.<AdminUserEntity>getArgument(0).setId(20L);
+            return 1;
+        });
+
+        Long createdId = service.createUser(operator, request);
+
+        assertThat(createdId).isEqualTo(20L);
+        ArgumentCaptor<UserColumnPermissionUpdateRequest> permissions =
+                ArgumentCaptor.forClass(UserColumnPermissionUpdateRequest.class);
+        verify(permissionService).updateUserColumnPermissions(
+                eq(operator), eq(20L), permissions.capture(), eq(PermissionMenuService.MENU_TYPE_APP));
+        assertThat(permissions.getValue().getColumnIds()).containsExactly(11L, 12L);
+        assertThat(AdminUserService.class
+                .getMethod("createUser", AdminUserEntity.class, AdminUserCreateRequest.class)
+                .isAnnotationPresent(Transactional.class)).isTrue();
+    }
+
+    @Test
+    void updateUserCanReplaceOnlyDirectPermissionsTransactionally() throws Exception {
+        AdminUserMapper userMapper = mock(AdminUserMapper.class);
+        WerkzeugPasswordEncoder passwordEncoder = mock(WerkzeugPasswordEncoder.class);
+        AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
+        PermissionMenuService permissionService = mock(PermissionMenuService.class);
+        AdminUserService service = new AdminUserService(
+                userMapper, passwordEncoder, authSupport, permissionService);
+        AdminUserEntity operator = user(10L, "admin", 1, null);
+        AdminUserEntity target = user(20L, "normal", 0, 10L);
+        AdminUserUpdateRequest request = new AdminUserUpdateRequest();
+        request.setColumnIds(List.of(21L));
+
+        when(authSupport.currentRole(operator)).thenReturn("admin");
+        when(userMapper.selectById(20L)).thenReturn(target);
+
+        service.updateUser(operator, 20L, request);
+
+        verify(userMapper, never()).update(any(), any());
+        ArgumentCaptor<UserColumnPermissionUpdateRequest> permissions =
+                ArgumentCaptor.forClass(UserColumnPermissionUpdateRequest.class);
+        verify(permissionService).updateUserColumnPermissions(
+                eq(operator), eq(20L), permissions.capture(), eq(PermissionMenuService.MENU_TYPE_APP));
+        assertThat(permissions.getValue().getColumnIds()).containsExactly(21L);
+        assertThat(AdminUserService.class
+                .getMethod("updateUser", AdminUserEntity.class, Long.class, AdminUserUpdateRequest.class)
+                .isAnnotationPresent(Transactional.class)).isTrue();
+    }
+
+    private AdminUserEntity user(Long id, String role, int isAdmin, Long createdById) {
+        AdminUserEntity user = new AdminUserEntity();
+        user.setId(id);
+        user.setRole(role);
+        user.setIsAdmin(isAdmin);
+        user.setCreatedById(createdById);
+        return user;
+    }
+}
@@ -0,0 +1,52 @@
+package com.nanri.aiimage.modules.admin.support;
+
+import com.nanri.aiimage.modules.auth.config.AuthProperties;
+import com.nanri.aiimage.modules.auth.service.JwtService;
+import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
+import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+class AdminAuthSupportTest {
+
+    @Test
+    void explicitLowestIdAdminIsNotPromotedToSuperAdmin() {
+        AdminUserMapper userMapper = mock(AdminUserMapper.class);
+        AdminAuthSupport support = new AdminAuthSupport(
+                mock(JwtService.class), userMapper, mock(AuthProperties.class));
+        AdminUserEntity user = user(1L, "admin", 1, null);
+
+        assertThat(support.currentRole(user)).isEqualTo("admin");
+        verify(userMapper, never()).selectOne(any());
+    }
+
+    @Test
+    void legacyBlankRoleRootRemainsSuperAdmin() {
+        AdminAuthSupport support = new AdminAuthSupport(
+                mock(JwtService.class), mock(AdminUserMapper.class), mock(AuthProperties.class));
+
+        assertThat(support.currentRole(user(1L, null, 1, null))).isEqualTo("super_admin");
+    }
+
+    @Test
+    void explicitNormalRoleIsNotPromotedByLegacyAdminFields() {
+        AdminAuthSupport support = new AdminAuthSupport(
+                mock(JwtService.class), mock(AdminUserMapper.class), mock(AuthProperties.class));
+
+        assertThat(support.currentRole(user(1L, "normal", 1, null))).isNull();
+    }
+
+    private AdminUserEntity user(Long id, String role, int isAdmin, Long createdById) {
+        AdminUserEntity user = new AdminUserEntity();
+        user.setId(id);
+        user.setRole(role);
+        user.setIsAdmin(isAdmin);
+        user.setCreatedById(createdById);
+        return user;
+    }
+}