fix(任务终态): 店铺级部分失败不再静默SUCCESS——四模块按失败原因如实标FAILED
- ProductRiskTaskService: 新增结果组装守卫(isResultAwaitingFileAssembly),部分店铺失败→FAILED; 补ProductRiskTaskServiceTest - PriceTrackTaskService: 部分店铺失败→FAILED - DeleteBrandRunService: failedCount>0→FAILED(不再"有成功就算成功"),预览行与计数反映组装终态 - ShopMatchTaskService: 同模式
This commit is contained in:
+286
@@ -0,0 +1,286 @@
|
||||
package com.nanri.aiimage.modules.productrisk.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.service.ResultDownloadResolver;
|
||||
import com.nanri.aiimage.config.TaskPressureProperties;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.productrisk.mapper.ProductRiskShopCandidateMapper;
|
||||
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskRowDto;
|
||||
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskShopPayloadDto;
|
||||
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultPayloadService;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.support.SimpleTransactionStatus;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 审批(PRODUCT_RISK_RESOLVE)任务终态语义回归:
|
||||
* 2026-09-30 生产事故——客户端在某个国家的搜索/切换失败后「跳过该国家」只打本机日志、
|
||||
* 服务端收不到任何失败信号,任务最后仍判 SUCCESS(25 条全绿)。本测试锁定:
|
||||
* 1) 店铺带 error 上报(有已跑出的行)→ 部分结果文件组装完成后任务判 FAILED,不再是 SUCCESS;
|
||||
* 2) 部分结果文件仍在组装期间不得提前终态(否则前端停轮询、下载按钮永不出现);
|
||||
* 3) 店铺带 error 且一行可用数据都没有 → 纯失败(不排队组装);
|
||||
* 4) 全部店铺成功 → 依旧 SUCCESS(不误伤);
|
||||
* 5) 删行重算(reconcile)与主判定同一口径:部分失败不会被翻回 SUCCESS。
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class ProductRiskTaskServiceTest {
|
||||
|
||||
private static final String MODULE_TYPE = "PRODUCT_RISK_RESOLVE";
|
||||
private static final String SHOP_KEY = "蔡建芳";
|
||||
private static final String SKIP_REASON = "切换到国家(False)/库存页面(True)/搜索筛选到指定选项(False) 德国 失败,已重试 5 次,跳过该国家";
|
||||
|
||||
@Mock private FileTaskMapper fileTaskMapper;
|
||||
@Mock private FileResultMapper fileResultMapper;
|
||||
@Mock private ProductRiskShopCandidateMapper candidateMapper;
|
||||
@Mock private ZiniaoShopSwitchService ziniaoShopSwitchService;
|
||||
@Mock private ProductRiskExcelAssemblyService excelAssemblyService;
|
||||
@Mock private OssStorageService ossStorageService;
|
||||
@Mock private ResultDownloadResolver resultDownloadResolver;
|
||||
@Mock private ObjectMapper objectMapper;
|
||||
@Mock private ProductRiskTaskCacheService productRiskTaskCacheService;
|
||||
@Mock private TaskPressureProperties taskPressureProperties;
|
||||
@Mock private TaskResultPayloadService taskResultPayloadService;
|
||||
@Mock private TaskFileJobService taskFileJobService;
|
||||
@Mock private TaskResultItemService taskResultItemService;
|
||||
@Mock private TaskProgressSnapshotService taskProgressSnapshotService;
|
||||
@Mock private TaskDistributedLockService taskDistributedLockService;
|
||||
@Mock private TaskProgressLightAssembler taskProgressLightAssembler;
|
||||
@Mock private PlatformTransactionManager transactionManager;
|
||||
|
||||
@InjectMocks private ProductRiskTaskService service;
|
||||
|
||||
/**
|
||||
* 核心回归(原 bug):一个店铺成功 + 一个店铺失败(带原因、部分结果文件已就绪)
|
||||
* → 任务必须 FAILED 并写明原因,不再假绿成 SUCCESS。
|
||||
*/
|
||||
@Test
|
||||
void partialFailureMarksTaskFailedNotSuccess() {
|
||||
long taskId = 29593L;
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
|
||||
FileResultEntity okResult = shopResult(92001L, taskId, "张三", 1, null);
|
||||
okResult.setResultFilename("张三.zip");
|
||||
okResult.setResultFileUrl("oss/product-risk/zhang.zip");
|
||||
|
||||
FileResultEntity failedResult = shopResult(92002L, taskId, SHOP_KEY, null, null);
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock);
|
||||
when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(okResult, failedResult));
|
||||
when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY);
|
||||
when(excelAssemblyService.normalizeCountriesMap(any())).thenReturn(Map.of("德国", List.of(businessRow())));
|
||||
when(excelAssemblyService.countRows(any())).thenReturn(1);
|
||||
// 模拟失败店铺的部分结果文件已组装完成(真实流程由 processResultFileJob 写回并重算状态)
|
||||
TaskFileJobEntity doneJob = new TaskFileJobEntity();
|
||||
doneJob.setStatus("SUCCESS");
|
||||
when(taskFileJobService.findAssembleJobsByResultIds(eq(MODULE_TYPE), anyList()))
|
||||
.thenReturn(Map.of(failedResult.getId(), doneJob));
|
||||
|
||||
service.submitResult(taskId, requestWithFailedShop());
|
||||
|
||||
assertEquals("FAILED", task.getStatus(), "部分店铺失败必须如实判 FAILED,不能再标 SUCCESS");
|
||||
assertNotNull(task.getFinishedAt());
|
||||
assertNotNull(task.getErrorMessage());
|
||||
assertTrue(task.getErrorMessage().contains("跳过该国家"),
|
||||
"失败原因要回显给用户,实际=" + task.getErrorMessage());
|
||||
assertEquals(0, failedResult.getSuccess(), "失败店铺保留失败态(部分结果可下载)");
|
||||
assertEquals("蔡建芳.zip", failedResult.getResultFilename());
|
||||
verify(lock).close();
|
||||
}
|
||||
|
||||
/**
|
||||
* 守卫回归:失败店铺的部分结果文件尚在组装(job 未 SUCCESS)→ 任务保持 RUNNING,
|
||||
* 不得提前终态;文件就绪后再由组装回调判 FAILED。
|
||||
*/
|
||||
@Test
|
||||
void failedShopAwaitingPartialFileKeepsTaskRunning() {
|
||||
long taskId = 29594L;
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
FileResultEntity failedResult = shopResult(92011L, taskId, SHOP_KEY, null, null);
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock);
|
||||
when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(failedResult));
|
||||
when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY);
|
||||
when(excelAssemblyService.normalizeCountriesMap(any())).thenReturn(Map.of("德国", List.of(businessRow())));
|
||||
when(excelAssemblyService.countRows(any())).thenReturn(1);
|
||||
TaskFileJobEntity pendingJob = new TaskFileJobEntity();
|
||||
pendingJob.setStatus("ENQUEUED");
|
||||
when(taskFileJobService.findAssembleJobsByResultIds(eq(MODULE_TYPE), anyList()))
|
||||
.thenReturn(Map.of(failedResult.getId(), pendingJob));
|
||||
|
||||
service.submitResult(taskId, requestWithFailedShop());
|
||||
|
||||
assertEquals("RUNNING", task.getStatus(), "部分结果文件没落地前任务不得终态");
|
||||
assertNull(task.getFinishedAt());
|
||||
assertNull(task.getErrorMessage());
|
||||
assertEquals("蔡建芳.zip", failedResult.getResultFilename());
|
||||
assertNull(failedResult.getResultFileUrl(), "文件未组装完成时不能有下载直链");
|
||||
assertEquals(SKIP_REASON, failedResult.getErrorMessage());
|
||||
verify(taskFileJobService).enqueueAssembleResult(taskId, MODULE_TYPE, failedResult.getId(), SHOP_KEY);
|
||||
}
|
||||
|
||||
/**
|
||||
* 失败店铺一行可用数据都没有 → 纯失败:不排队组装,任务 FAILED 且带原因。
|
||||
*/
|
||||
@Test
|
||||
void failedShopWithoutAnyRowsFailsWithoutResultFile() {
|
||||
long taskId = 29595L;
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
FileResultEntity failedResult = shopResult(92021L, taskId, SHOP_KEY, null, null);
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock);
|
||||
when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(failedResult));
|
||||
when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY);
|
||||
|
||||
ProductRiskSubmitResultRequest request = requestWithFailedShop();
|
||||
request.getShops().get(0).setCountries(new java.util.LinkedHashMap<>());
|
||||
service.submitResult(taskId, request);
|
||||
|
||||
assertEquals("FAILED", task.getStatus());
|
||||
assertTrue(task.getErrorMessage().contains("跳过该国家"));
|
||||
assertNull(failedResult.getResultFilename(), "零行可用时不应产出结果文件");
|
||||
verify(taskFileJobService, never()).enqueueAssembleResult(any(), any(), any(), any());
|
||||
}
|
||||
|
||||
/** 全部店铺成功 → 依旧 SUCCESS(本次改动不误伤全绿任务)。 */
|
||||
@Test
|
||||
void allShopsSucceededStaysSuccess() {
|
||||
long taskId = 29596L;
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
FileResultEntity okResult = shopResult(92031L, taskId, "张三", 1, null);
|
||||
okResult.setResultFilename("张三.zip");
|
||||
okResult.setResultFileUrl("oss/product-risk/zhang.zip");
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock);
|
||||
when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(okResult));
|
||||
when(ziniaoShopSwitchService.normalizeShopName("张三")).thenReturn("张三");
|
||||
|
||||
ProductRiskShopPayloadDto payload = new ProductRiskShopPayloadDto();
|
||||
payload.setShopName("张三");
|
||||
payload.setCountries(Map.of(ProductRiskCountryCode.DE, List.of(businessRow())));
|
||||
ProductRiskSubmitResultRequest request = new ProductRiskSubmitResultRequest();
|
||||
request.setShops(List.of(payload));
|
||||
|
||||
service.submitResult(taskId, request);
|
||||
|
||||
assertEquals("SUCCESS", task.getStatus());
|
||||
assertNull(task.getErrorMessage());
|
||||
assertNotNull(task.getFinishedAt());
|
||||
}
|
||||
|
||||
/**
|
||||
* 删行重算(reconcile)同一口径:删一条行后剩下的结果为一成功一失败
|
||||
* → 任务保持/判为 FAILED,不会被翻回 SUCCESS。
|
||||
*/
|
||||
@Test
|
||||
void reconcileAfterRemovalKeepsPartialFailureFailed() {
|
||||
long taskId = 29600L;
|
||||
long userId = 671L;
|
||||
FileResultEntity candidate = shopResult(93001L, taskId, SHOP_KEY, null, null);
|
||||
candidate.setUserId(userId);
|
||||
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
task.setUserId(userId);
|
||||
|
||||
FileResultEntity okResult = shopResult(93002L, taskId, "张三", 1, null);
|
||||
okResult.setResultFilename("张三.zip");
|
||||
okResult.setResultFileUrl("oss/product-risk/zhang.zip");
|
||||
FileResultEntity failedResult = shopResult(93003L, taskId, "李四", 0, "德国: 跳过该国家");
|
||||
failedResult.setResultFilename("李四.zip");
|
||||
failedResult.setResultFileUrl("oss/product-risk/li.zip");
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(ziniaoShopSwitchService.normalizeShopName(SHOP_KEY)).thenReturn(SHOP_KEY);
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(candidate), List.of(okResult, failedResult));
|
||||
when(productRiskTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(taskDistributedLockService.acquire(MODULE_TYPE, taskId)).thenReturn(lock);
|
||||
when(fileResultMapper.selectById(93001L)).thenReturn(candidate);
|
||||
when(transactionManager.getTransaction(any())).thenReturn(new SimpleTransactionStatus());
|
||||
|
||||
service.deletePendingShopResult(userId, SHOP_KEY);
|
||||
|
||||
assertEquals("FAILED", task.getStatus(), "部分失败任务被删行重算后不能翻回 SUCCESS");
|
||||
assertTrue(task.getErrorMessage().contains("跳过该国家"));
|
||||
assertEquals(1, task.getSuccessFileCount());
|
||||
assertEquals(1, task.getFailedFileCount());
|
||||
verify(fileResultMapper).deleteById(93001L);
|
||||
verify(lock).close();
|
||||
}
|
||||
|
||||
private FileTaskEntity runningTask(long taskId) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(taskId);
|
||||
task.setUserId(671L);
|
||||
task.setModuleType(MODULE_TYPE);
|
||||
task.setStatus("RUNNING");
|
||||
return task;
|
||||
}
|
||||
|
||||
private FileResultEntity shopResult(Long id, long taskId, String shopKey, Integer success, String errorMessage) {
|
||||
FileResultEntity result = new FileResultEntity();
|
||||
result.setId(id);
|
||||
result.setTaskId(taskId);
|
||||
result.setModuleType(MODULE_TYPE);
|
||||
result.setSourceFilename(shopKey);
|
||||
result.setSuccess(success);
|
||||
result.setErrorMessage(errorMessage);
|
||||
return result;
|
||||
}
|
||||
|
||||
/** 一行真实业务数据(productAsinSku 非空即算业务行)。 */
|
||||
private ProductRiskRowDto businessRow() {
|
||||
ProductRiskRowDto row = new ProductRiskRowDto();
|
||||
row.setProductAsinSku("B0TEST123");
|
||||
row.setStatus("处理完成");
|
||||
return row;
|
||||
}
|
||||
|
||||
private ProductRiskSubmitResultRequest requestWithFailedShop() {
|
||||
ProductRiskShopPayloadDto payload = new ProductRiskShopPayloadDto();
|
||||
payload.setShopName(SHOP_KEY);
|
||||
payload.setError(SKIP_REASON);
|
||||
payload.setCountries(Map.of(ProductRiskCountryCode.DE, List.of(businessRow())));
|
||||
ProductRiskSubmitResultRequest request = new ProductRiskSubmitResultRequest();
|
||||
request.setShops(List.of(payload));
|
||||
return request;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user