fix(品牌数据库): 全平台共享落到实处——读改删都不再按分组锁人,分组列对所有人展示
用户 10-07 报「用其他公司登录后品牌数据库没共享到、看不到数据」。页面文案写着 "本页全平台共享,不按公司区分",读侧却仍按操作者换一份可见集。真凶不是 company_id (V151 已把它退掉),而是 10-04 就记下的那条:非站点超管一律 `record_source='MANUAL' AND group_id=<可访问分组里 id 最小的那一个>`,账号没有分组时 更狠——`id = -1` 整页判空。`company_super_admin` 在控制器那句 `"super_admin".equals(currentRole)` 上判 false,于是整页落成 0 行。 上线前只读取证(内部令牌通道,公开链 api.aishufu.top): - operatorId=1205 张三(company_super_admin,公司3)→ total=0 - operatorId=1193 华华11(admin,公司2)→ total=0 - operatorId=1(站点超管)→ total=15234 - 库侧:biz_invalid_asin_data 共 15234 行,其中 AUTO 15174 行的 group_id 全为 NULL, MANUAL 只有 60 行 → "只给 MANUAL + 单个分组"这条谓词必然筛空。 改法(用户选「全放开:读+改+删都不锁分组」+「显示分组列」): - InvalidAsinDataService 的 page/create/update/delete 形参表里不再有 superAdmin, page 连 operatorId 都不收 ⇒ 想把「按人收窄」接回来必须先改签名,这是编译期护栏。 - 分组只在校验「存在」这一步过(getAccessibleById 的 superAdmin=true 是正当用法)。 AUTO 行仍不在这一页重归分组——那是来源语义,与角色无关。 - 新增 GET /api/admin/invalid-asin-data/groups:这一页自己的全平台分组名册,走与列表 同一道页面准入门,不开成匿名口。不能复用店铺页的 /shop-manages/groups——它对非超管 只返回本人可访问的分组,共享列表里别家的分组就筛不动。 - 前端:分组列/筛选/表单下拉对所有拿到这一页的人展示且可选,lockedGroupId 模型退役。 护栏: - InvalidAsinDataServiceTest 13 例 + InvalidAsinDataControllerTest 9 例。反向钉成对配尺子 自证(rulersCanMeasureThePreRevertPredicate 把退回前那半条谓词原样搭一遍,证明 「sql 里没有 record_source」「参数表里没有 -1」这几条断言真的量得到)。 - 前端删掉钉老锁形状的 align-invalid-asin-lock.test.ts,改由 align-invalid-asin-shared.test.ts 5 例反向钉(先让同一把尺子在 QueryAsinPage/ShopManagePage 量出 v-if="isSuperAdmin" 命中, 再断本页 0 命中;并钉分组列/筛选确实还在——「把列删了」也能满足 0 命中)。 - align-group-visibility.test.ts 是「分组列只对超管显示」的全站口径表,本页按用户批准移出 两张 gate 表并在表头写明例外。 口径来源:用户 10-07 定的「company_super_admin 在业务数据面与 super_admin 同套逻辑, 差别只在管理动作(公司管理、建别家公司超管)」。本轮只落品牌库这一页,其余 15 个仍按 公司隔离的注册表页没动;准入门(能不能进这一页)也不变。 门禁:后端全量 3957 例 / 0 红 / 7 跳;admin-frontend-vue 1737 例全绿;vue-tsc rc=0; 变异自证 6/6 KILLED(注入 record_source 谓词 / 恒筛 group_id / id=-1 空集兜底 / 写侧改回要求可访问分组 / AUTO 行也被重归分组 / 名册端点去掉准入门),每轮还原后哈希一致。
This commit is contained in:
@@ -1,25 +1,23 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
/** 品牌数据库(不符合ASIN)页 · 像素复刻旧版 admin.html panel-invalid-asin-data(自绘:面板头+新增、筛选、旧式表格/分页、原生 confirm 删除)。
|
||||
* script 逻辑沿用现有 Vue 实现(分组锁定/来源 AUTO 编辑隐藏分组);弹窗保留现有组件。 */
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
* 全平台一份黑名单:分组是行上的归类标签,对任何角色都不构成可见性边界(2026-10-07 定档)。
|
||||
* 弹窗保留现有组件。 */
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { createInvalidAsin, deleteInvalidAsin, fetchInvalidAsinPage, updateInvalidAsin } from '../invalidasin/invalid-asin-api.ts'
|
||||
import { createInvalidAsin, deleteInvalidAsin, fetchInvalidAsinGroupOptions, fetchInvalidAsinPage, updateInvalidAsin } from '../invalidasin/invalid-asin-api.ts'
|
||||
import type { InvalidAsinItem } from '../invalidasin/invalid-asin-model.ts'
|
||||
import { invalidAsinDeleteText, invalidAsinLockedGroupId, recordSourceLabel } from '../invalidasin/invalid-asin-model.ts'
|
||||
import { invalidAsinDeleteText, recordSourceLabel } from '../invalidasin/invalid-asin-model.ts'
|
||||
import { createEmptyInvalidAsinForm, invalidAsinFormFromItem, validateInvalidAsinForm } from '../invalidasin/invalid-asin-form-model.ts'
|
||||
import { fetchShopManageGroups } from '../shop/shop-manage-api.ts'
|
||||
import type { ShopGroupOption } from '../shop/shop-dto.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const loading = ref(false)
|
||||
const rows = ref<InvalidAsinItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(10)
|
||||
const groups = ref<ShopGroupOption[]>([])
|
||||
const groupOptions = ref<ShopGroupOption[]>([])
|
||||
const jumpPage = ref('')
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
@@ -27,30 +25,16 @@ const filter = reactive({ dataValue: '', brand: '', groupId: null as number | nu
|
||||
|
||||
const dialogVisible = ref(false)
|
||||
const editingId = ref<number | null>(null)
|
||||
/** 当前编辑行来源:自动导入(AUTO)记录不可改分组。 */
|
||||
/** 当前编辑行来源:自动导入(AUTO)记录不在此页改分组。 */
|
||||
const editingSource = ref('')
|
||||
const saving = ref(false)
|
||||
const form = reactive(createEmptyInvalidAsinForm())
|
||||
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
/** 非超管锁定的分组 id(对齐 admin.js getInvalidAsinDataLockedGroupId);超管为 null。 */
|
||||
const lockedGroupId = computed(() => invalidAsinLockedGroupId(groups.value, null, session.user?.role || ''))
|
||||
/** 分组下拉可用选项:超管全量,非超管仅锁定分组。 */
|
||||
const groupOptions = computed<ShopGroupOption[]>(() => {
|
||||
if (isSuperAdmin.value) return groups.value
|
||||
const locked = lockedGroupId.value
|
||||
return locked == null ? [] : groups.value.filter((group) => group.id === locked)
|
||||
})
|
||||
|
||||
async function loadGroups() {
|
||||
try {
|
||||
groups.value = await fetchShopManageGroups()
|
||||
groupOptions.value = await fetchInvalidAsinGroupOptions()
|
||||
} catch {
|
||||
groups.value = []
|
||||
}
|
||||
// 非超管:筛选强制锁定到本人分组(与参考 refreshShopGroupSelects 的锁定语义一致)。
|
||||
if (!isSuperAdmin.value && lockedGroupId.value != null) {
|
||||
filter.groupId = lockedGroupId.value
|
||||
groupOptions.value = []
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,10 +89,6 @@ function openCreate() {
|
||||
editingId.value = null
|
||||
editingSource.value = ''
|
||||
Object.assign(form, createEmptyInvalidAsinForm())
|
||||
// 非超管新增预置锁定分组(下拉同时被禁用)。
|
||||
if (!isSuperAdmin.value && lockedGroupId.value != null) {
|
||||
form.groupId = lockedGroupId.value
|
||||
}
|
||||
dialogVisible.value = true
|
||||
}
|
||||
|
||||
@@ -156,10 +136,6 @@ async function remove(row: InvalidAsinItem) {
|
||||
}
|
||||
}
|
||||
|
||||
watch(isSuperAdmin, () => {
|
||||
if (isSuperAdmin.value) filter.groupId = null
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
loadGroups()
|
||||
load()
|
||||
@@ -183,7 +159,7 @@ onMounted(() => {
|
||||
<label>品牌</label>
|
||||
<input v-model="filter.brand" type="text" placeholder="输入品牌" @keyup.enter="apply" />
|
||||
</div>
|
||||
<div v-if="isSuperAdmin" class="form-group" style="min-width: 180px">
|
||||
<div class="form-group" style="min-width: 180px">
|
||||
<label>分组</label>
|
||||
<el-select v-model="filter.groupId" class="admin-filter" filterable clearable placeholder="全部分组">
|
||||
<el-option v-for="group in groupOptions" :key="group.id" :label="group.groupName" :value="group.id" />
|
||||
@@ -199,7 +175,7 @@ onMounted(() => {
|
||||
<th style="width: 70px">ID</th>
|
||||
<th style="width: 170px">ASIN</th>
|
||||
<th style="width: 150px">品牌</th>
|
||||
<th v-if="isSuperAdmin" style="width: 140px">分组</th>
|
||||
<th style="width: 140px">分组</th>
|
||||
<th style="width: 110px">来源</th>
|
||||
<th style="width: 170px">创建时间</th>
|
||||
<th style="width: 170px">更新时间</th>
|
||||
@@ -212,7 +188,7 @@ onMounted(() => {
|
||||
<td>{{ row.id }}</td>
|
||||
<td class="mono-cell">{{ row.dataValue }}</td>
|
||||
<td>{{ row.brand || '—' }}</td>
|
||||
<td v-if="isSuperAdmin">{{ row.groupName || '未分组' }}</td>
|
||||
<td>{{ row.groupName || '未分组' }}</td>
|
||||
<td>
|
||||
<span class="source-text" :class="{ 'is-auto': row.recordSource !== 'MANUAL' }">
|
||||
{{ recordSourceLabel(row.recordSource) }}
|
||||
@@ -227,10 +203,10 @@ onMounted(() => {
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td :colspan="isSuperAdmin ? 8 : 7" class="empty-tip">加载中...</td>
|
||||
<td colspan="8" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td :colspan="isSuperAdmin ? 8 : 7" class="empty-tip">暂无数据</td>
|
||||
<td colspan="8" class="empty-tip">暂无数据</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -247,7 +223,7 @@ onMounted(() => {
|
||||
<el-input v-model="form.brand" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editingId == null || editingSource.toUpperCase() !== 'AUTO'" label="分组" required>
|
||||
<el-select v-model="form.groupId" placeholder="选择分组" filterable :disabled="!isSuperAdmin">
|
||||
<el-select v-model="form.groupId" placeholder="选择分组" filterable>
|
||||
<el-option v-for="group in groupOptions" :key="group.id" :label="group.groupName" :value="group.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@@ -3,6 +3,8 @@ import { http } from '@/api/http'
|
||||
import { unwrap } from '@/api/envelope'
|
||||
import { toInvalidAsinCreateRequest, toInvalidAsinUpdateRequest, type InvalidAsinForm } from './invalid-asin-form-model'
|
||||
import { parseInvalidAsinPage, type InvalidAsinPageResult } from './invalid-asin-model'
|
||||
import { parseShopManageGroups } from '../shop/shop-group-model.ts'
|
||||
import type { ShopGroupOption } from '../shop/shop-dto.ts'
|
||||
|
||||
export const INVALID_ASIN_ENDPOINT = '/api/admin/invalid-asin-data'
|
||||
|
||||
@@ -34,6 +36,16 @@ export async function fetchInvalidAsinPage(query: InvalidAsinQuery): Promise<Inv
|
||||
return parseInvalidAsinPage(data)
|
||||
}
|
||||
|
||||
/**
|
||||
* 分组下拉名册:GET /api/admin/invalid-asin-data/groups。
|
||||
* 不走店铺管理页那个 /shop-manages/groups——它对非超管只返回本人可访问的分组,
|
||||
* 而这一页的数据是跨公司共享的,筛不动别家的分组就没有意义。
|
||||
*/
|
||||
export async function fetchInvalidAsinGroupOptions(): Promise<ShopGroupOption[]> {
|
||||
const { data } = await http.get<unknown>(`${INVALID_ASIN_ENDPOINT}/groups`)
|
||||
return parseShopManageGroups(data)
|
||||
}
|
||||
|
||||
/** 新增品牌数据库记录:POST /api/admin/invalid-asin-data。 */
|
||||
export async function createInvalidAsin(form: InvalidAsinForm): Promise<void> {
|
||||
const { data } = await http.post<unknown>(INVALID_ASIN_ENDPOINT, toInvalidAsinCreateRequest(form))
|
||||
|
||||
@@ -45,20 +45,6 @@ export function invalidAsinDeleteText(item: Pick<InvalidAsinItem, 'dataValue'> |
|
||||
return `确定删除“${value}”吗?`
|
||||
}
|
||||
|
||||
/**
|
||||
* 非超管分组锁定(对齐 admin.js getInvalidAsinDataLockedGroupId:超管不锁;
|
||||
* 非超管锁 lockedGroupId,缺失时退化为第一个分组;无分组返回 null)。
|
||||
*/
|
||||
export function invalidAsinLockedGroupId(
|
||||
groups: Array<{ id: number }>,
|
||||
lockedGroupId: number | null | undefined,
|
||||
operatorRole: string,
|
||||
): number | null {
|
||||
if ((operatorRole || '').toLowerCase() === 'super_admin') return null
|
||||
if (lockedGroupId != null && groups.some((group) => group.id === lockedGroupId)) return lockedGroupId
|
||||
return groups.length ? groups[0].id : null
|
||||
}
|
||||
|
||||
/** 解析单条品牌数据库项;缺 id 视为无效。 */
|
||||
export function toInvalidAsinItem(raw: unknown): InvalidAsinItem | null {
|
||||
if (!raw || typeof raw !== 'object') return null
|
||||
|
||||
@@ -6,11 +6,16 @@ import { readSource } from './helpers.ts'
|
||||
* 分组维度仅超管可见:非超管(管理员/普通用户)数据已由后端裁剪到本人分组,
|
||||
* 后台各页的分组筛选与分组列一律不展示,只有超管需要按分组筛选/区分。
|
||||
* 参考实现见撞款检测页(DuplicateCheckPage.vue 分组筛选用 isSuper 门控)。
|
||||
*
|
||||
* <p><b>品牌数据库页(AsinInvalidPage.vue)是这一族的例外,2026-10-07 定档移出上面两张表。</b>
|
||||
* 那条例外不是"把分组列藏起来",而是这一页的口径本身不同:它的黑名单全平台一份、
|
||||
* 后端不再按操作者收窄可见集,所以分组对任何角色都只是行上的归类标签、不是边界——
|
||||
* 反过来必须对所有人可见可用。它的反向钉在 align-invalid-asin-shared.test.ts:
|
||||
* 那一页出现任何角色分支都会红。别把这里的门控模式抄回品牌库页。</p>
|
||||
*/
|
||||
|
||||
/** 页面 → 分组筛选门控片段(正则不做宽松匹配,确保门控真实存在)。 */
|
||||
const FILTER_GATES: Array<[string, RegExp]> = [
|
||||
['src/pages/asin/AsinInvalidPage.vue', /v-if="isSuperAdmin"[\s\S]{0,160}<label>分组<\/label>/],
|
||||
['src/pages/asin/QueryAsinPage.vue', /v-if="isSuperAdmin"[\s\S]{0,160}<label>分组<\/label>/],
|
||||
['src/pages/asin/SkipPricePage.vue', /v-if="isSuperAdmin"[\s\S]{0,160}<label>分组<\/label>/],
|
||||
['src/pages/asin/DedupeRegistryPage.vue', /v-if="isSuperAdmin"[\s\S]{0,160}<label>分组<\/label>/],
|
||||
@@ -21,7 +26,6 @@ const FILTER_GATES: Array<[string, RegExp]> = [
|
||||
|
||||
/** 页面 → 分组列表头门控片段。 */
|
||||
const COLUMN_GATES: Array<[string, RegExp]> = [
|
||||
['src/pages/asin/AsinInvalidPage.vue', /<th v-if="isSuperAdmin"[^>]*>分组<\/th>/],
|
||||
['src/pages/asin/QueryAsinPage.vue', /<th v-if="isSuperAdmin"[^>]*>分组<\/th>/],
|
||||
['src/pages/asin/SkipPricePage.vue', /<th v-if="isSuperAdmin"[^>]*>分组<\/th>/],
|
||||
['src/pages/asin/DedupeRegistryPage.vue', /<th v-if="isSuperAdmin"[^>]*>分组<\/th>/],
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
import { invalidAsinLockedGroupId } from '../src/pages/invalidasin/invalid-asin-model.ts'
|
||||
|
||||
/** 对齐 admin.js:4200-4204,4246-4272:非超管品牌数据库分组强制锁定到本人分组。 */
|
||||
|
||||
const GROUPS = [{ id: 3, groupName: 'A组' }, { id: 5, groupName: 'B组' }]
|
||||
|
||||
test('align_invalid_asin_lock_super_admin_never_locked', () => {
|
||||
assert.equal(invalidAsinLockedGroupId(GROUPS, 3, 'super_admin'), null)
|
||||
})
|
||||
|
||||
test('align_invalid_asin_lock_uses_locked_group_id_when_present', () => {
|
||||
assert.equal(invalidAsinLockedGroupId(GROUPS, 5, 'admin'), 5)
|
||||
})
|
||||
|
||||
test('align_invalid_asin_lock_falls_back_to_first_group', () => {
|
||||
assert.equal(invalidAsinLockedGroupId(GROUPS, null, 'admin'), 3)
|
||||
assert.equal(invalidAsinLockedGroupId(GROUPS, 99, 'admin'), 3)
|
||||
})
|
||||
|
||||
test('align_invalid_asin_lock_empty_groups_returns_null', () => {
|
||||
assert.equal(invalidAsinLockedGroupId([], null, 'admin'), null)
|
||||
})
|
||||
|
||||
test('align_invalid_asin_lock_normal_role_also_locked', () => {
|
||||
assert.equal(invalidAsinLockedGroupId(GROUPS, null, 'normal'), 3)
|
||||
})
|
||||
|
||||
test('align_invalid_asin_page_lock_wiring', () => {
|
||||
// UI 接线:筛选/新增/编辑分组下拉非超管禁用并锁定;筛选默认锁组;重置保持锁定。
|
||||
const page = readSource('src/pages/asin/AsinInvalidPage.vue')
|
||||
assert.match(page, /invalidAsinLockedGroupId/, '锁定分组走纯模型')
|
||||
assert.match(page, /isSuperAdmin|session\.isSuperAdmin/, '按当前角色判定是否锁定')
|
||||
assert.match(page, /:disabled/, '分组下拉支持禁用')
|
||||
assert.match(page, /lockedGroupId/, '锁定组参与筛选/新增预置')
|
||||
})
|
||||
@@ -0,0 +1,52 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
|
||||
/**
|
||||
* 品牌数据库=全平台一份:这一页不许再按角色收窄分组(2026-10-07 定档)。
|
||||
*
|
||||
* 形状与 10-06 那批反向钉一致——先让同一把尺子在**仍然按角色控列**的页上量出命中,
|
||||
* 再断品牌库页 0 命中;否则"没有 v-if"会因为正则整段抓不到而恒真。
|
||||
* 另一半风险是"把分组列直接删掉"也能满足 0 命中,所以这里同时钉它确实在、且对所有人都在。
|
||||
*/
|
||||
|
||||
const PAGE = 'src/pages/asin/AsinInvalidPage.vue'
|
||||
const API = 'src/pages/invalidasin/invalid-asin-api.ts'
|
||||
const MODEL = 'src/pages/invalidasin/invalid-asin-model.ts'
|
||||
|
||||
/** 仍然按角色控列的对照页:尺子在它们身上必须量得出命中。 */
|
||||
const ROLE_GATED_PAGES = ['src/pages/asin/QueryAsinPage.vue', 'src/pages/shop/ShopManagePage.vue']
|
||||
|
||||
test('align_invalid_asin_shared_ruler_still_catches_role_gated_pages', () => {
|
||||
const hits = ROLE_GATED_PAGES.filter((file) => /v-if="isSuperAdmin"/.test(readSource(file)))
|
||||
assert.equal(
|
||||
hits.length,
|
||||
ROLE_GATED_PAGES.length,
|
||||
'尺子失效:连仍按角色控列的页都量不出来,下面的 0 命中就是恒真断言',
|
||||
)
|
||||
})
|
||||
|
||||
test('align_invalid_asin_page_has_no_role_branch_left', () => {
|
||||
const page = readSource(PAGE)
|
||||
assert.doesNotMatch(page, /isSuperAdmin/, '品牌库页又出现了角色分支:这一页的可见集不随操作者变')
|
||||
assert.doesNotMatch(page, /useAdminSessionStore/, '同上:页面已经不需要知道操作者是谁')
|
||||
assert.doesNotMatch(page, /lockedGroupId/i, '锁定分组的老模型回流了')
|
||||
assert.doesNotMatch(page, /:disabled="/, '分组下拉又被禁用了:非站点超管也该能选任意分组(CSS 里的 :not(:disabled) 不算,只排绑定)')
|
||||
})
|
||||
|
||||
test('align_invalid_asin_page_keeps_group_column_and_filter_for_everyone', () => {
|
||||
const page = readSource(PAGE)
|
||||
assert.match(page, /<th style="width: 140px">分组<\/th>/, '分组列没了:删列也能满足上一条 0 命中,这里钉它确实在')
|
||||
assert.match(page, /placeholder="全部分组"/, '分组筛选下拉没了:全平台共享的列表筛不动分组就没有意义')
|
||||
assert.match(page, /v-model="form\.groupId"/, '表单的分组选择项没了')
|
||||
})
|
||||
|
||||
test('align_invalid_asin_model_keeps_no_lock_helper', () => {
|
||||
assert.doesNotMatch(readSource(MODEL), /LockedGroupId/, '纯模型里还留着按角色锁分组的那支函数')
|
||||
})
|
||||
|
||||
test('align_invalid_asin_group_roster_comes_from_its_own_endpoint', () => {
|
||||
const api = readSource(API)
|
||||
assert.match(api, /INVALID_ASIN_ENDPOINT\}\/groups/, '分组名册没走品牌库自己的端点')
|
||||
assert.doesNotMatch(api, /fetchShopManageGroups/, '名册退回店铺页那个端点:它对非超管只返回本人可访问的分组')
|
||||
})
|
||||
+16
-10
@@ -63,9 +63,17 @@ public class InvalidAsinDataController {
|
||||
@Parameter(description = "品牌模糊搜索") @RequestParam(name = "brand", required = false) String brand,
|
||||
@Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requireInvalidAsinDataAccess(request);
|
||||
return ApiResponse.success(invalidAsinDataService.page(
|
||||
page, pageSize, keyword, dataValue, brand, groupId, operator.id(), operator.superAdmin()));
|
||||
requireInvalidAsinDataAccess(request);
|
||||
return ApiResponse.success(invalidAsinDataService.page(page, pageSize, keyword, dataValue, brand, groupId));
|
||||
}
|
||||
|
||||
@GetMapping("/groups")
|
||||
@Operation(summary = "查询分组筛选名册", description = "品牌数据库页的分组下拉名册:全平台全量,"
|
||||
+ "不按操作者可访问集收窄——这一页的数据本身跨公司共享,筛得动别家的分组才有意义。")
|
||||
public ApiResponse<java.util.List<com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo>> listGroups(
|
||||
HttpServletRequest request) {
|
||||
requireInvalidAsinDataAccess(request);
|
||||
return ApiResponse.success(invalidAsinDataService.listGroupOptions());
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@@ -78,8 +86,7 @@ public class InvalidAsinDataController {
|
||||
HttpServletRequest httpRequest,
|
||||
@Valid @RequestBody InvalidAsinDataCreateRequest request) {
|
||||
RequestOperator operator = requireInvalidAsinDataAccess(httpRequest);
|
||||
return ApiResponse.success("创建成功", invalidAsinDataService.create(
|
||||
request, operator.id(), operator.superAdmin()));
|
||||
return ApiResponse.success("创建成功", invalidAsinDataService.create(request, operator.id()));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@@ -94,8 +101,7 @@ public class InvalidAsinDataController {
|
||||
HttpServletRequest httpRequest,
|
||||
@Valid @RequestBody InvalidAsinDataUpdateRequest request) {
|
||||
RequestOperator operator = requireInvalidAsinDataAccess(httpRequest);
|
||||
return ApiResponse.success("更新成功", invalidAsinDataService.update(
|
||||
id, request, operator.id(), operator.superAdmin()));
|
||||
return ApiResponse.success("更新成功", invalidAsinDataService.update(id, request, operator.id()));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@@ -106,9 +112,9 @@ public class InvalidAsinDataController {
|
||||
})
|
||||
public ApiResponse<Void> delete(
|
||||
@Parameter(description = "主键ID", required = true) @PathVariable Long id,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requireInvalidAsinDataAccess(request);
|
||||
invalidAsinDataService.delete(id, operator.id(), operator.superAdmin());
|
||||
HttpServletRequest httpRequest) {
|
||||
requireInvalidAsinDataAccess(httpRequest);
|
||||
invalidAsinDataService.delete(id);
|
||||
return ApiResponse.success("删除成功", null);
|
||||
}
|
||||
|
||||
|
||||
+26
-88
@@ -9,18 +9,23 @@ import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataItemVo;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataPageVo;
|
||||
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
|
||||
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo;
|
||||
import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 品牌数据库(不符合规则的 ASIN / 品牌)。
|
||||
*
|
||||
* <p>2026-10-06 定案、2026-10-07 收尾:这一页<b>全平台一份</b>,读、改、删都不按分组或来源设可见性差别。
|
||||
* 站点超管与公司超级管理员在这一页看到的是同一份数据、用同一套分组筛选;两者的权限差别只在
|
||||
* 公司管理与建号那一类管理动作上,不在这里。</p>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class InvalidAsinDataService {
|
||||
@@ -31,8 +36,13 @@ public class InvalidAsinDataService {
|
||||
private final InvalidAsinDataMapper invalidAsinDataMapper;
|
||||
private final ShopManageGroupService shopManageGroupService;
|
||||
|
||||
/** 分组筛选与表单下拉的名册:整平台全量,不按操作者可访问集收窄。 */
|
||||
public List<ShopManageGroupItemVo> listGroupOptions() {
|
||||
return shopManageGroupService.list();
|
||||
}
|
||||
|
||||
public InvalidAsinDataPageVo page(long page, long pageSize, String keyword, String dataValue, String brand,
|
||||
Long groupId, Long operatorId, boolean superAdmin) {
|
||||
Long groupId) {
|
||||
long safePage = Math.max(page, 1);
|
||||
long safePageSize = Math.min(Math.max(pageSize, 1), 100);
|
||||
String safeKeyword = keyword == null ? "" : keyword.trim();
|
||||
@@ -46,15 +56,7 @@ public class InvalidAsinDataService {
|
||||
.like(!safeDataValue.isEmpty(), InvalidAsinDataEntity::getDataValue, safeDataValue)
|
||||
.like(!safeBrand.isEmpty(), InvalidAsinDataEntity::getBrand, safeBrand)
|
||||
.orderByDesc(InvalidAsinDataEntity::getId);
|
||||
if (!superAdmin) {
|
||||
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
|
||||
if (fixedGroupId == null) {
|
||||
query.eq(InvalidAsinDataEntity::getId, -1L);
|
||||
} else {
|
||||
query.eq(InvalidAsinDataEntity::getRecordSource, RECORD_SOURCE_MANUAL)
|
||||
.eq(InvalidAsinDataEntity::getGroupId, fixedGroupId);
|
||||
}
|
||||
} else if (groupId != null && groupId > 0) {
|
||||
if (groupId != null && groupId > 0) {
|
||||
query.eq(InvalidAsinDataEntity::getGroupId, groupId);
|
||||
}
|
||||
Long total = invalidAsinDataMapper.selectCount(query);
|
||||
@@ -78,8 +80,8 @@ public class InvalidAsinDataService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public InvalidAsinDataItemVo create(InvalidAsinDataCreateRequest request, Long operatorId, boolean superAdmin) {
|
||||
ShopManageGroupEntity group = resolveManualWriteGroup(request.getGroupId(), operatorId, superAdmin);
|
||||
public InvalidAsinDataItemVo create(InvalidAsinDataCreateRequest request, Long operatorId) {
|
||||
ShopManageGroupEntity group = requireGroup(request.getGroupId(), operatorId);
|
||||
String dataValue = normalizeRequired(request.getDataValue(), "ASIN 不能为空");
|
||||
String brand = normalizeRequired(request.getBrand(), "品牌不能为空").toLowerCase(Locale.ROOT);
|
||||
ensureUnique(dataValue, null);
|
||||
@@ -94,16 +96,10 @@ public class InvalidAsinDataService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public InvalidAsinDataItemVo update(Long id, InvalidAsinDataUpdateRequest request, Long operatorId, boolean superAdmin) {
|
||||
public InvalidAsinDataItemVo update(Long id, InvalidAsinDataUpdateRequest request, Long operatorId) {
|
||||
InvalidAsinDataEntity entity = getById(id);
|
||||
ShopManageGroupEntity fixedGroup = ensureRecordAccess(entity, operatorId, superAdmin);
|
||||
ShopManageGroupEntity writeGroup = null;
|
||||
if (isManualRecord(entity)) {
|
||||
Long requestedGroupId = requireGroupId(request.getGroupId());
|
||||
writeGroup = superAdmin
|
||||
? shopManageGroupService.getAccessibleById(requestedGroupId, operatorId, true)
|
||||
: resolveLockedGroup(requestedGroupId, fixedGroup);
|
||||
}
|
||||
// 自动导入的行分组由采集侧决定,这一页不替它重归:沿用改造前口径,与角色无关。
|
||||
ShopManageGroupEntity writeGroup = isManualRecord(entity) ? requireGroup(request.getGroupId(), operatorId) : null;
|
||||
String dataValue = normalizeRequired(request.getDataValue(), "ASIN 不能为空");
|
||||
String brand = normalizeRequired(request.getBrand(), "品牌不能为空").toLowerCase(Locale.ROOT);
|
||||
ensureUnique(dataValue, id);
|
||||
@@ -119,21 +115,14 @@ public class InvalidAsinDataService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void delete(Long id, Long operatorId, boolean superAdmin) {
|
||||
InvalidAsinDataEntity entity = getById(id);
|
||||
ensureRecordAccess(entity, operatorId, superAdmin);
|
||||
invalidAsinDataMapper.deleteById(entity.getId());
|
||||
public void delete(Long id) {
|
||||
invalidAsinDataMapper.deleteById(getById(id).getId());
|
||||
}
|
||||
|
||||
private ShopManageGroupEntity resolveManualWriteGroup(Long requestedGroupId, Long operatorId, boolean superAdmin) {
|
||||
Long normalizedRequestedGroupId = requireGroupId(requestedGroupId);
|
||||
if (superAdmin) {
|
||||
return shopManageGroupService.getAccessibleById(
|
||||
normalizedRequestedGroupId, operatorId, true);
|
||||
}
|
||||
Long fixedGroupId = requireFixedAccessibleGroupId(operatorId);
|
||||
ensureRequestedLockedGroup(normalizedRequestedGroupId, fixedGroupId);
|
||||
return shopManageGroupService.getAccessibleById(fixedGroupId, operatorId, false);
|
||||
private ShopManageGroupEntity requireGroup(Long requestedGroupId, Long operatorId) {
|
||||
// 只校验分组存在:这一页的分组是行上的归类标签、不是可见性边界,
|
||||
// 所以走 superAdmin=true 让 getAccessibleById 跳过「可访问集」那一步(分组不存在仍报「分组不存在」)。
|
||||
return shopManageGroupService.getAccessibleById(requireGroupId(requestedGroupId), operatorId, true);
|
||||
}
|
||||
|
||||
private InvalidAsinDataEntity getById(Long id) {
|
||||
@@ -184,57 +173,6 @@ public class InvalidAsinDataService {
|
||||
.replaceAll("\\s+", " ");
|
||||
}
|
||||
|
||||
private ShopManageGroupEntity ensureRecordAccess(InvalidAsinDataEntity entity, Long operatorId, boolean superAdmin) {
|
||||
if (superAdmin) {
|
||||
return null;
|
||||
}
|
||||
if (!isManualRecord(entity) || entity.getGroupId() == null || entity.getGroupId() <= 0) {
|
||||
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作该品牌数据");
|
||||
}
|
||||
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
|
||||
if (fixedGroupId == null || !fixedGroupId.equals(entity.getGroupId())) {
|
||||
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作非固定分组数据");
|
||||
}
|
||||
try {
|
||||
return shopManageGroupService.getAccessibleById(fixedGroupId, operatorId, false);
|
||||
} catch (BusinessException exception) {
|
||||
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作该品牌数据");
|
||||
}
|
||||
}
|
||||
|
||||
private Long requireFixedAccessibleGroupId(Long operatorId) {
|
||||
Long fixedGroupId = resolveFixedAccessibleGroupId(operatorId);
|
||||
if (fixedGroupId == null) {
|
||||
throw new BusinessException("当前用户没有可访问的分组");
|
||||
}
|
||||
return fixedGroupId;
|
||||
}
|
||||
|
||||
private Long resolveFixedAccessibleGroupId(Long operatorId) {
|
||||
Set<Long> accessibleGroupIds = shopManageGroupService.listAccessibleGroupIds(operatorId, false);
|
||||
if (accessibleGroupIds == null) {
|
||||
return null;
|
||||
}
|
||||
return accessibleGroupIds.stream()
|
||||
.filter(groupId -> groupId != null && groupId > 0)
|
||||
.min(Long::compareTo)
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
private ShopManageGroupEntity resolveLockedGroup(Long requestedGroupId, ShopManageGroupEntity fixedGroup) {
|
||||
if (fixedGroup == null || fixedGroup.getId() == null) {
|
||||
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作非固定分组数据");
|
||||
}
|
||||
ensureRequestedLockedGroup(requestedGroupId, fixedGroup.getId());
|
||||
return fixedGroup;
|
||||
}
|
||||
|
||||
private void ensureRequestedLockedGroup(Long requestedGroupId, Long fixedGroupId) {
|
||||
if (fixedGroupId == null || !fixedGroupId.equals(requestedGroupId)) {
|
||||
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权操作非固定分组数据");
|
||||
}
|
||||
}
|
||||
|
||||
private Long requireGroupId(Long groupId) {
|
||||
if (groupId == null || groupId <= 0) {
|
||||
throw new BusinessException("请选择分组");
|
||||
|
||||
+92
-6
@@ -3,10 +3,12 @@ package com.nanri.aiimage.modules.invalidasin.controller;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequest;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataPageVo;
|
||||
import com.nanri.aiimage.modules.invalidasin.service.InvalidAsinDataService;
|
||||
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -34,6 +36,11 @@ import static org.mockito.Mockito.when;
|
||||
* controller 上那个 {@code company_id} 形参,形参已随定案摘掉,两条一起删除。
|
||||
* "公司维度不许回流"由 {@code CompanyIdParamGoesThroughReadScopeTest} 按 module 目录反向钉,
|
||||
* 不靠本文件(这里连可断言的参数都没有了)。</p>
|
||||
*
|
||||
* <p>10-07 把同一把尺子量到<b>分组</b>上:service 的 {@code page/update/delete} 形参表里不再有
|
||||
* {@code operatorId} 与 {@code superAdmin},所以"按人收窄可见集"这件事在编译期就接不回来了。
|
||||
* 这一页的准入门(超管恒可进、其余要本公司菜单授权)保留原样——那是"能不能进这页",
|
||||
* 不是"进来后能看哪几行"。</p>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class InvalidAsinDataControllerTest {
|
||||
@@ -66,12 +73,11 @@ class InvalidAsinDataControllerTest {
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn(null);
|
||||
when(permissionMenuService.getUserColumnPermissions(7L, "admin"))
|
||||
.thenReturn(List.of(invalidAsinDataPermission()));
|
||||
when(invalidAsinDataService.page(1L, 15L, "", "", "", 3L, 7L, false))
|
||||
.thenReturn(new InvalidAsinDataPageVo());
|
||||
when(invalidAsinDataService.page(1L, 15L, "", "", "", 3L)).thenReturn(new InvalidAsinDataPageVo());
|
||||
|
||||
controller.page(1L, 15L, "", "", "", 3L, request);
|
||||
|
||||
verify(invalidAsinDataService).page(1L, 15L, "", "", "", 3L, 7L, false);
|
||||
verify(invalidAsinDataService).page(1L, 15L, "", "", "", 3L);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -94,15 +100,95 @@ class InvalidAsinDataControllerTest {
|
||||
AdminUserEntity operator = user(1L, "super_admin");
|
||||
when(adminAuthSupport.requireUser(request)).thenReturn(operator);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(invalidAsinDataService.page(1L, 15L, "", "", "", 3L, 1L, true))
|
||||
.thenReturn(new InvalidAsinDataPageVo());
|
||||
when(invalidAsinDataService.page(1L, 15L, "", "", "", 3L)).thenReturn(new InvalidAsinDataPageVo());
|
||||
|
||||
controller.page(1L, 15L, "", "", "", 3L, request);
|
||||
|
||||
verify(invalidAsinDataService).page(1L, 15L, "", "", "", 3L, 1L, true);
|
||||
verify(invalidAsinDataService).page(1L, 15L, "", "", "", 3L);
|
||||
verify(permissionMenuService, never()).getUserColumnPermissions(eq(1L), eq("admin"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 公司超级管理员:进这一页仍要本公司给它授权(准入门不放宽),但进来之后
|
||||
* 与站点超管走同一个查询——身份不再往下传,所以"按人换一份可见集"这条路是断的。
|
||||
*/
|
||||
@Test
|
||||
void companySuperAdminNeedsTheGrantButThenGetsTheSameQueryAsSiteSuperAdmin() {
|
||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||
AdminUserEntity operator = user(1193L, "company_super_admin");
|
||||
when(adminAuthSupport.requireUser(request)).thenReturn(operator);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("company_super_admin");
|
||||
when(permissionMenuService.getUserColumnPermissions(1193L, "admin"))
|
||||
.thenReturn(List.of(invalidAsinDataPermission()));
|
||||
when(invalidAsinDataService.page(1L, 15L, "", "", "", null)).thenReturn(new InvalidAsinDataPageVo());
|
||||
|
||||
controller.page(1L, 15L, "", "", "", null, request);
|
||||
|
||||
verify(invalidAsinDataService).page(1L, 15L, "", "", "", null);
|
||||
}
|
||||
|
||||
@Test
|
||||
void companySuperAdminWithoutThePageGrantIsRejected() {
|
||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||
AdminUserEntity operator = user(1193L, "company_super_admin");
|
||||
when(adminAuthSupport.requireUser(request)).thenReturn(operator);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("company_super_admin");
|
||||
when(permissionMenuService.getUserColumnPermissions(1193L, "admin")).thenReturn(List.of());
|
||||
|
||||
assertThrows(BusinessException.class, () -> controller.page(1L, 15L, "", "", "", null, request));
|
||||
|
||||
verifyNoInteractions(invalidAsinDataService);
|
||||
}
|
||||
|
||||
/** 分组名册是这一页的筛选数据源,必须和列表同一道门,不能开成匿名端点。 */
|
||||
@Test
|
||||
void groupRosterGoesThroughTheSamePageGrant() {
|
||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||
AdminUserEntity operator = user(1L, "super_admin");
|
||||
when(adminAuthSupport.requireUser(request)).thenReturn(operator);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(invalidAsinDataService.listGroupOptions()).thenReturn(List.of(new ShopManageGroupItemVo()));
|
||||
|
||||
controller.listGroups(request);
|
||||
|
||||
verify(invalidAsinDataService).listGroupOptions();
|
||||
}
|
||||
|
||||
@Test
|
||||
void groupRosterRejectsAnonymousCaller() {
|
||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||
when(adminAuthSupport.requireUser(request)).thenThrow(new BusinessException(401, "未登录"));
|
||||
|
||||
assertThrows(BusinessException.class, () -> controller.listGroups(request));
|
||||
|
||||
verifyNoInteractions(invalidAsinDataService);
|
||||
}
|
||||
|
||||
/** 写侧同样只把 id 和表单交给 service:鉴权在门口做完,身份不进业务层。 */
|
||||
@Test
|
||||
void updateAndDeleteAuthenticateAtTheDoorAndPassNothingButTheTarget() {
|
||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||
AdminUserEntity operator = user(1L, "super_admin");
|
||||
when(adminAuthSupport.requireUser(request)).thenReturn(operator);
|
||||
when(adminAuthSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
controller.update(91L, request, new InvalidAsinDataUpdateRequest());
|
||||
controller.delete(91L, request);
|
||||
|
||||
verify(invalidAsinDataService).update(eq(91L), any(InvalidAsinDataUpdateRequest.class), eq(1L));
|
||||
verify(invalidAsinDataService).delete(91L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteWithoutAuthenticationNeverReachesTheService() {
|
||||
MockHttpServletRequest request = new MockHttpServletRequest();
|
||||
when(adminAuthSupport.requireUser(request)).thenThrow(new BusinessException(401, "未登录"));
|
||||
|
||||
assertThrows(BusinessException.class, () -> controller.delete(91L, request));
|
||||
|
||||
verifyNoInteractions(invalidAsinDataService);
|
||||
}
|
||||
|
||||
private AdminUserEntity user(Long id, String role) {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(id);
|
||||
|
||||
+178
-149
@@ -4,26 +4,26 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
|
||||
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataCreateRequest;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequest;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataItemVo;
|
||||
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataPageVo;
|
||||
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
|
||||
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo;
|
||||
import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
@@ -31,11 +31,22 @@ import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyNoInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 品牌数据库=全平台一份,这一页的读、改、删都<b>不因操作者是谁而改变可见集</b>。
|
||||
*
|
||||
* <p>2026-10-07 定档:站点超管与公司超级管理员(以及任何拿到这一页菜单授权的账号)在这里看到的是同一份
|
||||
* 数据,分组只是行上的一个归类标签、不是边界。所以本文件里的用例成对出现:一条正样本证明这把尺子量得出
|
||||
* {@code group_id}(显式筛选,另有 {@code rulersCanMeasureThePreRevertPredicate} 把退回前那半条谓词
|
||||
* 原样搭出来,专供 {@code record_source}/参数表那几条反向钉对账),另一条反向钉证明不传分组时谓词里
|
||||
* 既没有 {@code group_id} 也没有 {@code record_source}——少了前者,"没有 group_id"会因为整段条件
|
||||
* 都不存在而恒真。</p>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class InvalidAsinDataServiceTest {
|
||||
|
||||
@@ -46,9 +57,112 @@ class InvalidAsinDataServiceTest {
|
||||
@InjectMocks
|
||||
private InvalidAsinDataService service;
|
||||
|
||||
@BeforeEach
|
||||
void initTableInfo() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
InvalidAsinDataEntity.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void createManualRecordUsesAccessibleGroup() {
|
||||
void pageFiltersByRequestedGroup() {
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "", "", 9L);
|
||||
|
||||
String sql = capturedCountQuery().getSqlSegment();
|
||||
assertTrue(sql.contains("group_id"), "尺子失效:显式传了分组却量不出 group_id,下面的反向钉就是空断言");
|
||||
assertTrue(sql.contains("="));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void pageWithoutGroupFilterExposesEveryRowToEveryOperator() {
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "", "", null);
|
||||
|
||||
LambdaQueryWrapper<InvalidAsinDataEntity> query = capturedCountQuery();
|
||||
String sql = query.getSqlSegment();
|
||||
assertFalse(sql.contains("group_id"),
|
||||
"分组又变成了可见性边界:这一页全平台共享,操作员不选分组就该看到所有分组的行");
|
||||
assertFalse(sql.contains("record_source"),
|
||||
"又按来源筛了:退回前那条 record_source='MANUAL' 让自动导入的行对非站点超管永久不可见");
|
||||
assertFalse(query.getParamNameValuePairs().containsValue("MANUAL"),
|
||||
"MANUAL 参数回流了:与上一条同族,可见集被缩成手工录入");
|
||||
assertFalse(query.getParamNameValuePairs().containsValue(-1L),
|
||||
"id = -1 的空集兜底回来了:那是「账号没有可访问分组就整页判空」的老形状");
|
||||
}
|
||||
|
||||
/**
|
||||
* 上一条的尺子自证:把退回前那半条谓词原样搭一遍,确认四条 {@code assertFalse} 都量得到。
|
||||
* 少了这一条,"sql 里没有 record_source"会因为该列从没在条件里出现过而恒真。
|
||||
*/
|
||||
@Test
|
||||
void rulersCanMeasureThePreRevertPredicate() {
|
||||
LambdaQueryWrapper<InvalidAsinDataEntity> oldShape = new LambdaQueryWrapper<>();
|
||||
oldShape.eq(InvalidAsinDataEntity::getRecordSource, "MANUAL");
|
||||
oldShape.eq(InvalidAsinDataEntity::getGroupId, 9L);
|
||||
oldShape.eq(InvalidAsinDataEntity::getId, -1L);
|
||||
|
||||
String sql = oldShape.getSqlSegment();
|
||||
assertTrue(sql.contains("record_source"), "尺子失效:谓词里明明有 record_source 却量不出");
|
||||
assertTrue(sql.contains("group_id"), "尺子失效:谓词里明明有 group_id 却量不出");
|
||||
Map<String, Object> params = oldShape.getParamNameValuePairs();
|
||||
assertTrue(params.containsValue("MANUAL"), "尺子失效:MANUAL 是这条谓词的真参数值");
|
||||
assertTrue(params.containsValue(-1L), "尺子失效:-1 空集兜底是这条谓词的真参数值");
|
||||
}
|
||||
|
||||
@Test
|
||||
void pageCarriesRowsWhoseGroupIsNotResolvable() {
|
||||
InvalidAsinDataEntity automatic = data(92L, "AUTO", null);
|
||||
InvalidAsinDataEntity orphan = data(93L, "MANUAL", 999L);
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(2L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of(automatic, orphan));
|
||||
when(shopManageGroupService.buildGroupNameMap(any())).thenReturn(Map.of());
|
||||
|
||||
InvalidAsinDataPageVo page = service.page(1, 15, "", "", "", null);
|
||||
|
||||
assertEquals(2, page.getItems().size());
|
||||
assertEquals("AUTO", page.getItems().getFirst().getRecordSource());
|
||||
assertEquals("", page.getItems().getFirst().getGroupName());
|
||||
assertEquals("", page.getItems().get(1).getGroupName());
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void pageFiltersByDataValueAndBrandIndependently() {
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "B01", "acme", null);
|
||||
|
||||
LambdaQueryWrapper<InvalidAsinDataEntity> query = capturedCountQuery();
|
||||
String sql = query.getSqlSegment();
|
||||
assertTrue(sql.contains("data_value LIKE"));
|
||||
assertTrue(sql.contains("brand LIKE"));
|
||||
assertTrue(query.getParamNameValuePairs().containsValue("%B01%"));
|
||||
assertTrue(query.getParamNameValuePairs().containsValue("%acme%"));
|
||||
}
|
||||
|
||||
/** 分组名册必须整平台取:下拉只列操作者自己那几家分组的话,共享列表里的别家行就筛不动。 */
|
||||
@Test
|
||||
void groupOptionsComeFromTheWholePlatformNotTheOperator() {
|
||||
when(shopManageGroupService.list()).thenReturn(List.of(new ShopManageGroupItemVo()));
|
||||
|
||||
assertEquals(1, service.listGroupOptions().size());
|
||||
|
||||
verify(shopManageGroupService).list();
|
||||
verify(shopManageGroupService, never()).listAccessible(anyLong(), org.mockito.ArgumentMatchers.anyBoolean());
|
||||
verify(shopManageGroupService, never()).listAccessibleGroupIds(anyLong(), org.mockito.ArgumentMatchers.anyBoolean());
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void createWritesAnyRequestedGroupAndKeepsGlobalUniquenessPrecheck() {
|
||||
InvalidAsinDataCreateRequest request = new InvalidAsinDataCreateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("Acme");
|
||||
@@ -56,8 +170,7 @@ class InvalidAsinDataServiceTest {
|
||||
ShopManageGroupEntity group = group(9L, "group-a");
|
||||
InvalidAsinDataEntity saved = data(91L, "MANUAL", 9L);
|
||||
|
||||
when(shopManageGroupService.listAccessibleGroupIds(7L, false)).thenReturn(Set.of(12L, 9L));
|
||||
when(shopManageGroupService.getAccessibleById(9L, 7L, false)).thenReturn(group);
|
||||
when(shopManageGroupService.getAccessibleById(9L, 7L, true)).thenReturn(group);
|
||||
when(invalidAsinDataMapper.selectOne(any())).thenReturn(null);
|
||||
when(invalidAsinDataMapper.insert(any(InvalidAsinDataEntity.class))).thenAnswer(invocation -> {
|
||||
invocation.getArgument(0, InvalidAsinDataEntity.class).setId(91L);
|
||||
@@ -65,7 +178,7 @@ class InvalidAsinDataServiceTest {
|
||||
});
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(saved);
|
||||
|
||||
InvalidAsinDataItemVo item = service.create(request, 7L, false);
|
||||
InvalidAsinDataItemVo item = service.create(request, 7L);
|
||||
|
||||
ArgumentCaptor<InvalidAsinDataEntity> captor = ArgumentCaptor.forClass(InvalidAsinDataEntity.class);
|
||||
verify(invalidAsinDataMapper).insert(captor.capture());
|
||||
@@ -76,6 +189,10 @@ class InvalidAsinDataServiceTest {
|
||||
assertEquals("group-a", item.getGroupName());
|
||||
assertEquals("MANUAL", item.getRecordSource());
|
||||
assertEquals(7L, captor.getValue().getUploaderUserId());
|
||||
// 建号侧不再问"这个分组你够不够得着",也不先推一个固定组:分组存在即可写。
|
||||
// 排他要精确到 superAdmin=false 那一支——true 那一支是现在正当的用法(只验分组存在)。
|
||||
verify(shopManageGroupService, never()).listAccessibleGroupIds(anyLong(), org.mockito.ArgumentMatchers.anyBoolean());
|
||||
verify(shopManageGroupService, never()).getAccessibleById(anyLong(), anyLong(), org.mockito.ArgumentMatchers.eq(false));
|
||||
// 重复预检与 V151 退回后的全局唯一键 (data_value, brand) 同宽。
|
||||
// 这是反向钉(2026-10-06 定案「品牌数据库全平台共享,不区分」):预检再带上 company_id 的话,
|
||||
// 键是全局的而预检是按家的 ⇒ 同一 ASIN 在第 2 家能插进去,撞库时报 1062 而不是「ASIN 已存在」,
|
||||
@@ -83,9 +200,6 @@ class InvalidAsinDataServiceTest {
|
||||
ArgumentCaptor<LambdaQueryWrapper<InvalidAsinDataEntity>> unique =
|
||||
ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(invalidAsinDataMapper).selectOne(unique.capture());
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
InvalidAsinDataEntity.class);
|
||||
String uniqueSql = unique.getValue().getSqlSegment();
|
||||
assertTrue(uniqueSql.contains("data_value"), "预检判据整段没了:换了写法,下面的排他就是空断言");
|
||||
assertFalse(uniqueSql.contains("company_id"),
|
||||
@@ -95,173 +209,60 @@ class InvalidAsinDataServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void normalUserPageOnlyQueriesManualRowsInAccessibleGroups() {
|
||||
InvalidAsinDataEntity manual = data(91L, "MANUAL", 9L);
|
||||
when(shopManageGroupService.listAccessibleGroupIds(7L, false)).thenReturn(Set.of(10L, 9L));
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(1L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of(manual));
|
||||
when(shopManageGroupService.buildGroupNameMap(any())).thenReturn(Map.of(9L, "group-a"));
|
||||
void createRequiresAGroupButNotAnAccessibleOne() {
|
||||
InvalidAsinDataCreateRequest request = new InvalidAsinDataCreateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("Acme");
|
||||
|
||||
InvalidAsinDataPageVo page = service.page(1, 15, "", "", "", 10L, 7L, false);
|
||||
assertThrows(BusinessException.class, () -> service.create(request, 7L));
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<InvalidAsinDataEntity>> captor = ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(invalidAsinDataMapper).selectCount(captor.capture());
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
InvalidAsinDataEntity.class);
|
||||
String sql = captor.getValue().getSqlSegment();
|
||||
assertTrue(sql.contains("record_source"));
|
||||
assertTrue(sql.contains("group_id"));
|
||||
assertTrue(captor.getValue().getParamNameValuePairs().containsValue("MANUAL"));
|
||||
assertTrue(captor.getValue().getParamNameValuePairs().containsValue(9L));
|
||||
assertFalse(captor.getValue().getParamNameValuePairs().containsValue(10L));
|
||||
assertEquals("group-a", page.getItems().getFirst().getGroupName());
|
||||
verify(invalidAsinDataMapper, never()).insert(any(InvalidAsinDataEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void superAdminPageHandlesRowsWithoutResolvableGroup() {
|
||||
InvalidAsinDataEntity automatic = data(92L, "AUTO", null);
|
||||
InvalidAsinDataEntity orphan = data(93L, "MANUAL", 999L);
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(1L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of(automatic, orphan));
|
||||
when(shopManageGroupService.buildGroupNameMap(any())).thenReturn(Map.of());
|
||||
void createRejectsGroupThatDoesNotExist() {
|
||||
InvalidAsinDataCreateRequest request = new InvalidAsinDataCreateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("Acme");
|
||||
request.setGroupId(9L);
|
||||
when(shopManageGroupService.getAccessibleById(9L, 7L, true)).thenThrow(new BusinessException("分组不存在"));
|
||||
|
||||
InvalidAsinDataPageVo page = service.page(1, 15, "", "", "", null, 1L, true);
|
||||
assertThrows(BusinessException.class, () -> service.create(request, 7L));
|
||||
|
||||
assertEquals(2, page.getItems().size());
|
||||
assertEquals("AUTO", page.getItems().getFirst().getRecordSource());
|
||||
assertEquals("", page.getItems().getFirst().getGroupName());
|
||||
assertEquals("", page.getItems().get(1).getGroupName());
|
||||
verify(invalidAsinDataMapper, never()).insert(any(InvalidAsinDataEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void superAdminPageFiltersByRequestedGroup() {
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "", "", 9L, 1L, true);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<InvalidAsinDataEntity>> captor = ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(invalidAsinDataMapper).selectCount(captor.capture());
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
InvalidAsinDataEntity.class);
|
||||
assertTrue(captor.getValue().getSqlSegment().contains("group_id"));
|
||||
assertTrue(captor.getValue().getParamNameValuePairs().containsValue(9L));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
void pageFiltersByDataValueAndBrandIndependently() {
|
||||
when(invalidAsinDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(invalidAsinDataMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
service.page(1, 15, "", "B01", "acme", null, 1L, true);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<InvalidAsinDataEntity>> captor = ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(invalidAsinDataMapper).selectCount(captor.capture());
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
InvalidAsinDataEntity.class);
|
||||
String sql = captor.getValue().getSqlSegment();
|
||||
assertTrue(sql.contains("data_value LIKE"));
|
||||
assertTrue(sql.contains("brand LIKE"));
|
||||
assertTrue(captor.getValue().getParamNameValuePairs().containsValue("%B01%"));
|
||||
assertTrue(captor.getValue().getParamNameValuePairs().containsValue("%acme%"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void normalUserCannotDeleteAutoRecord() {
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(data(91L, "AUTO", null));
|
||||
|
||||
ResponseStatusException exception = assertThrows(
|
||||
ResponseStatusException.class,
|
||||
() -> service.delete(91L, 7L, false));
|
||||
|
||||
assertEquals(403, exception.getStatusCode().value());
|
||||
verify(invalidAsinDataMapper, never()).deleteById(any(Long.class));
|
||||
verifyNoInteractions(shopManageGroupService);
|
||||
}
|
||||
|
||||
@Test
|
||||
void normalUserCannotUpdateIntoAnotherAccessibleGroup() {
|
||||
void manualRecordCanBeMovedToAnotherGroupByAnyone() {
|
||||
InvalidAsinDataEntity record = data(91L, "MANUAL", 9L);
|
||||
InvalidAsinDataUpdateRequest request = new InvalidAsinDataUpdateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("New Brand");
|
||||
request.setGroupId(10L);
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(record);
|
||||
when(shopManageGroupService.listAccessibleGroupIds(7L, false)).thenReturn(Set.of(10L, 9L));
|
||||
when(shopManageGroupService.getAccessibleById(9L, 7L, false)).thenReturn(group(9L, "group-a"));
|
||||
when(shopManageGroupService.getAccessibleById(10L, 7L, true)).thenReturn(group(10L, "group-b"));
|
||||
when(invalidAsinDataMapper.selectOne(any())).thenReturn(null);
|
||||
when(invalidAsinDataMapper.updateById(any(InvalidAsinDataEntity.class))).thenReturn(1);
|
||||
|
||||
ResponseStatusException exception = assertThrows(
|
||||
ResponseStatusException.class,
|
||||
() -> service.update(91L, request, 7L, false));
|
||||
InvalidAsinDataItemVo item = service.update(91L, request, 7L);
|
||||
|
||||
assertEquals(403, exception.getStatusCode().value());
|
||||
assertEquals(9L, record.getGroupId());
|
||||
assertEquals("acme", record.getBrand());
|
||||
verify(invalidAsinDataMapper, never()).updateById(any(InvalidAsinDataEntity.class));
|
||||
verify(shopManageGroupService, never()).getAccessibleById(10L, 7L, false);
|
||||
assertEquals(10L, record.getGroupId());
|
||||
assertEquals("group-b", item.getGroupName());
|
||||
verify(invalidAsinDataMapper).updateById(record);
|
||||
verify(shopManageGroupService, never()).getAccessibleById(anyLong(), anyLong(), org.mockito.ArgumentMatchers.eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
void normalUserCannotCreateInAnotherAccessibleGroup() {
|
||||
InvalidAsinDataCreateRequest request = new InvalidAsinDataCreateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("Acme");
|
||||
request.setGroupId(10L);
|
||||
when(shopManageGroupService.listAccessibleGroupIds(7L, false)).thenReturn(Set.of(10L, 9L));
|
||||
|
||||
ResponseStatusException exception = assertThrows(
|
||||
ResponseStatusException.class,
|
||||
() -> service.create(request, 7L, false));
|
||||
|
||||
assertEquals(403, exception.getStatusCode().value());
|
||||
verify(invalidAsinDataMapper, never()).insert(any(InvalidAsinDataEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void normalUserCannotDeleteRecordOutsideFixedGroup() {
|
||||
InvalidAsinDataEntity record = data(91L, "MANUAL", 10L);
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(record);
|
||||
when(shopManageGroupService.listAccessibleGroupIds(7L, false)).thenReturn(Set.of(10L, 9L));
|
||||
|
||||
ResponseStatusException exception = assertThrows(
|
||||
ResponseStatusException.class,
|
||||
() -> service.delete(91L, 7L, false));
|
||||
|
||||
assertEquals(403, exception.getStatusCode().value());
|
||||
verify(invalidAsinDataMapper, never()).deleteById(any(Long.class));
|
||||
verify(shopManageGroupService, never()).getAccessibleById(any(Long.class), any(Long.class), org.mockito.ArgumentMatchers.eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
void normalUserCreateRequiresAtLeastOneAccessibleGroup() {
|
||||
InvalidAsinDataCreateRequest request = new InvalidAsinDataCreateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("Acme");
|
||||
request.setGroupId(9L);
|
||||
when(shopManageGroupService.listAccessibleGroupIds(7L, false)).thenReturn(Set.of());
|
||||
|
||||
assertThrows(BusinessException.class, () -> service.create(request, 7L, false));
|
||||
|
||||
verify(invalidAsinDataMapper, never()).insert(any(InvalidAsinDataEntity.class));
|
||||
verify(shopManageGroupService, never()).getAccessibleById(any(Long.class), any(Long.class), org.mockito.ArgumentMatchers.eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
void superAdminCanUpdateAutoRecordWithoutGroup() {
|
||||
void autoRecordUpdateKeepsItsGroupUntouched() {
|
||||
InvalidAsinDataEntity record = data(91L, "AUTO", null);
|
||||
InvalidAsinDataUpdateRequest request = new InvalidAsinDataUpdateRequest();
|
||||
request.setDataValue("B012345678");
|
||||
request.setBrand("New Brand");
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(record);
|
||||
when(invalidAsinDataMapper.selectOne(any())).thenReturn(null);
|
||||
when(invalidAsinDataMapper.updateById(any(InvalidAsinDataEntity.class))).thenReturn(1);
|
||||
|
||||
InvalidAsinDataItemVo item = service.update(91L, request, 1L, true);
|
||||
InvalidAsinDataItemVo item = service.update(91L, request, 7L);
|
||||
|
||||
assertEquals("AUTO", item.getRecordSource());
|
||||
assertNull(record.getGroupId());
|
||||
@@ -269,6 +270,34 @@ class InvalidAsinDataServiceTest {
|
||||
verifyNoInteractions(shopManageGroupService);
|
||||
}
|
||||
|
||||
/** 自动导入的行同样能被删:退回前它对所有非站点超管既看不见也删不掉。 */
|
||||
@Test
|
||||
void anyRecordCanBeDeletedRegardlessOfSourceOrGroup() {
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(data(91L, "AUTO", null));
|
||||
|
||||
service.delete(91L);
|
||||
|
||||
verify(invalidAsinDataMapper).deleteById(91L);
|
||||
verifyNoInteractions(shopManageGroupService);
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteMissingRecordReportsNotFoundInsteadOfForbidden() {
|
||||
when(invalidAsinDataMapper.selectById(91L)).thenReturn(null);
|
||||
|
||||
assertThrows(BusinessException.class, () -> service.delete(91L));
|
||||
|
||||
verify(invalidAsinDataMapper, never()).deleteById(any(Long.class));
|
||||
}
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
private LambdaQueryWrapper<InvalidAsinDataEntity> capturedCountQuery() {
|
||||
ArgumentCaptor<LambdaQueryWrapper<InvalidAsinDataEntity>> captor =
|
||||
ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(invalidAsinDataMapper).selectCount(captor.capture());
|
||||
return captor.getValue();
|
||||
}
|
||||
|
||||
private ShopManageGroupEntity group(Long id, String groupName) {
|
||||
ShopManageGroupEntity group = new ShopManageGroupEntity();
|
||||
group.setId(id);
|
||||
|
||||
@@ -57,9 +57,16 @@ CollectDataBatchQuery.java:46 SELECT data_value FROM biz_dedupe_total_data
|
||||
## 2. 已定口径(用户 2026-10-04 拍定,勿重开)
|
||||
|
||||
1. 两张表都是**每公司一套**(不是全平台共享)。
|
||||
—— **本条对品牌库已被 2026-10-06 推翻**(`V151__rule_tables_shared_across_companies.sql` 退回全局唯一键);
|
||||
对去重库继续成立。
|
||||
2. 租户键**破例物化为 `company_id` 列**,不用 `uploader_user_id` 派生、不复用店铺分组。
|
||||
—— 这推翻一期"不给业务表加 `company_id` 冗余列"(`db/V143:5-8`)与"不复用店铺分组当租户"两条,仅限这两张表。
|
||||
3. 一期"复用店铺分组当租户"被否掉的理由仍然成立(那 4 段 UNION 覆盖面窄、成员表已判废),所以 `group_id` **保留原语义**(店铺分组 = 操作维度),公司边界一律走新 `company_id`,两者不互相替代。
|
||||
—— **2026-10-07 补:品牌库这一页上 `group_id` 只剩归类标签一个用途。**
|
||||
它既不是公司边界,也不是可见性边界——`InvalidAsinDataService` 的 `page/update/delete` 形参里不再收操作者与角色,
|
||||
任何能进这一页的账号看到同一份数据、可按任意分组筛选、可改删任意行;分组名册走该页自己的
|
||||
`GET /api/admin/invalid-asin-data/groups`(店铺页那个 `/shop-manages/groups` 对非超管只返回本人可访问分组,不能用)。
|
||||
反向钉在 `admin-frontend-vue/tests/align-invalid-asin-shared.test.ts`。
|
||||
|
||||
---
|
||||
|
||||
|
||||
Reference in New Issue
Block a user