fix(douyu): 修正外部单兑换记录判定
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
"""斗鱼外部单协作:账号导入、状态机、鱼翅/积分与兑换记录查询。"""
|
||||
|
||||
from datetime import UTC, datetime, timedelta
|
||||
|
||||
import pytest
|
||||
|
||||
from tests.support.db import get_test_engine, make_test_session
|
||||
@@ -28,15 +30,32 @@ from web.backend.schemas import (
|
||||
from web.backend.services import douyu_collab_service as collab
|
||||
|
||||
|
||||
def exchange_record(
|
||||
*,
|
||||
name: str = "礼包A",
|
||||
commodity_id: str = "gift-a",
|
||||
occurred_at: datetime | None = None,
|
||||
) -> dict[str, str]:
|
||||
moment = occurred_at or datetime.now(UTC)
|
||||
return {
|
||||
"commodityId": commodity_id,
|
||||
"commodityName": name,
|
||||
"time": str(int(moment.timestamp())),
|
||||
}
|
||||
|
||||
|
||||
class FakeClient:
|
||||
def __init__(self, *, points=5000, fish=1000, records=None):
|
||||
self.points = points
|
||||
self.fish = fish
|
||||
self.records = records if records is not None else []
|
||||
self.elite_calls = 0
|
||||
self.gold_calls = 0
|
||||
self.records_calls = 0
|
||||
self.orders_calls = 0
|
||||
|
||||
def elite_user_info(self, **_):
|
||||
self.elite_calls += 1
|
||||
return {
|
||||
"manual_type": 1,
|
||||
"manual_score": self.points,
|
||||
@@ -65,6 +84,7 @@ class FakeClient:
|
||||
}
|
||||
|
||||
def gold_account(self):
|
||||
self.gold_calls += 1
|
||||
return {"gold": self.fish}
|
||||
|
||||
def list_goods(self, **_):
|
||||
@@ -223,6 +243,7 @@ class TestDouyuCollabOrders:
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
commodity_id="gift-a",
|
||||
required_points=100,
|
||||
home_images=["collab/unlink.png"],
|
||||
client=FakeClient(),
|
||||
@@ -950,7 +971,7 @@ class TestDouyuCollabOrders:
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
client=FakeClient(records=[{"commodityName": "礼包A"}]),
|
||||
client=FakeClient(records=[exchange_record()]),
|
||||
)
|
||||
assert result["verdict"] == collab.VERDICT_SUCCESS
|
||||
assert result["order"].status == collab.STATUS_DONE
|
||||
@@ -1395,7 +1416,7 @@ class TestDouyuCollabOrders:
|
||||
assert order.status == collab.STATUS_VOID
|
||||
assert order.void_reason == "资料不全"
|
||||
|
||||
def test_points_shortage_enters_points_error(self):
|
||||
def test_record_query_does_not_change_status_from_points_snapshot(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
@@ -1422,8 +1443,8 @@ class TestDouyuCollabOrders:
|
||||
order,
|
||||
client=FakeClient(points=50, records=[]),
|
||||
)
|
||||
assert result["points_reason"] == "shortage"
|
||||
assert result["order"].status == collab.STATUS_POINTS_ERROR
|
||||
assert result["verdict"] == collab.VERDICT_UNKNOWN
|
||||
assert result["order"].status == collab.STATUS_RECHARGED
|
||||
|
||||
def test_balance_query_skips_records_and_never_changes_status(self):
|
||||
order = collab.create_order(
|
||||
@@ -1446,7 +1467,7 @@ class TestDouyuCollabOrders:
|
||||
)
|
||||
order.points_threshold = 10
|
||||
self.session.commit()
|
||||
client = FakeClient(points=50, records=[{"commodityName": "礼包A"}])
|
||||
client = FakeClient(points=50, records=[exchange_record()])
|
||||
|
||||
result = collab.query_activity(
|
||||
self.session,
|
||||
@@ -1496,7 +1517,7 @@ class TestDouyuCollabOrders:
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
client=FakeClient(records=[{"commodityName": "礼包A"}]),
|
||||
client=FakeClient(records=[exchange_record()]),
|
||||
)
|
||||
assert record_result["order"].status == collab.STATUS_DONE
|
||||
|
||||
@@ -1515,6 +1536,247 @@ class TestDouyuCollabOrders:
|
||||
assert payload["last_records_matched"] == 1
|
||||
assert payload["last_metric_message"] == "仅查询鱼翅与积分,未查询兑换记录"
|
||||
|
||||
def test_record_query_only_calls_exchange_records(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-RECORD-ONLY",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-record-only.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_RECHARGED,
|
||||
reason="鱼翅已充值",
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_SCRIPTED,
|
||||
reason="脚本已上",
|
||||
)
|
||||
client = FakeClient(records=[exchange_record()])
|
||||
|
||||
result = collab.query_activity(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
client=client,
|
||||
)
|
||||
|
||||
assert result["verdict"] == collab.VERDICT_SUCCESS
|
||||
assert client.records_calls == 1
|
||||
assert client.elite_calls == 0
|
||||
assert client.gold_calls == 0
|
||||
assert client.orders_calls == 0
|
||||
|
||||
def test_record_query_paginates_until_short_page(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-RECORD-PAGES",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
commodity_id="gift-a",
|
||||
required_points=100,
|
||||
home_images=["collab/home-record-pages.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
records = [exchange_record() for _ in range(101)]
|
||||
|
||||
class PaginatedClient(FakeClient):
|
||||
def __init__(self):
|
||||
super().__init__(records=records)
|
||||
self.offsets: list[int] = []
|
||||
|
||||
def exchange_records(self, *, limit, offset, **_):
|
||||
self.offsets.append(offset)
|
||||
self.records_calls += 1
|
||||
return {"records": self.records[offset : offset + limit]}
|
||||
|
||||
client = PaginatedClient()
|
||||
loaded = collab._load_exchange_records_for_orders(
|
||||
self.session,
|
||||
[order],
|
||||
client=client,
|
||||
)
|
||||
|
||||
assert client.offsets == [0, 100]
|
||||
assert len(loaded) == 101
|
||||
|
||||
def test_record_query_rejects_old_record_and_wrong_commodity(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-RECORD-WINDOW",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
commodity_id="gift-a",
|
||||
required_points=100,
|
||||
home_images=["collab/home-record-window.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_RECHARGED,
|
||||
reason="鱼翅已充值",
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_SCRIPTED,
|
||||
reason="脚本已上",
|
||||
)
|
||||
old_record = exchange_record(occurred_at=datetime.now(UTC) - timedelta(days=1))
|
||||
wrong_commodity = exchange_record(
|
||||
commodity_id="gift-other",
|
||||
name="礼包A",
|
||||
)
|
||||
|
||||
result = collab.query_activity(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
client=FakeClient(records=[old_record, wrong_commodity]),
|
||||
)
|
||||
|
||||
assert result["verdict"] == collab.VERDICT_UNKNOWN
|
||||
assert result["metric"].records_matched == 0
|
||||
assert result["order"].status == collab.STATUS_SCRIPTED
|
||||
|
||||
def test_record_query_waits_for_settlement_before_failure(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-RECORD-SETTLE",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-record-settle.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_RECHARGED,
|
||||
reason="鱼翅已充值",
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_SCRIPTED,
|
||||
reason="脚本已上",
|
||||
)
|
||||
|
||||
waiting = collab.query_activity(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
client=FakeClient(records=[]),
|
||||
)
|
||||
assert waiting["verdict"] == collab.VERDICT_UNKNOWN
|
||||
assert "结算等待期" in waiting["message"]
|
||||
assert order.status == collab.STATUS_SCRIPTED
|
||||
|
||||
order.scripted_at = datetime.now(UTC) - timedelta(
|
||||
seconds=collab.ACTIVITY_RECORD_SETTLE_SECONDS + 1
|
||||
)
|
||||
self.session.commit()
|
||||
failed = collab.query_activity(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
client=FakeClient(records=[]),
|
||||
)
|
||||
assert failed["verdict"] == collab.VERDICT_FAILED
|
||||
assert failed["order"].status == collab.STATUS_FAILED
|
||||
|
||||
def test_batch_record_query_fetches_once_per_account(self, monkeypatch):
|
||||
first = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-BATCH-RECORD-1",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
commodity_id="gift-a",
|
||||
required_points=100,
|
||||
home_images=["collab/home-batch-record-1.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
second = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-BATCH-RECORD-2",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包B",
|
||||
commodity_id="gift-b",
|
||||
required_points=200,
|
||||
home_images=["collab/home-batch-record-2.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
for order in (first, second):
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_RECHARGED,
|
||||
reason="鱼翅已充值",
|
||||
)
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_SCRIPTED,
|
||||
reason="脚本已上",
|
||||
)
|
||||
|
||||
calls: list[int] = []
|
||||
records = [
|
||||
exchange_record(name="礼包A", commodity_id="gift-a"),
|
||||
exchange_record(name="礼包B", commodity_id="gift-b"),
|
||||
]
|
||||
|
||||
def load_records(_db, account_orders, *, client=None):
|
||||
del client
|
||||
calls.append(int(account_orders[0].account_id or 0))
|
||||
return records
|
||||
|
||||
monkeypatch.setattr(
|
||||
collab,
|
||||
"_load_exchange_records_for_orders",
|
||||
load_records,
|
||||
)
|
||||
results = collab.query_activity_batch(
|
||||
self.session,
|
||||
self.admin,
|
||||
[first, second],
|
||||
)
|
||||
|
||||
assert len(calls) == 1
|
||||
assert [item["verdict"] for item in results] == [
|
||||
collab.VERDICT_SUCCESS,
|
||||
collab.VERDICT_SUCCESS,
|
||||
]
|
||||
assert first.status == collab.STATUS_DONE
|
||||
assert second.status == collab.STATUS_DONE
|
||||
|
||||
def test_draft_can_be_created_before_account_resolution(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
|
||||
Reference in New Issue
Block a user