fix(douyu): 统一外部协作账号租约
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
import pytest
|
||||
|
||||
from tests.support.db import get_test_engine, make_test_session
|
||||
from web.backend.models import Account, AuditLog, User
|
||||
from web.backend.models import Account, AccountEvent, AccountLease, AuditLog, User
|
||||
from web.backend.routers import douyu_collab as collab_api
|
||||
from web.backend.schemas import (
|
||||
DouyuCollabAccountLookupOut,
|
||||
@@ -283,6 +283,167 @@ class TestDouyuCollabOrders:
|
||||
)
|
||||
assert second.account_id == self.account.id
|
||||
assert collab.group_points_total(self.session, second) == 200
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.account_id == self.account.id
|
||||
assert lease.purpose == collab.LEASE_PURPOSE_DOUYU_COLLAB
|
||||
assert lease.batch_id == f"collab:{self.account.id}"
|
||||
assert lease.status == "active"
|
||||
assert (
|
||||
self.session.query(AccountEvent)
|
||||
.filter(AccountEvent.event_type == "lease_acquired")
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
|
||||
def test_create_order_rejects_account_leased_by_platform(self):
|
||||
self.session.add(
|
||||
AccountLease(
|
||||
account_id=self.account.id,
|
||||
holder_user_id=self.admin.id,
|
||||
scope="elite",
|
||||
purpose="platform_fulfillment",
|
||||
batch_id="pf:99",
|
||||
status="active",
|
||||
)
|
||||
)
|
||||
self.session.commit()
|
||||
|
||||
with pytest.raises(collab.CollabError) as excinfo:
|
||||
collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-LEASE-CONFLICT",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-conflict.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
assert excinfo.value.code == "account_lease_conflict"
|
||||
assert (
|
||||
self.session.query(collab.DouyuExternalOrder)
|
||||
.filter(collab.DouyuExternalOrder.order_no == "DY-LEASE-CONFLICT")
|
||||
.first()
|
||||
is None
|
||||
)
|
||||
|
||||
def test_void_releases_only_after_last_active_order(self):
|
||||
first = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-LEASE-VOID-1",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-lease-void-1.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
second = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-LEASE-VOID-2",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-lease-void-2.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
first,
|
||||
status=collab.STATUS_VOID,
|
||||
reason="第一单作废",
|
||||
)
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.status == "active"
|
||||
|
||||
collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
second,
|
||||
status=collab.STATUS_VOID,
|
||||
reason="第二单作废",
|
||||
)
|
||||
self.session.refresh(lease)
|
||||
assert lease.status == "released"
|
||||
assert lease.release_reason == "douyu_collab_void"
|
||||
|
||||
restored = collab.set_status(
|
||||
self.session,
|
||||
self.admin,
|
||||
first,
|
||||
status=collab.STATUS_INCOMPLETE,
|
||||
reason="恢复第一单",
|
||||
)
|
||||
restored_lease = (
|
||||
self.session.query(AccountLease)
|
||||
.filter(AccountLease.status == "active")
|
||||
.one()
|
||||
)
|
||||
assert restored.status == collab.STATUS_INCOMPLETE
|
||||
assert restored_lease.status == "active"
|
||||
assert restored_lease.purpose == collab.LEASE_PURPOSE_DOUYU_COLLAB
|
||||
|
||||
def test_set_account_conflict_keeps_original_lease(self):
|
||||
order = collab.create_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
order_no="DY-LEASE-SWITCH",
|
||||
shop="店铺A",
|
||||
account_username="douyu-account-a",
|
||||
gift_name="礼包A",
|
||||
required_points=100,
|
||||
home_images=["collab/home-lease-switch.png"],
|
||||
client=FakeClient(),
|
||||
)
|
||||
other = Account(
|
||||
username="douyu-account-busy",
|
||||
password="password",
|
||||
email="busy@example.com",
|
||||
email_password="mail-password",
|
||||
cookie="acf_uid=200; acf_nickname=busy",
|
||||
)
|
||||
self.session.add(other)
|
||||
self.session.flush()
|
||||
self.session.add(
|
||||
AccountLease(
|
||||
account_id=other.id,
|
||||
holder_user_id=self.admin.id,
|
||||
scope="elite",
|
||||
purpose="platform_fulfillment",
|
||||
batch_id="pf:100",
|
||||
status="active",
|
||||
)
|
||||
)
|
||||
self.session.commit()
|
||||
|
||||
with pytest.raises(collab.CollabError) as excinfo:
|
||||
collab.set_account(
|
||||
self.session,
|
||||
self.admin,
|
||||
order,
|
||||
other.username,
|
||||
client=FakeClient(),
|
||||
)
|
||||
|
||||
assert excinfo.value.code == "account_lease_conflict"
|
||||
self.session.refresh(order)
|
||||
assert order.account_id == self.account.id
|
||||
original_lease = (
|
||||
self.session.query(AccountLease)
|
||||
.filter(
|
||||
AccountLease.account_id == self.account.id,
|
||||
AccountLease.status == "active",
|
||||
)
|
||||
.one()
|
||||
)
|
||||
assert original_lease.purpose == collab.LEASE_PURPOSE_DOUYU_COLLAB
|
||||
|
||||
def test_status_flow_and_exchange_record_marks_done(self):
|
||||
order = collab.create_order(
|
||||
@@ -319,6 +480,9 @@ class TestDouyuCollabOrders:
|
||||
assert result["verdict"] == collab.VERDICT_SUCCESS
|
||||
assert result["order"].status == collab.STATUS_DONE
|
||||
assert result["order"].done_at is not None
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.status == "released"
|
||||
assert lease.release_reason == "douyu_collab_done"
|
||||
|
||||
def test_admin_can_restore_voided_order_to_another_status(self):
|
||||
order = collab.create_order(
|
||||
|
||||
+122
-1
@@ -40,7 +40,7 @@ TESTS_DIR = Path(__file__).resolve().parent
|
||||
PROJECT_ROOT = TESTS_DIR.parent
|
||||
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
||||
|
||||
HEAD_REVISION = "20261119_0097"
|
||||
HEAD_REVISION = "20261119_0098"
|
||||
|
||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||
EXTRA_INDEXES = (
|
||||
@@ -758,3 +758,124 @@ class TestMigrationSmoke:
|
||||
mig_engine.dispose()
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
||||
|
||||
def test_0098_backfills_collab_leases_without_stealing_active_leases(self):
|
||||
creds = get_mysql_credentials()
|
||||
mig_db = f"douyu_login_mig_{secrets.token_hex(4)}"
|
||||
mig_url = (
|
||||
f"mysql+pymysql://{quote_plus(creds['user'])}:{quote_plus(creds['password'])}"
|
||||
f"@{creds['host']}:{creds['port']}/{mig_db}?charset=utf8mb4"
|
||||
)
|
||||
|
||||
admin_engine = get_test_engine()
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(
|
||||
text(
|
||||
f"CREATE DATABASE `{mig_db}` "
|
||||
"CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;"
|
||||
)
|
||||
)
|
||||
|
||||
original_url = database_module.DATABASE_URL
|
||||
mig_engine = create_engine(mig_url)
|
||||
try:
|
||||
database_module.DATABASE_URL = mig_url
|
||||
cfg = _migration_config()
|
||||
cfg.set_main_option("sqlalchemy.url", mig_url)
|
||||
command.upgrade(cfg, "20261119_0097")
|
||||
|
||||
with Session(mig_engine) as session:
|
||||
owner = User(
|
||||
username="migration-0098-owner",
|
||||
password_hash="hash",
|
||||
role="operation",
|
||||
is_active=True,
|
||||
)
|
||||
session.add(owner)
|
||||
session.flush()
|
||||
free_account = Account(
|
||||
username="migration-0098-free",
|
||||
password="p",
|
||||
email="free@example.com",
|
||||
email_password="ep",
|
||||
)
|
||||
busy_account = Account(
|
||||
username="migration-0098-busy",
|
||||
password="p",
|
||||
email="busy@example.com",
|
||||
email_password="ep",
|
||||
)
|
||||
session.add_all([free_account, busy_account])
|
||||
session.flush()
|
||||
session.add_all(
|
||||
[
|
||||
DouyuExternalOrder(
|
||||
order_no="MIG-0098-FREE",
|
||||
owner_id=owner.id,
|
||||
account_id=free_account.id,
|
||||
account_username=free_account.username,
|
||||
status="to_recharge",
|
||||
),
|
||||
DouyuExternalOrder(
|
||||
order_no="MIG-0098-BUSY",
|
||||
owner_id=owner.id,
|
||||
account_id=busy_account.id,
|
||||
account_username=busy_account.username,
|
||||
status="incomplete",
|
||||
),
|
||||
AccountLease(
|
||||
account_id=busy_account.id,
|
||||
holder_user_id=owner.id,
|
||||
scope="elite",
|
||||
purpose="platform_fulfillment",
|
||||
batch_id="pf:0098",
|
||||
status="active",
|
||||
),
|
||||
]
|
||||
)
|
||||
session.commit()
|
||||
free_account_id = free_account.id
|
||||
busy_account_id = busy_account.id
|
||||
|
||||
command.upgrade(cfg, "head")
|
||||
|
||||
with Session(mig_engine) as session:
|
||||
free_lease = (
|
||||
session.query(AccountLease)
|
||||
.filter_by(account_id=free_account_id, status="active")
|
||||
.one()
|
||||
)
|
||||
busy_lease = (
|
||||
session.query(AccountLease)
|
||||
.filter_by(account_id=busy_account_id, status="active")
|
||||
.one()
|
||||
)
|
||||
assert free_lease.purpose == "douyu_collab"
|
||||
assert free_lease.batch_id == f"collab:{free_account_id}"
|
||||
assert free_lease.release_reason == "migration_backfill"
|
||||
assert busy_lease.purpose == "platform_fulfillment"
|
||||
assert (
|
||||
session.query(AccountEvent)
|
||||
.filter(
|
||||
AccountEvent.account_id == free_account_id,
|
||||
AccountEvent.event_type == "lease_acquired",
|
||||
AccountEvent.source == "migration",
|
||||
)
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
assert (
|
||||
session.query(AccountEvent)
|
||||
.filter(
|
||||
AccountEvent.account_id == busy_account_id,
|
||||
AccountEvent.event_type == "lease_conflict",
|
||||
AccountEvent.source == "migration",
|
||||
)
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
finally:
|
||||
database_module.DATABASE_URL = original_url
|
||||
mig_engine.dispose()
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
||||
|
||||
@@ -520,6 +520,8 @@ class TestFulfillmentCollabSync(_Base):
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.purpose == "douyu_collab"
|
||||
|
||||
def test_manual_sync_does_not_clear_account_added_in_collab(self):
|
||||
task = self.task()
|
||||
@@ -1479,9 +1481,7 @@ class TestBindingAndCompletion(_Base):
|
||||
assert exc_info.value.status_code == 403
|
||||
assert checker(current_user=admin) is admin
|
||||
|
||||
def test_restore_manual_cancel_requeues_task_and_restores_collab(
|
||||
self, monkeypatch
|
||||
):
|
||||
def test_restore_manual_cancel_requeues_task_and_restores_collab(self, monkeypatch):
|
||||
task = self.task()
|
||||
service.cancel_task(
|
||||
self.session,
|
||||
@@ -1711,6 +1711,36 @@ class TestBindingAndCompletion(_Base):
|
||||
assert event.detail_json["releasedAccountId"] == account_id
|
||||
assert event.detail_json["releasedLeaseId"] == lease_id
|
||||
|
||||
def test_release_to_manual_hands_lease_to_active_collab_order(self):
|
||||
task = self._allocated()
|
||||
lease_id = task.lease_id
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
assert order.status == collab.STATUS_INCOMPLETE
|
||||
lease = self.session.query(AccountLease).filter_by(id=lease_id).one()
|
||||
assert lease.purpose == "platform_fulfillment"
|
||||
|
||||
detail = service.release_task_to_manual(
|
||||
self.session,
|
||||
task_id=task.id,
|
||||
current=self.admin,
|
||||
reason="以外部协作单的人工处理为准",
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert detail["task"]["executionStatus"] == "manual_required"
|
||||
assert task.account_id is None
|
||||
assert task.lease_id is None
|
||||
assert lease.status == "active"
|
||||
assert lease.purpose == "douyu_collab"
|
||||
assert lease.expires_at is None
|
||||
assert lease.batch_id == f"collab:{lease.account_id}"
|
||||
assert self.session.query(AccountLease).count() == 1
|
||||
|
||||
def test_refresh_binding_maps_role_ready(self, monkeypatch):
|
||||
notified: list[int] = []
|
||||
monkeypatch.setattr(
|
||||
@@ -2074,6 +2104,36 @@ class TestBindingAndCompletion(_Base):
|
||||
assert result["expired"] == 0
|
||||
assert task.execution_status == "allocated"
|
||||
|
||||
def test_expired_platform_lease_hands_off_to_active_collab(self):
|
||||
task = self._allocated()
|
||||
lease = self.session.query(AccountLease).one()
|
||||
collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
lease.expires_at = NOW - timedelta(minutes=1)
|
||||
self.session.commit()
|
||||
|
||||
job = AutomationJob(key=reaper.JOB_KEY, batch_size=100)
|
||||
result = reaper.run_platform_fulfillment_lease_reaper(
|
||||
self.session,
|
||||
job,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert result["expired"] == 0
|
||||
assert result["affected_tasks"] == 1
|
||||
assert task.execution_status == "manual_required"
|
||||
assert task.account_id is None
|
||||
assert task.lease_id is None
|
||||
assert task.issue_code == "lease_expired_collab_handoff"
|
||||
assert lease.status == "active"
|
||||
assert lease.purpose == "douyu_collab"
|
||||
assert lease.expires_at is None
|
||||
|
||||
def test_completion_rejects_limited_exchange(self):
|
||||
task = self._allocated()
|
||||
task.binding_status = "bound"
|
||||
|
||||
Reference in New Issue
Block a user