优化(直播履约): 即时选号并收敛订单快照同步
This commit is contained in:
@@ -35,7 +35,7 @@ TESTS_DIR = Path(__file__).resolve().parent
|
||||
PROJECT_ROOT = TESTS_DIR.parent
|
||||
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
||||
|
||||
HEAD_REVISION = "20261118_0088"
|
||||
HEAD_REVISION = "20261118_0089"
|
||||
|
||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||
EXTRA_INDEXES = (
|
||||
|
||||
@@ -357,8 +357,8 @@ class TestSyncAndMapping(_Base):
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
service,
|
||||
"sync_pending_tasks",
|
||||
lambda *_args, **_kwargs: {"fetched": 0},
|
||||
"lookup_pending_manual_fulfillment",
|
||||
lambda *_args, **_kwargs: None,
|
||||
)
|
||||
|
||||
with pytest.raises(HTTPException) as exc_info:
|
||||
@@ -397,6 +397,104 @@ class TestSyncAndMapping(_Base):
|
||||
assert task.required_points == 1280
|
||||
|
||||
|
||||
class TestSnapshotSync(_Base):
|
||||
def snapshot(self, **overrides):
|
||||
payload = {
|
||||
"sourceOrderId": "100",
|
||||
"sourceOrderItemId": "101",
|
||||
"sourceFulfillmentId": "201",
|
||||
"platformOrderId": "ORDER-101",
|
||||
"provider": "91kaquan",
|
||||
"shopId": "shop-1",
|
||||
"shopName": "测试店",
|
||||
"orderStatus": "paid",
|
||||
"payStatus": "paid",
|
||||
"skuCode": INTERNAL_SKU,
|
||||
"skuName": INTERNAL_SKU,
|
||||
"internalSkuKey": INTERNAL_SKU,
|
||||
"quantity": 1,
|
||||
"revenueAmountFen": 9900,
|
||||
"orderCreatedAt": NOW.isoformat(),
|
||||
"paidAt": NOW.isoformat(),
|
||||
"fulfillmentStatus": "assigned",
|
||||
"fulfillmentChannel": "manual",
|
||||
"configEnabled": True,
|
||||
"douyuFulfillmentEnabled": True,
|
||||
}
|
||||
payload.update(overrides)
|
||||
return payload
|
||||
|
||||
def test_order_snapshot_creates_task_without_external_database_read(
|
||||
self, monkeypatch
|
||||
):
|
||||
self.mapping()
|
||||
monkeypatch.setattr(
|
||||
service,
|
||||
"lookup_pending_manual_fulfillment",
|
||||
lambda *_args, **_kwargs: (_ for _ in ()).throw(
|
||||
AssertionError("新快照契约不应回查 order_site")
|
||||
),
|
||||
)
|
||||
|
||||
result = service.sync_order_snapshot(
|
||||
self.session,
|
||||
{
|
||||
"eventType": "platform_fulfillment.order_snapshot",
|
||||
"contractVersion": 2,
|
||||
"data": self.snapshot(),
|
||||
},
|
||||
)
|
||||
|
||||
task = self.session.query(PlatformFulfillmentTask).one()
|
||||
assert result["created"] == 1
|
||||
assert task.execution_status == "ready"
|
||||
assert task.next_allocate_at is not None
|
||||
assert task.state_version == 1
|
||||
outbox = self.session.query(IntegrationOutbox).one()
|
||||
assert outbox.payload_json["items"][0]["stateVersion"] == 1
|
||||
|
||||
def test_legacy_event_only_reads_the_specified_order_item(self, monkeypatch):
|
||||
self.mapping()
|
||||
requested: list[str] = []
|
||||
|
||||
def lookup(item_id: str):
|
||||
requested.append(item_id)
|
||||
return self.snapshot()
|
||||
|
||||
monkeypatch.setattr(service, "lookup_pending_manual_fulfillment", lookup)
|
||||
|
||||
result = service.sync_order_item_ids(self.session, ["101"])
|
||||
|
||||
assert requested == ["101"]
|
||||
assert result["created"] == 1
|
||||
assert self.session.query(PlatformFulfillmentTask).count() == 1
|
||||
|
||||
def test_terminal_snapshot_cancels_task_and_increments_state_version(self):
|
||||
self.mapping()
|
||||
service.sync_order_snapshot(self.session, {"data": self.snapshot()})
|
||||
service.sync_order_snapshot(
|
||||
self.session,
|
||||
{"data": self.snapshot(orderStatus="refunded")},
|
||||
)
|
||||
|
||||
task = self.session.query(PlatformFulfillmentTask).one()
|
||||
assert task.execution_status == "cancelled"
|
||||
assert task.state_version == 2
|
||||
assert task.next_allocate_at is None
|
||||
|
||||
def test_unpaid_snapshot_does_not_enter_live_fulfillment(self):
|
||||
self.mapping()
|
||||
|
||||
result = service.sync_order_snapshot(
|
||||
self.session,
|
||||
{"data": self.snapshot(payStatus="unpaid")},
|
||||
)
|
||||
|
||||
assert result["created"] == 0
|
||||
assert result["ignored"] == 1
|
||||
assert self.session.query(PlatformFulfillmentTask).count() == 0
|
||||
|
||||
|
||||
class TestAccountSelection(_Base):
|
||||
def test_allocation_refreshes_live_state_instead_of_cached_filters(self):
|
||||
account = Account(
|
||||
|
||||
@@ -33,7 +33,8 @@ def test_auto_allocator_only_scans_ready_unassigned_tasks(db):
|
||||
binding_status="not_started",
|
||||
exchange_status="not_started",
|
||||
paid_at=datetime.now(UTC),
|
||||
updated_at=datetime.now(UTC) - timedelta(minutes=2),
|
||||
updated_at=datetime.now(UTC),
|
||||
next_allocate_at=datetime.now(UTC),
|
||||
)
|
||||
mapped_pending = PlatformFulfillmentTask(
|
||||
source_system="order_site",
|
||||
@@ -80,3 +81,46 @@ def test_auto_allocator_only_scans_ready_unassigned_tasks(db):
|
||||
|
||||
assert calls == [ready.id]
|
||||
assert result == {"checked": 1, "allocated": 1, "failed": 0}
|
||||
|
||||
|
||||
def test_auto_allocator_schedules_retry_only_after_failed_allocation(db):
|
||||
actor = User(username="auto-retry-actor", password_hash="h", role="super_admin")
|
||||
db.add(
|
||||
PlatformFulfillmentSetting(
|
||||
id=1,
|
||||
lease_duration_minutes=None,
|
||||
order_match_started_at=datetime.now(UTC) - timedelta(days=1),
|
||||
)
|
||||
)
|
||||
moment = datetime.now(UTC)
|
||||
task = PlatformFulfillmentTask(
|
||||
source_system="order_site",
|
||||
source_order_id="10",
|
||||
source_order_item_id="10",
|
||||
platform_order_id="AUTO-RETRY",
|
||||
internal_sku_key="skin",
|
||||
commodity_id="commodity-1",
|
||||
execution_status="ready",
|
||||
binding_status="not_started",
|
||||
exchange_status="not_started",
|
||||
paid_at=moment,
|
||||
next_allocate_at=moment,
|
||||
updated_at=moment,
|
||||
)
|
||||
db.add_all([actor, task])
|
||||
db.commit()
|
||||
|
||||
with (
|
||||
patch.object(auto_allocator.service, "_integration_actor", return_value=actor),
|
||||
patch.object(
|
||||
auto_allocator.service,
|
||||
"allocate_task",
|
||||
return_value={"task": {"account": None}},
|
||||
),
|
||||
):
|
||||
result = auto_allocator.run_auto_allocation_once(db, limit=1, now=moment)
|
||||
|
||||
db.refresh(task)
|
||||
assert result == {"checked": 1, "allocated": 0, "failed": 1}
|
||||
assert task.next_allocate_at is not None
|
||||
assert task.next_allocate_at >= moment + timedelta(seconds=10)
|
||||
|
||||
Reference in New Issue
Block a user