fix(douyu): 按到期时间修正精英宝典状态
This commit is contained in:
@@ -11,6 +11,9 @@ from web.backend.services.douyu_account_state import refresh_douyu_account_state
|
||||
|
||||
|
||||
class FakeClient:
|
||||
def __init__(self, *, expire_time: int = 1799999999):
|
||||
self.expire_time = expire_time
|
||||
|
||||
def acf_ccn(self, *, refresh_subscribe: bool = False):
|
||||
assert refresh_subscribe is False
|
||||
return "csrf"
|
||||
@@ -19,7 +22,7 @@ class FakeClient:
|
||||
return {
|
||||
"manual_type": 1,
|
||||
"manual_score": 5200,
|
||||
"expire_time": 1799999999,
|
||||
"expire_time": self.expire_time,
|
||||
}
|
||||
|
||||
def query_points(self, **_kwargs):
|
||||
@@ -129,3 +132,42 @@ def test_invalid_ck_writes_lifecycle_without_querying_activity(db):
|
||||
assert account.ck_check_status == "invalid"
|
||||
assert account.status == "invalid"
|
||||
assert state.elite_opened is None
|
||||
|
||||
|
||||
def test_expired_elite_is_not_currently_open(db):
|
||||
account = Account(
|
||||
username="expired-elite-account",
|
||||
password="p",
|
||||
email="expired@example.com",
|
||||
email_password="ep",
|
||||
status="active",
|
||||
ck_check_status="valid",
|
||||
cookie="acf_uid=100",
|
||||
elite_opened=True,
|
||||
elite_expire_time=1,
|
||||
auto_managed=True,
|
||||
)
|
||||
db.add(account)
|
||||
db.commit()
|
||||
|
||||
state = refresh_douyu_account_state(
|
||||
db,
|
||||
account,
|
||||
manual_id="manual",
|
||||
rid="room",
|
||||
act_alias="alias",
|
||||
client=cast(DouyuActivityClient, FakeClient(expire_time=1)),
|
||||
cookie_checker=lambda _cookie: {
|
||||
"valid": True,
|
||||
"message": "有效",
|
||||
"fish_ball": 10,
|
||||
"nickname": "测试",
|
||||
"level": 5,
|
||||
"checked_at": datetime.now(UTC),
|
||||
},
|
||||
)
|
||||
|
||||
db.refresh(account)
|
||||
assert state.elite_opened is False
|
||||
assert account.elite_opened is False
|
||||
assert account.elite_expire_time == 1
|
||||
|
||||
@@ -75,7 +75,7 @@ class TestEliteHandbookOpenFlow:
|
||||
client.elite_user_info.return_value = {
|
||||
"manual_type": 1,
|
||||
"manual_score": 300,
|
||||
"expire_time": 1793462399,
|
||||
"expire_time": 1799999999,
|
||||
}
|
||||
runner._client = Mock(return_value=client)
|
||||
|
||||
@@ -89,7 +89,7 @@ class TestEliteHandbookOpenFlow:
|
||||
assert "已开通" in task.message
|
||||
assert "到期" in task.message
|
||||
assert self.account.elite_opened is True
|
||||
assert self.account.elite_expire_time == 1793462399
|
||||
assert self.account.elite_expire_time == 1799999999
|
||||
assert self.account.points == 300
|
||||
|
||||
def test_query_elite_status_marks_unopened(self):
|
||||
@@ -114,6 +114,28 @@ class TestEliteHandbookOpenFlow:
|
||||
assert self.account.elite_opened is False
|
||||
assert self.account.elite_expire_time is None
|
||||
|
||||
def test_query_elite_status_marks_expired_as_not_currently_open(self):
|
||||
task = self._task("query_elite_status")
|
||||
runner = self._runner("query_elite_status")
|
||||
client = Mock()
|
||||
client.elite_user_info.return_value = {
|
||||
"manual_type": 1,
|
||||
"manual_score": 0,
|
||||
"expire_time": 1,
|
||||
}
|
||||
runner._client = Mock(return_value=client)
|
||||
|
||||
runner._execute_query_elite_status(
|
||||
self.session, task, self.account, "acf_uid=100", self._config()
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(self.account)
|
||||
assert task.status == "success"
|
||||
assert "已过期" in task.message
|
||||
assert self.account.elite_opened is False
|
||||
assert self.account.elite_expire_time == 1
|
||||
|
||||
def test_create_elite_qr_skips_payment_when_already_opened(self):
|
||||
"""已开通的账号不再生成支付码(避免二维码闪现与白付)。"""
|
||||
task = self._task("create_elite_qr")
|
||||
@@ -122,7 +144,7 @@ class TestEliteHandbookOpenFlow:
|
||||
client.elite_user_info.return_value = {
|
||||
"manual_type": 1,
|
||||
"manual_score": 300,
|
||||
"expire_time": 1793462399,
|
||||
"expire_time": 1799999999,
|
||||
}
|
||||
runner._client = Mock(return_value=client)
|
||||
|
||||
@@ -143,6 +165,33 @@ class TestEliteHandbookOpenFlow:
|
||||
assert self.account.elite_opened is True
|
||||
assert self.account.bind_status != "elite_opened"
|
||||
|
||||
def test_create_elite_qr_does_not_skip_for_expired_elite(self, monkeypatch):
|
||||
monkeypatch.setattr(douyu_runner_manual, "DOUYU_PAYMENT_POLL_SECONDS", 0.05)
|
||||
monkeypatch.setattr(douyu_runner_manual, "DOUYU_PAYMENT_POLL_INTERVAL", 0.01)
|
||||
|
||||
task = self._task("create_elite_qr")
|
||||
runner = self._runner("create_elite_qr")
|
||||
client = Mock()
|
||||
client.acf_ccn.return_value = "ctn-1"
|
||||
client.elite_user_info.return_value = {
|
||||
"manual_type": 1,
|
||||
"manual_score": 0,
|
||||
"expire_time": 1,
|
||||
}
|
||||
client.create_elite_qr.return_value = {"pay_url": "https://example.test/pay"}
|
||||
runner._client = Mock(return_value=client)
|
||||
runner._refresh_account_points = Mock(return_value={"points": 0})
|
||||
|
||||
runner._execute_create_elite_qr(
|
||||
self.session, task, self.account, "acf_uid=100", self._config()
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(self.account)
|
||||
assert task.status == "failed"
|
||||
assert self.account.elite_opened is False
|
||||
client.create_elite_qr.assert_called_once()
|
||||
|
||||
def test_create_elite_qr_uses_points_baseline(self, monkeypatch):
|
||||
"""账上已有 680 积分时不能立刻判成功,必须等积分真的增长。"""
|
||||
monkeypatch.setattr(douyu_runner_manual, "DOUYU_PAYMENT_POLL_SECONDS", 0.05)
|
||||
|
||||
@@ -2069,6 +2069,38 @@ class TestBindingAndCompletion(_Base):
|
||||
assert detail["task"]["exchangeStatus"] == "points_short"
|
||||
assert detail["task"]["account"]["id"] == account.id
|
||||
|
||||
def test_expired_elite_is_not_currently_opened(self, monkeypatch):
|
||||
task = self._allocated()
|
||||
account = (
|
||||
self.session.query(Account).filter(Account.id == task.account_id).one()
|
||||
)
|
||||
task.binding_status = "bound"
|
||||
task.execution_status = "bound"
|
||||
self.session.commit()
|
||||
monkeypatch.setattr(
|
||||
service,
|
||||
"query_exchange_eligibility",
|
||||
lambda *_args, **_kwargs: DouyuEligibilityResult(
|
||||
elite_user_info={"manual_type": 1, "expire_time": 1},
|
||||
points=2000,
|
||||
points_response={"points": 2000},
|
||||
limited_goods=[],
|
||||
limited_ids=frozenset(),
|
||||
),
|
||||
)
|
||||
|
||||
detail = service.refresh_exchange_eligibility(
|
||||
self.session,
|
||||
task_id=task.id,
|
||||
current=self.admin,
|
||||
)
|
||||
|
||||
self.session.refresh(account)
|
||||
assert account.elite_opened is False
|
||||
assert account.elite_expire_time == 1
|
||||
assert detail["task"]["exchangeStatus"] == "not_opened"
|
||||
assert detail["task"]["issueCode"] == "elite_not_opened"
|
||||
|
||||
def test_expired_lease_moves_unfinished_task_to_manual(self):
|
||||
task = self._allocated()
|
||||
lease = self.session.query(AccountLease).one()
|
||||
|
||||
Reference in New Issue
Block a user