fix(douyu): coordinate collab and platform account leases
Avoid automatic allocation of accounts with active external collaboration, require explicit manual takeover of platform leases, and add Douyu account identity search.
This commit is contained in:
@@ -3,12 +3,24 @@
|
||||
import pytest
|
||||
|
||||
from tests.support.db import get_test_engine, make_test_session
|
||||
from web.backend.models import Account, AccountEvent, AccountLease, AuditLog, User
|
||||
from web.backend.models import (
|
||||
Account,
|
||||
AccountEvent,
|
||||
AccountLease,
|
||||
AuditLog,
|
||||
DouyuTask,
|
||||
PlatformFulfillmentEvent,
|
||||
PlatformFulfillmentTask,
|
||||
User,
|
||||
)
|
||||
from web.backend.routers import douyu_collab as collab_api
|
||||
from web.backend.schemas import (
|
||||
DouyuCollabAccountLookupOut,
|
||||
DouyuCollabAccountRequest,
|
||||
DouyuCollabCkExportOut,
|
||||
DouyuCollabOrderCreate,
|
||||
DouyuCollabOrderOut,
|
||||
DouyuCollabOrderUpdate,
|
||||
DouyuCollabUsernameExportOut,
|
||||
)
|
||||
from web.backend.services import douyu_collab_service as collab
|
||||
@@ -98,6 +110,55 @@ class TestDouyuCollabOrders:
|
||||
def teardown_method(self):
|
||||
self.session.close()
|
||||
|
||||
def _platform_task_lease(self):
|
||||
task = PlatformFulfillmentTask(
|
||||
source_system="order_site",
|
||||
source_order_id="PLATFORM-TAKEOVER-ORDER",
|
||||
source_order_item_id="PLATFORM-TAKEOVER-ITEM",
|
||||
source_fulfillment_id="PLATFORM-TAKEOVER-FULFILLMENT",
|
||||
platform_order_id="PLATFORM-TAKEOVER-NO",
|
||||
target_platform="douyu",
|
||||
scope="elite",
|
||||
internal_sku_key="套装-接管测试",
|
||||
commodity_id="takeover-goods",
|
||||
required_points=100,
|
||||
account_id=self.account.id,
|
||||
execution_status="allocated",
|
||||
binding_status="not_started",
|
||||
exchange_status="not_started",
|
||||
)
|
||||
self.session.add(task)
|
||||
self.session.flush()
|
||||
lease = AccountLease(
|
||||
account_id=self.account.id,
|
||||
holder_user_id=self.admin.id,
|
||||
scope="elite",
|
||||
purpose="platform_fulfillment",
|
||||
commodity_id="takeover-goods",
|
||||
batch_id=f"pf:{task.id}",
|
||||
status="active",
|
||||
)
|
||||
self.session.add(lease)
|
||||
self.session.flush()
|
||||
task.lease_id = lease.id
|
||||
self.session.commit()
|
||||
return task, lease
|
||||
|
||||
def test_douyu_order_mutations_accept_takeover_flag(self):
|
||||
create = DouyuCollabOrderCreate(
|
||||
order_no="DY-TAKEOVER-SCHEMA",
|
||||
takeover_platform_lease=True,
|
||||
)
|
||||
update = DouyuCollabOrderUpdate(takeover_platform_lease=True)
|
||||
account = DouyuCollabAccountRequest(
|
||||
account_username="douyu-account-a",
|
||||
takeover_platform_lease=True,
|
||||
)
|
||||
|
||||
assert create.takeover_platform_lease is True
|
||||
assert update.takeover_platform_lease is True
|
||||
assert account.takeover_platform_lease is True
|
||||
|
||||
def test_lookup_account_resolves_internal_ck_and_role(self):
|
||||
result = collab.lookup_account(
|
||||
self.session, "douyu-account-a", client=FakeClient()
|
||||
@@ -329,6 +390,157 @@ class TestDouyuCollabOrders:
|
||||
is None
|
||||
)
|
||||
|
||||
def test_create_order_explicitly_takes_over_platform_lease(self):
|
||||
task, lease = self._platform_task_lease()
|
||||
lease_id = lease.id
|
||||
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-LEASE-TAKEOVER",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-takeover.png"],
|
||||
takeover_platform_lease=True,
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert order.account_id == self.account.id
|
||||
assert task.execution_status == "manual_required"
|
||||
assert task.account_id is None
|
||||
assert task.lease_id is None
|
||||
assert lease.id == lease_id
|
||||
assert lease.status == "active"
|
||||
assert lease.purpose == collab.LEASE_PURPOSE_DOUYU_COLLAB
|
||||
assert lease.batch_id == f"collab:{self.account.id}"
|
||||
assert lease.expires_at is None
|
||||
event = (
|
||||
self.session.query(PlatformFulfillmentEvent)
|
||||
.filter_by(task_id=task.id, event_type="collab_takeover")
|
||||
.one()
|
||||
)
|
||||
assert event.detail_json["collabOrderNo"] == "DY-LEASE-TAKEOVER"
|
||||
assert event.detail_json["releasedLeaseId"] == lease_id
|
||||
assert (
|
||||
self.session.query(AuditLog)
|
||||
.filter_by(action="douyu:collab:lease_takeover")
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
assert (
|
||||
self.session.query(AccountEvent)
|
||||
.filter_by(event_type="lease_acquired")
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
|
||||
def test_same_source_platform_lease_is_forced_to_collab_on_takeover(self):
|
||||
task, lease = self._platform_task_lease()
|
||||
order = collab.DouyuExternalOrder(
|
||||
order_no="DY-SAME-SOURCE-TAKEOVER",
|
||||
source_type=collab.SOURCE_TYPE_PLATFORM_FULFILLMENT,
|
||||
source_task_id=task.id,
|
||||
account_id=self.account.id,
|
||||
account_username=self.account.username,
|
||||
status=collab.STATUS_INCOMPLETE,
|
||||
owner_id=self.admin.id,
|
||||
created_by=self.admin.id,
|
||||
)
|
||||
self.session.add(order)
|
||||
self.session.commit()
|
||||
|
||||
collab.set_account(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
self.account.username,
|
||||
takeover_platform_lease=True,
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert task.execution_status == "manual_required"
|
||||
assert task.account_id is None
|
||||
assert task.lease_id is None
|
||||
assert lease.status == "active"
|
||||
assert lease.purpose == collab.LEASE_PURPOSE_DOUYU_COLLAB
|
||||
|
||||
def test_takeover_rejects_running_exchange_task(self):
|
||||
task, lease = self._platform_task_lease()
|
||||
self.session.add(
|
||||
DouyuTask(
|
||||
batch_id="platform-exchange-running",
|
||||
account_id=self.account.id,
|
||||
account_assigned_to=self.admin.id,
|
||||
task_type="exchange_goods",
|
||||
handbook_scope="elite",
|
||||
status="running",
|
||||
platform_task_id=task.id,
|
||||
created_by=self.admin.id,
|
||||
)
|
||||
)
|
||||
self.session.commit()
|
||||
|
||||
with pytest.raises(collab.CollabError) as excinfo:
|
||||
collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-TAKEOVER-BLOCKED",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-takeover-blocked.png"],
|
||||
takeover_platform_lease=True,
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
assert excinfo.value.code == "platform_task_running"
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert task.execution_status == "allocated"
|
||||
assert task.account_id == self.account.id
|
||||
assert task.lease_id == lease.id
|
||||
assert lease.purpose == "platform_fulfillment"
|
||||
|
||||
def test_takeover_requires_platform_permission(self):
|
||||
task, lease = self._platform_task_lease()
|
||||
operator = User(
|
||||
username="douyu-collab-no-platform",
|
||||
password_hash="hash",
|
||||
role="operation",
|
||||
custom_permissions=[],
|
||||
is_active=True,
|
||||
)
|
||||
self.session.add(operator)
|
||||
self.session.commit()
|
||||
|
||||
with pytest.raises(collab.CollabError) as excinfo:
|
||||
collab.create_order(
|
||||
self.session,
|
||||
operator,
|
||||
order_no="DY-TAKEOVER-FORBIDDEN",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-takeover-forbidden.png"],
|
||||
takeover_platform_lease=True,
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
assert excinfo.value.code == "platform_takeover_forbidden"
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert task.execution_status == "allocated"
|
||||
assert task.account_id == self.account.id
|
||||
assert lease.purpose == "platform_fulfillment"
|
||||
|
||||
def test_void_releases_only_after_last_active_order(self):
|
||||
first = collab.create_order(
|
||||
self.session,
|
||||
@@ -484,7 +696,7 @@ class TestDouyuCollabOrders:
|
||||
assert lease.status == "released"
|
||||
assert lease.release_reason == "douyu_collab_done"
|
||||
|
||||
def test_status_change_does_not_steal_active_platform_lease(self):
|
||||
def test_status_change_rejects_unrelated_active_platform_lease(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
@@ -510,27 +722,22 @@ class TestDouyuCollabOrders:
|
||||
self.session.add(platform_lease)
|
||||
self.session.commit()
|
||||
|
||||
changed = collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_RECHARGED,
|
||||
reason="仅补记充值状态",
|
||||
)
|
||||
|
||||
assert changed.status == collab.STATUS_RECHARGED
|
||||
self.session.refresh(platform_lease)
|
||||
assert platform_lease.status == "active"
|
||||
assert (
|
||||
self.session.query(AccountLease)
|
||||
.filter(
|
||||
AccountLease.account_id == self.account.id,
|
||||
AccountLease.status == "active",
|
||||
AccountLease.purpose == collab.LEASE_PURPOSE_DOUYU_COLLAB,
|
||||
with pytest.raises(collab.CollabError) as excinfo:
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
status=collab.STATUS_RECHARGED,
|
||||
reason="仅补记充值状态",
|
||||
)
|
||||
.count()
|
||||
== 0
|
||||
)
|
||||
|
||||
assert excinfo.value.code == "account_lease_conflict"
|
||||
self.session.rollback()
|
||||
self.session.refresh(order)
|
||||
self.session.refresh(platform_lease)
|
||||
assert order.status == collab.STATUS_TO_RECHARGE
|
||||
assert platform_lease.status == "active"
|
||||
assert platform_lease.purpose == "platform_fulfillment"
|
||||
|
||||
def test_status_change_backfills_missing_collab_lease(self):
|
||||
order = collab.create_order(
|
||||
|
||||
@@ -43,7 +43,7 @@ def test_active_payment_blocks_same_account_across_users(db):
|
||||
owner.id,
|
||||
)
|
||||
|
||||
with pytest.raises(DouyuActivePaymentError, match=first_batch):
|
||||
with pytest.raises(DouyuActivePaymentError) as exc_info:
|
||||
create_douyu_planned_tasks(
|
||||
db,
|
||||
[account.id],
|
||||
@@ -52,11 +52,13 @@ def test_active_payment_blocks_same_account_across_users(db):
|
||||
other.id,
|
||||
)
|
||||
|
||||
task = (
|
||||
db.query(DouyuTask)
|
||||
.filter(DouyuTask.batch_id == first_batch)
|
||||
.one()
|
||||
)
|
||||
message = str(exc_info.value)
|
||||
assert first_batch in message
|
||||
assert "开通精英宝典" in message
|
||||
assert "已创建,等待执行" in message
|
||||
assert "二维码或支付会话串单" in message
|
||||
|
||||
task = db.query(DouyuTask).filter(DouyuTask.batch_id == first_batch).one()
|
||||
task.status = "stopped"
|
||||
db.commit()
|
||||
|
||||
|
||||
@@ -276,6 +276,20 @@ class TestSyncAndMapping(_Base):
|
||||
assert listed["pagination"]["total"] == 1
|
||||
assert legacy.id != mapped.id
|
||||
|
||||
def test_list_searches_assigned_douyu_account_identity(self):
|
||||
task = self.task()
|
||||
account = self.account("douyu-search-account")
|
||||
account.nickname = "斗鱼昵称-搜索"
|
||||
account.uid = "90000123"
|
||||
task.account_id = account.id
|
||||
self.session.commit()
|
||||
|
||||
for keyword in ("douyu-search-account", "斗鱼昵称-搜索", "90000123"):
|
||||
listed = service.list_tasks(self.session, keyword=keyword)
|
||||
assert listed["pagination"]["total"] == 1
|
||||
assert listed["items"][0]["id"] == task.id
|
||||
assert listed["items"][0]["account"]["id"] == account.id
|
||||
|
||||
def test_list_hides_tasks_paid_before_order_match_cutoff(self):
|
||||
mapping = self.mapping()
|
||||
task = PlatformFulfillmentTask(
|
||||
@@ -1151,6 +1165,88 @@ class TestAccountSelection(_Base):
|
||||
|
||||
assert [row.username for row in candidates] == ["small", "large"]
|
||||
|
||||
def test_active_collab_order_blocks_all_automatic_candidate_pools(self):
|
||||
account = self.account("active-collab-candidate", points=2000)
|
||||
self.session.add(
|
||||
AccountCommodityState(
|
||||
account_id=account.id,
|
||||
platform="douyu",
|
||||
scope="elite",
|
||||
commodity_id=COMMODITY,
|
||||
commodity_name=INTERNAL_SKU,
|
||||
availability="available",
|
||||
observed_at=NOW,
|
||||
valid_until=NOW + timedelta(hours=1),
|
||||
)
|
||||
)
|
||||
order = DouyuExternalOrder(
|
||||
order_no="DY-ACTIVE-CANDIDATE",
|
||||
account_id=account.id,
|
||||
account_username=account.username,
|
||||
status=collab.STATUS_TO_RECHARGE,
|
||||
owner_id=self.admin.id,
|
||||
created_by=self.admin.id,
|
||||
)
|
||||
self.session.add(order)
|
||||
self.session.commit()
|
||||
|
||||
assert (
|
||||
account_selector.eligible_accounts(
|
||||
self.session,
|
||||
commodity_id=COMMODITY,
|
||||
required_points=1280,
|
||||
now=NOW,
|
||||
)
|
||||
== []
|
||||
)
|
||||
assert (
|
||||
account_selector.live_candidate_accounts(
|
||||
self.session,
|
||||
required_points=1280,
|
||||
commodity_id=COMMODITY,
|
||||
)
|
||||
== []
|
||||
)
|
||||
assert (
|
||||
account_selector.capability_candidate_accounts(
|
||||
self.session,
|
||||
commodity_id=COMMODITY,
|
||||
required_points=1280,
|
||||
now=NOW,
|
||||
)
|
||||
== []
|
||||
)
|
||||
|
||||
order.status = collab.STATUS_DONE
|
||||
self.session.commit()
|
||||
|
||||
assert [
|
||||
row.account_id
|
||||
for row in account_selector.eligible_accounts(
|
||||
self.session,
|
||||
commodity_id=COMMODITY,
|
||||
required_points=1280,
|
||||
now=NOW,
|
||||
)
|
||||
] == [account.id]
|
||||
assert [
|
||||
row.id
|
||||
for row in account_selector.live_candidate_accounts(
|
||||
self.session,
|
||||
required_points=1280,
|
||||
commodity_id=COMMODITY,
|
||||
)
|
||||
] == [account.id]
|
||||
assert [
|
||||
row.id
|
||||
for row in account_selector.capability_candidate_accounts(
|
||||
self.session,
|
||||
commodity_id=COMMODITY,
|
||||
required_points=1280,
|
||||
now=NOW,
|
||||
)
|
||||
] == [account.id]
|
||||
|
||||
def test_lease_is_unique_per_account(self):
|
||||
account = self.account("leased")
|
||||
candidate = account_selector.eligible_accounts(
|
||||
|
||||
Reference in New Issue
Block a user