feat(公司tab): 接线 密钥管理与用量统计——分组∩公司取交集,空集不退化
两页都从 controller 这一个唯一出口算范围:收了 company_id 的 handler 自己调 dataReadScope.readScope(operator, companyId),把算好的 ReadScope 交给 service; service 里 scopedUserIds() 只做 companyScope.userIdsOr(base),不再出现第二个判公司的 if。 readScope 落在 controller 而非计划原文写的 service,是因为 Task 8 补的 G2 尺子 CompanyIdParamGoesThroughReadScopeTest 逐 controller 断言"收参数就得自己调出口并把结果当实参交出去"。 空集一律早退(交给 in(...) 会渲染成 IN () → 500),且两条"筛空"日志按超管/主管分开, 排障时看得出是筛空还是查空;非超管空页仍返回带分组下拉的空页,下拉不缩水。 新增 6 条行为用例(超管 group_id∩公司成员集、交集空早退且不查库、不传公司保持不筛、 主管锁定集只被收窄不放大)。分母 3716 → 3722,Failures/Errors 均 0。 FE 侧两页带 company_id 并把 company-tab-wiring 缺口清单从 6 页收到 4 页。
This commit is contained in:
+61
-5
@@ -8,6 +8,7 @@ import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import com.nanri.aiimage.common.security.ShopCredentialCryptoService;
|
||||
import com.nanri.aiimage.config.UserSecretProperties;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.ReadScope;
|
||||
import com.nanri.aiimage.modules.notification.service.NotificationDispatchService;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
@@ -22,6 +23,7 @@ import com.nanri.aiimage.modules.usersecret.model.entity.UserApiSecretEntity;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretModuleVo;
|
||||
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBundleVo;
|
||||
import com.nanri.aiimage.modules.usersecret.support.UserSecretModule;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
@@ -477,7 +479,7 @@ class UserApiSecretServiceTest {
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery());
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).hasSize(1);
|
||||
var rowVo = page.getItems().get(0);
|
||||
@@ -500,7 +502,7 @@ class UserApiSecretServiceTest {
|
||||
when(adminGroupMapper.selectLedGroups(88L)).thenReturn(List.of());
|
||||
when(adminUserMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery());
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).isEmpty();
|
||||
assertThat(page.getGroupOptions()).isEmpty();
|
||||
@@ -526,7 +528,7 @@ class UserApiSecretServiceTest {
|
||||
ref.setGroupName("一组");
|
||||
when(adminGroupMapper.selectGroupNamesByUserIds(any())).thenReturn(List.of(ref));
|
||||
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery());
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).hasSize(1);
|
||||
assertThat(page.getItems().get(0).getGroups()).containsExactly("一组");
|
||||
@@ -589,7 +591,7 @@ class UserApiSecretServiceTest {
|
||||
when(adminUserMapper.selectBatchIds(any())).thenReturn(List.of(user, leader));
|
||||
when(adminGroupMapper.selectAllGroups()).thenReturn(List.of());
|
||||
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery());
|
||||
var page = service.adminPage(operator, new AdminUserSecretQuery(), ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).hasSize(1);
|
||||
assertThat(page.getItems().get(0).getGroups()).isEmpty();
|
||||
@@ -607,12 +609,66 @@ class UserApiSecretServiceTest {
|
||||
|
||||
AdminUserSecretQuery query = new AdminUserSecretQuery();
|
||||
query.setGroupId(5L);
|
||||
var page = service.adminPage(operator, query);
|
||||
var page = service.adminPage(operator, query, ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).isEmpty();
|
||||
verify(adminGroupMapper).selectUserIdsByGroupId(5L);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("超管 group_id + company_id 同时给:取交集,不是后一个覆盖前一个")
|
||||
void groupAndCompanyIntersect() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(12L, 13L, 99L));
|
||||
|
||||
List<Long> scoped = service.scopedUserIds(operator, 7L, ReadScope.users(List.of(11L, 12L, 13L)));
|
||||
|
||||
assertThat(scoped).containsExactlyInAnyOrder(12L, 13L);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("公司选了但交集为空:返回空页,不许退化成「不筛」(那是越权)")
|
||||
void emptyIntersectionReturnsEmptyPage() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(99L));
|
||||
assertThat(service.scopedUserIds(operator, 7L, ReadScope.users(List.of(11L)))).isEmpty();
|
||||
|
||||
// 空集必须由 adminPage 早退:交给 in(...) 会渲染成 IN () → SQL 语法错 → 500。
|
||||
AdminUserSecretQuery query = new AdminUserSecretQuery();
|
||||
query.setGroupId(7L);
|
||||
var page = service.adminPage(operator, query, ReadScope.users(List.of(11L)));
|
||||
assertThat(page.getItems()).isEmpty();
|
||||
verify(mapper, never()).selectList(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("超管不传公司:保持今天的不筛(全局约束 2——tab 不是安全边界,不许把空公司 id 当成筛)")
|
||||
void superAdminWithoutCompanyStaysUnfiltered() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.unfiltered())).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("主管:组长锁定 ∩ 公司成员集;越界公司的成员集是空集 ⇒ 空页,不是全量")
|
||||
void leaderVisibleSetIsNarrowedByCompany() {
|
||||
UserApiSecretService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of(1L, 2L, 88L));
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of(2L, 88L))))
|
||||
.containsExactlyInAnyOrder(2L, 88L);
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of()))).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
void adminClearByUserDeletesAllRowsOfUser() {
|
||||
UserApiSecretService service = newService();
|
||||
|
||||
+40
-4
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.usersecret.service;
|
||||
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.service.ReadScope;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.modules.permission.support.UserDataScopeSupport;
|
||||
@@ -9,6 +10,7 @@ import com.nanri.aiimage.modules.shopkey.model.dto.UserGroupRef;
|
||||
import com.nanri.aiimage.modules.usersecret.mapper.UserSecretUsageMapper;
|
||||
import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretUsageQuery;
|
||||
import com.nanri.aiimage.modules.usersecret.model.entity.UserSecretUsageEntity;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -114,7 +116,7 @@ class UserSecretUsageServiceTest {
|
||||
ref.setGroupName("一组");
|
||||
when(adminGroupMapper.selectGroupNamesByUserIds(any())).thenReturn(List.of(ref));
|
||||
|
||||
var page = service.adminPage(new AdminUserEntity(), new AdminUserSecretUsageQuery());
|
||||
var page = service.adminPage(new AdminUserEntity(), new AdminUserSecretUsageQuery(), ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getTotal()).isEqualTo(2);
|
||||
assertThat(page.getItems()).hasSize(2);
|
||||
@@ -144,7 +146,7 @@ class UserSecretUsageServiceTest {
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of());
|
||||
when(adminGroupMapper.selectLedGroups(88L)).thenReturn(List.of());
|
||||
|
||||
var page = service.adminPage(operator, new AdminUserSecretUsageQuery());
|
||||
var page = service.adminPage(operator, new AdminUserSecretUsageQuery(), ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).isEmpty();
|
||||
assertThat(page.getTotal()).isZero();
|
||||
@@ -167,7 +169,7 @@ class UserSecretUsageServiceTest {
|
||||
|
||||
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
|
||||
query.setGroupId(5L);
|
||||
var page = service.adminPage(new AdminUserEntity(), query);
|
||||
var page = service.adminPage(new AdminUserEntity(), query, ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).hasSize(1);
|
||||
assertThat(page.getItems().get(0).getProxyCount()).isEqualTo(3);
|
||||
@@ -186,9 +188,43 @@ class UserSecretUsageServiceTest {
|
||||
|
||||
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
|
||||
query.setKeyword("不存在的人");
|
||||
var page = service.adminPage(new AdminUserEntity(), query);
|
||||
var page = service.adminPage(new AdminUserEntity(), query, ReadScope.unfiltered());
|
||||
|
||||
assertThat(page.getItems()).isEmpty();
|
||||
verify(usageMapper, never()).selectList(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("用量统计:超管 group_id ∩ 公司成员集;交集为空时早退且不查库")
|
||||
void groupAndCompanyIntersectThenEarlyReturn() {
|
||||
UserSecretUsageService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(adminAuthSupport.currentRole(any())).thenReturn("super_admin");
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(12L, 13L, 99L));
|
||||
assertThat(service.scopedUserIds(operator, 7L, ReadScope.users(List.of(11L, 12L, 13L))))
|
||||
.containsExactlyInAnyOrder(12L, 13L);
|
||||
|
||||
when(adminGroupMapper.selectUserIdsByGroupId(7L)).thenReturn(List.of(99L));
|
||||
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
|
||||
query.setGroupId(7L);
|
||||
var page = service.adminPage(operator, query, ReadScope.users(List.of(11L)));
|
||||
|
||||
assertThat(page.getItems()).isEmpty();
|
||||
verify(usageMapper, never()).selectList(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("用量统计:主管只看自己带的分组成员,公司 tab 只能再收窄不能放大")
|
||||
void leaderVisibleSetIsNarrowedByCompany() {
|
||||
UserSecretUsageService service = newService();
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(88L);
|
||||
when(userDataScopeSupport.resolveVisibleUserIds(88L)).thenReturn(List.of(1L, 2L, 88L));
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.users(List.of(2L))))
|
||||
.containsExactly(2L);
|
||||
assertThat(service.scopedUserIds(operator, null, ReadScope.unfiltered()))
|
||||
.containsExactlyInAnyOrder(1L, 2L, 88L);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user