fix(douyu): 自动校验兑换资格并稳定账号导入顺序
This commit is contained in:
@@ -69,3 +69,19 @@ class TestDouyuAccountNameFilter:
|
||||
self.accounts["account-a"].id,
|
||||
]
|
||||
assert result["total"] == 2
|
||||
|
||||
def test_list_task_accounts_follows_ids_order(self):
|
||||
result = list_task_accounts(
|
||||
search="",
|
||||
tag="",
|
||||
ids=f"{self.accounts['account-c'].id},{self.accounts['account-a'].id}",
|
||||
account_names="",
|
||||
page=1,
|
||||
page_size=50,
|
||||
db=self.session,
|
||||
current=self.user,
|
||||
)
|
||||
assert [item.username for item in result["items"]] == [
|
||||
"account-c",
|
||||
"account-a",
|
||||
]
|
||||
|
||||
@@ -1,16 +1,27 @@
|
||||
"""验证 DouyuTask 的 account_assigned_to 字段与任务查询优化。"""
|
||||
|
||||
import asyncio
|
||||
|
||||
import pytest
|
||||
from fastapi import HTTPException
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from tests.support.db import init_test_schema, make_test_session
|
||||
from web.backend.models import Account, DouyuTask, PlatformFulfillmentTask, User
|
||||
from web.backend.models import (
|
||||
Account,
|
||||
DouyuTask,
|
||||
PlatformFulfillmentEvent,
|
||||
PlatformFulfillmentTask,
|
||||
User,
|
||||
)
|
||||
from web.backend.routers import douyu as douyu_router
|
||||
from web.backend.routers.douyu import (
|
||||
_require_task_account_access,
|
||||
_visible_tasks_query,
|
||||
)
|
||||
from web.backend.schemas import DouyuTaskBatchRequest
|
||||
from web.backend.services.douyu_service import create_douyu_planned_tasks
|
||||
from web.backend.services.platform_fulfillment import service as platform_service
|
||||
|
||||
|
||||
def test_douyu_task_assigned_to_flow():
|
||||
@@ -192,3 +203,99 @@ def test_platform_task_context_allows_shared_account_operation():
|
||||
finally:
|
||||
db.rollback()
|
||||
db.close()
|
||||
|
||||
|
||||
def test_platform_exchange_checks_eligibility_before_creating_task(monkeypatch):
|
||||
init_test_schema()
|
||||
db: Session = make_test_session()
|
||||
try:
|
||||
owner = User(username="elig-owner", password_hash="h", role="support")
|
||||
operator = User(
|
||||
username="elig-operator",
|
||||
password_hash="h",
|
||||
role="support",
|
||||
custom_permissions=[
|
||||
"douyu:task",
|
||||
"account:view_assigned",
|
||||
"platform_fulfillment:use",
|
||||
],
|
||||
)
|
||||
db.add_all([owner, operator])
|
||||
db.flush()
|
||||
account = Account(
|
||||
username="elig-account",
|
||||
password="p",
|
||||
email="elig@test.com",
|
||||
email_password="p",
|
||||
cookie="acf_uid=1; acf_auth=x",
|
||||
assigned_to=owner.id,
|
||||
)
|
||||
db.add(account)
|
||||
db.flush()
|
||||
task = PlatformFulfillmentTask(
|
||||
source_order_id="elig-order",
|
||||
source_order_item_id="elig-item",
|
||||
platform_order_id="elig-platform-order",
|
||||
account_id=account.id,
|
||||
commodity_id="commodity-1",
|
||||
required_points=1280,
|
||||
binding_status="bound",
|
||||
execution_status="bound",
|
||||
exchange_status="not_opened",
|
||||
)
|
||||
db.add(task)
|
||||
db.commit()
|
||||
refreshed: list[int] = []
|
||||
|
||||
def fake_refresh(db_session, *, task_id, current):
|
||||
refreshed.append(task_id)
|
||||
row = db_session.get(PlatformFulfillmentTask, task_id)
|
||||
assert row is not None and current.id == operator.id
|
||||
row.exchange_status = "eligible"
|
||||
row.issue_code = ""
|
||||
row.last_error = ""
|
||||
db_session.commit()
|
||||
return platform_service.get_task_detail(db_session, task_id)
|
||||
|
||||
monkeypatch.setattr(
|
||||
platform_service,
|
||||
"refresh_exchange_eligibility",
|
||||
fake_refresh,
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
douyu_router,
|
||||
"start_douyu_batch",
|
||||
lambda **_kwargs: None,
|
||||
)
|
||||
|
||||
result = asyncio.run(
|
||||
douyu_router.create_task_batch(
|
||||
DouyuTaskBatchRequest(
|
||||
account_ids=[account.id],
|
||||
task_type="exchange_goods",
|
||||
handbook_scope="elite",
|
||||
concurrency=1,
|
||||
payload={"commodity_id": "commodity-1"},
|
||||
platform_task_id=task.id,
|
||||
),
|
||||
db=db,
|
||||
current=operator,
|
||||
)
|
||||
)
|
||||
|
||||
assert refreshed == [task.id]
|
||||
assert result["count"] == 1
|
||||
created = db.query(DouyuTask).filter(DouyuTask.batch_id == result["batch_id"]).one()
|
||||
assert created.platform_task_id == task.id
|
||||
event = (
|
||||
db.query(PlatformFulfillmentEvent)
|
||||
.filter(
|
||||
PlatformFulfillmentEvent.task_id == task.id,
|
||||
PlatformFulfillmentEvent.event_type == "douyu_operation_started",
|
||||
)
|
||||
.one()
|
||||
)
|
||||
assert event.detail_json["taskType"] == "exchange_goods"
|
||||
finally:
|
||||
db.rollback()
|
||||
db.close()
|
||||
|
||||
@@ -67,6 +67,45 @@ class TestDouyuWorkbenchScope:
|
||||
assert empty_elite["configured"]
|
||||
assert self.session.query(DouyuWorkbench).count() == 1
|
||||
|
||||
def test_workbench_accounts_keep_import_order(self):
|
||||
extra = [
|
||||
Account(
|
||||
username=name,
|
||||
password="password",
|
||||
email=f"{name}@example.com",
|
||||
email_password="mail-password",
|
||||
cookie="acf_uid=1",
|
||||
)
|
||||
for name in ("order-a", "order-b")
|
||||
]
|
||||
self.session.add_all(extra)
|
||||
self.session.commit()
|
||||
desired = [extra[1].id, self.account.id, extra[0].id]
|
||||
|
||||
update_workbench_accounts(
|
||||
DouyuWorkbenchAccountsUpdate(
|
||||
handbook_scope="elite",
|
||||
account_ids=desired,
|
||||
),
|
||||
db=self.session,
|
||||
current=self.user,
|
||||
)
|
||||
saved = list_workbench_accounts(
|
||||
"elite",
|
||||
db=self.session,
|
||||
current=self.user,
|
||||
)
|
||||
rows = (
|
||||
self.session.query(DouyuWorkbenchAccount)
|
||||
.filter(DouyuWorkbenchAccount.user_id == self.user.id)
|
||||
.order_by(DouyuWorkbenchAccount.sort_order.asc())
|
||||
.all()
|
||||
)
|
||||
|
||||
assert saved["account_ids"] == desired
|
||||
assert [row.account_id for row in rows] == desired
|
||||
assert [row.sort_order for row in rows] == [0, 1, 2]
|
||||
|
||||
def test_task_scope_is_persisted_and_filters_shared_task_types(self):
|
||||
elite_batch, _ = create_douyu_planned_tasks(
|
||||
self.session,
|
||||
|
||||
@@ -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 = "20261118_0096"
|
||||
HEAD_REVISION = "20261119_0097"
|
||||
|
||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||
EXTRA_INDEXES = (
|
||||
|
||||
Reference in New Issue
Block a user