1461a8d113
按 2026-11-02 需求补齐计划交付后端能力： - 角色授权：权限目录化，接口统一准入校验，未登记默认拒绝； 管理员判断改为按数据库角色重新判定，防止权限码持有者绕过 - 系统监控：单进程采集资源、请求与异常指标，分钟级聚合， 阈值配置化；敏感配置增加 repr 保护，Redis 密码 URL 转义 - 试用期计提：按回款日判定并写入快照，年度结清与调整单联动； 人员模型补试用期、离职日期与工资版本历史字段 - 计提模板：公式骨架受控，页面维护名称与参数绑定 - T+ 采集：自动化配置表与进度查询 内置角色禁停用保护对齐模块注释；核算规则版本提为常量并 补充批量核算失败堆栈日志。 影响范围：后端全部模块、数据库迁移 V22-V28 验证：uv run ruff check 通过；922 个单元测试全部通过； 集成测试因本机 MySQL 数据卷被其他容器锁定暂未运行
104 lines
4.2 KiB
Python
104 lines
4.2 KiB
Python
"""同一意图不可重复排队，重试必须保留原始批次和范围。"""
|
|
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
from sqlalchemy import func, select
|
|
|
|
from app.core.exceptions import BadRequestError
|
|
from app.models import TPlusSyncBatch, TPlusSyncError
|
|
from app.schemas.tplus import TPlusCreateIn, TPlusRetryIn
|
|
from app.services.tplus import task_service
|
|
|
|
|
|
def _create(**kwargs):
|
|
return TPlusCreateIn(request_key=uuid4(), entity_types=["products"], **kwargs)
|
|
|
|
|
|
def test_关闭源读取仍禁止新建采集任务(tplus_session, monkeypatch):
|
|
from app.core.config import Settings
|
|
|
|
settings = Settings(_env_file=None, app_secret_key="x" * 32)
|
|
monkeypatch.setattr(task_service, "get_settings", lambda: settings)
|
|
with pytest.raises(BadRequestError, match="未启用"):
|
|
task_service.create_task(tplus_session, _create())
|
|
assert tplus_session.scalar(select(func.count()).select_from(TPlusSyncBatch)) == 0
|
|
|
|
|
|
def test_同键同意图复用同一批次(tplus_session):
|
|
request = _create()
|
|
first = task_service.create_task(tplus_session, request)
|
|
second = task_service.create_task(tplus_session, request)
|
|
assert first.id == second.id
|
|
assert first.status == "QUEUED"
|
|
assert first.started_at is None
|
|
assert first.entity_types_json == ["products"]
|
|
assert tplus_session.scalar(select(func.count()).select_from(TPlusSyncBatch)) == 1
|
|
|
|
|
|
def test_同键不同范围拒绝(tplus_session):
|
|
request = _create()
|
|
task_service.create_task(tplus_session, request)
|
|
changed = TPlusCreateIn(request_key=request.request_key, entity_types=["personnel"])
|
|
with pytest.raises(BadRequestError, match="幂等"):
|
|
task_service.create_task(tplus_session, changed)
|
|
|
|
|
|
def test_失败重试创建新批次并保留原错误(tplus_session):
|
|
parent = task_service.create_task(tplus_session, _create())
|
|
parent.status = "FAILED"
|
|
tplus_session.add(
|
|
TPlusSyncError(
|
|
batch_no=parent.batch_no,
|
|
entity_type="products",
|
|
source_table="AA_Inventory",
|
|
error_code="READ_ERROR",
|
|
error_message="读取失败",
|
|
)
|
|
)
|
|
tplus_session.commit()
|
|
retry = TPlusRetryIn(request_key=uuid4())
|
|
child = task_service.retry_task(tplus_session, parent.batch_no, retry)
|
|
replay = task_service.retry_task(tplus_session, parent.batch_no, retry)
|
|
assert child.id == replay.id and child.id != parent.id
|
|
assert child.parent_batch_no == parent.batch_no
|
|
assert parent.status == "FAILED"
|
|
assert tplus_session.scalar(select(TPlusSyncError.retry_count)) == 1
|
|
|
|
|
|
def test_已有未完成重试时不重复排队(tplus_session):
|
|
parent = task_service.create_task(tplus_session, _create())
|
|
parent.status = "FAILED"
|
|
tplus_session.commit()
|
|
task_service.retry_task(tplus_session, parent.batch_no, TPlusRetryIn(request_key=uuid4()))
|
|
with pytest.raises(BadRequestError, match="重试任务"):
|
|
task_service.retry_task(tplus_session, parent.batch_no, TPlusRetryIn(request_key=uuid4()))
|
|
|
|
|
|
def test_成功或未知历史范围不能自动重试(tplus_session):
|
|
parent = task_service.create_task(tplus_session, _create())
|
|
parent.status = "SUCCEEDED"
|
|
tplus_session.commit()
|
|
with pytest.raises(BadRequestError):
|
|
task_service.retry_task(tplus_session, parent.batch_no, TPlusRetryIn(request_key=uuid4()))
|
|
parent.status, parent.entity_types_json = "FAILED", None
|
|
tplus_session.commit()
|
|
with pytest.raises(BadRequestError, match="范围"):
|
|
task_service.retry_task(tplus_session, parent.batch_no, TPlusRetryIn(request_key=uuid4()))
|
|
|
|
|
|
def test_关联核验不需要读取实体范围(tplus_session):
|
|
batch = task_service.create_task(
|
|
tplus_session, TPlusCreateIn(task_type="AUDIT", request_key=uuid4())
|
|
)
|
|
assert batch.sync_mode == "AUDIT"
|
|
assert batch.entity_types_json == []
|
|
|
|
|
|
def test_预留增量批次不得静默改为全量重试(tplus_session):
|
|
batch = task_service.create_task(tplus_session, _create())
|
|
batch.status, batch.sync_mode = "FAILED", "INCREMENTAL"
|
|
tplus_session.commit()
|
|
with pytest.raises(BadRequestError, match="方式"):
|
|
task_service.retry_task(tplus_session, batch.batch_no, TPlusRetryIn(request_key=uuid4()))
|