feat(douyu): 高价值套装改用官方 storehome 三态判定
高价值套装的准入判定改为只认官方精英宝典 storehome 里账号级的 status:0=可兑换、1=已达兑换上限,商品缺失/接口异常=unknown。 兑换记录和积分记录只作历史展示,不参与是否拥有的判定。 原来的 high_value_owned(JSON 名单)无法区分「确认可兑换」和 「官方接口没返回商品」,也无法表达部分失败。改为两套独立状态 + 检查时间(迁移 20261106_0065),旧快照保守回填:status 缺失的 一律 unknown,不猜。 CK 判定失效时在数据层作废结论(降为 unknown),不是展示层降级。 官方 status 是账号维度的,但 CK 失效那段时间账号可能被别人手工 登录并兑换(这些号共享给客服),缓存里的「可兑换」就不成立了; 只在展示层降级的话,CK 恢复后那条陈旧的「可换」会重新变绿。 error(查不到)不作废 —— 查不到不等于账号出问题了。 高价值结论有自己的时钟:资料刷新除了看 overview_queried_at,还看 high_value_checked_at。两者会脱钩(商品接口单独失败时资料时间被刷新、 高价值时间停在原地),少了这一条这类账号会永久停在旧结论。作废的 结论按 6 小时慢速重试,但「从来没查到过」不因此重选 —— 那是接口对 该账号稳定失败,每轮都重选只会反复撞墙。 商城商品列表改用精英宝典的 manualID 拉取,不再寄生在电竞手册分支里 (否则没配电竞手册的配置就永远拉不到商城,三态全部停在待确认)。 筛选拆成三类「查不到」:unqueried(未查资料,旧口径不变)、 high_value_never(从未读到商城)、high_value_unknown(查过但结论 未知/过期)。之前第二类无处可寻 —— 它既不满足 unqueried 也不满足 high_value_unknown。
This commit is contained in:
+435
-36
@@ -6,8 +6,9 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from pathlib import Path
|
||||
from unittest.mock import Mock
|
||||
|
||||
import pytest
|
||||
|
||||
@@ -67,11 +68,12 @@ class TestOwnedJudgement:
|
||||
got = extract_high_value_goods([goods_free], [RABBIT], [])
|
||||
assert got[0]["owned"] is False
|
||||
|
||||
def test_owned_comes_from_official_records(self):
|
||||
def test_records_never_override_available_status(self):
|
||||
got = extract_high_value_goods(
|
||||
[GOODS_AVAILABLE], [RABBIT], [{"commodityName": "套装-兔兔白日梦"}]
|
||||
)
|
||||
assert got[0]["owned"] is True
|
||||
assert got[0]["state"] == "available"
|
||||
assert got[0]["owned"] is False
|
||||
assert got[0]["obtained_names"] == ["套装-兔兔白日梦"]
|
||||
|
||||
def test_not_owned_when_records_empty(self):
|
||||
@@ -105,7 +107,7 @@ class TestOwnedJudgement:
|
||||
|
||||
def test_stock_and_owned_are_independent(self):
|
||||
"""展示用的全局信息与账号判定互不影响。"""
|
||||
sold_out = {**GOODS_AVAILABLE, "count": 0, "storeStatus": 0}
|
||||
sold_out = {**GOODS_OWNED, "count": 0, "storeStatus": 0}
|
||||
got = extract_high_value_goods(
|
||||
[sold_out], [RABBIT], [{"commodityName": "套装-兔兔白日梦"}]
|
||||
)
|
||||
@@ -119,7 +121,7 @@ class TestOwnedJudgement:
|
||||
[RABBIT],
|
||||
[{"commodityName": "套装-兔兔白日梦"}, {"commodityName": "别的商品"}],
|
||||
)
|
||||
assert got[0]["owned"] is True
|
||||
assert got[0]["state"] == "available"
|
||||
assert len(got[0]["obtained_names"]) == 1
|
||||
|
||||
def test_missing_goods_is_not_silently_dropped(self):
|
||||
@@ -127,18 +129,17 @@ class TestOwnedJudgement:
|
||||
got = extract_high_value_goods([GOODS_AVAILABLE], [RABBIT, "不存在的套装"], [])
|
||||
assert len(got) == 2
|
||||
assert got[1]["missing"] is True
|
||||
assert "都没有这个商品" in got[1]["reason"]
|
||||
assert got[1]["state"] == "unknown"
|
||||
assert "官方商城未返回" in got[1]["reason"]
|
||||
|
||||
def test_goods_in_records_but_not_list_is_not_missing(self):
|
||||
"""兑换记录里有、但当前限兑列表里没有 —— 不是 missing,是已获得。
|
||||
|
||||
实测就有这种情况(活动窗口结束但记录仍在),不能误报成「没这个商品」。
|
||||
"""
|
||||
def test_records_without_storehome_status_stay_unknown(self):
|
||||
"""兑换记录可能被清理或暂时查不到,不能替代官方当前 status。"""
|
||||
got = extract_high_value_goods(
|
||||
[], [RABBIT], [{"commodityName": "套装-兔兔白日梦"}]
|
||||
)
|
||||
assert got[0]["owned"] is True
|
||||
assert got[0]["missing"] is False
|
||||
assert got[0]["state"] == "unknown"
|
||||
assert got[0]["owned"] is False
|
||||
assert got[0]["missing"] is True
|
||||
assert got[0]["in_goods_list"] is False
|
||||
|
||||
def test_empty_list_and_no_records_keeps_all_names(self):
|
||||
@@ -152,9 +153,14 @@ class TestOwnedJudgement:
|
||||
{**GOODS_AVAILABLE, "commodityName": "套装-狂战萌兔", "commodityId": "X"},
|
||||
]
|
||||
got = extract_high_value_goods(
|
||||
items, list(DEFAULT_HIGH_VALUE_GOODS), [{"commodityName": "套装-狂战萌兔"}]
|
||||
[
|
||||
items[0],
|
||||
{**items[1], "status": 1},
|
||||
],
|
||||
list(DEFAULT_HIGH_VALUE_GOODS),
|
||||
[{"commodityName": "套装-狂战萌兔"}],
|
||||
)
|
||||
assert [g["owned"] for g in got] == [False, True]
|
||||
assert [g["state"] for g in got] == ["available", "owned"]
|
||||
|
||||
def test_tolerates_garbage(self):
|
||||
got = extract_high_value_goods(
|
||||
@@ -162,6 +168,7 @@ class TestOwnedJudgement:
|
||||
[RABBIT],
|
||||
[None, "y", {"commodityName": ""}],
|
||||
)
|
||||
assert got[0]["state"] == "available"
|
||||
assert got[0]["owned"] is False
|
||||
|
||||
def test_custom_goods_config_overrides_default(self):
|
||||
@@ -365,6 +372,43 @@ class TestOverviewAggregation:
|
||||
assert h.marked["status"] == "success"
|
||||
assert r["high_value_goods"] == []
|
||||
|
||||
def test_goods_query_does_not_depend_on_esports_config(self):
|
||||
"""高价值套装来自**精英宝典**商城 —— 与电竞手册配置无关。
|
||||
|
||||
回归:商品列表查询曾经被写在「电竞手册」的 else 分支里,于是
|
||||
一旦没配 ``esports_manual_id``,商城商品就永远拉不到,
|
||||
高价值三态永远落不到 ``available``/``owned``(全部显示「待确认」)。
|
||||
"""
|
||||
seen: list[str] = []
|
||||
|
||||
class _Client(_FakeClient):
|
||||
def list_goods(self, *, manual_id, rid):
|
||||
seen.append(manual_id)
|
||||
return super().list_goods(manual_id=manual_id, rid=rid)
|
||||
|
||||
h = _Harness(_Client())
|
||||
h._execute_query_account_overview(
|
||||
self.session,
|
||||
self.task,
|
||||
self.account,
|
||||
"cookie",
|
||||
{
|
||||
"manual_id": "ELITE-M",
|
||||
# 故意**不配** esports_manual_id
|
||||
"rid": "R1",
|
||||
"bind_act_alias": "B",
|
||||
},
|
||||
)
|
||||
r = h.marked["result"]
|
||||
assert seen == ["ELITE-M"], "商城商品必须用精英宝典的 manualID 拉"
|
||||
assert "esports" in r["errors"] # 电竞那一项照常报未配置
|
||||
assert r["limited_goods_total"] == 2
|
||||
# 高价值三态照样落库(官方 status 说了算)
|
||||
self.session.commit()
|
||||
self.session.refresh(self.account)
|
||||
assert self.account.high_value_bairimeng_status == "owned"
|
||||
assert self.account.high_value_mengtu_status == "available"
|
||||
|
||||
def test_message_counts_owned_suits(self):
|
||||
assert "兔兔白日梦" in self._run().marked["message"]
|
||||
assert "已拥有 1 个" in self._run().marked["message"]
|
||||
@@ -808,7 +852,7 @@ class TestSummaryFeedsAccountList:
|
||||
- 一键查询拉的是**斗鱼官方**记录,本来能查到,但那份 JSON 有 1~2KB,
|
||||
不能塞进列表(15000 个账号会把响应放大到几十 MB)。
|
||||
|
||||
所以加了这个**极小**汇总字段 `high_value_owned`:`{"owned": [...], "exchanges": N}`。
|
||||
所以加了这个**极小**汇总字段 `high_value`(官方 storehome 的三态准入)。
|
||||
"""
|
||||
|
||||
def setup_method(self):
|
||||
@@ -823,7 +867,9 @@ class TestSummaryFeedsAccountList:
|
||||
email="s@e.com",
|
||||
email_password="ep",
|
||||
cookie="acf_uid=1; acf_ccn=c",
|
||||
high_value_owned=["套装-兔兔白日梦"],
|
||||
high_value_bairimeng_status="owned",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
overview_queried_at=datetime.now(UTC),
|
||||
overview_snapshot={"high_value_goods": []},
|
||||
)
|
||||
@@ -854,9 +900,9 @@ class TestSummaryFeedsAccountList:
|
||||
只断言属性的测试会**假绿**(踩过),所以这里一律看 `model_dump()`。
|
||||
"""
|
||||
dumped = self._list()[0].model_dump()
|
||||
assert dumped["high_value_owned"] == ["套装-兔兔白日梦"], (
|
||||
"字段没出现在序列化结果里 —— 前端拿到的 JSON 就没有它"
|
||||
)
|
||||
assert dumped["high_value"]["state"] == "complete"
|
||||
assert dumped["high_value"]["bairimeng"] == "owned"
|
||||
assert dumped["high_value"]["mengtu"] == "available"
|
||||
|
||||
def test_list_serializes_queried_marker(self):
|
||||
"""要能区分「查过但没兑换」和「还没查过」—— 否则列表会把未知当高价值。"""
|
||||
@@ -948,10 +994,9 @@ class TestSummaryFeedsAccountList:
|
||||
)
|
||||
self.session.commit()
|
||||
self.session.refresh(self.account)
|
||||
owned = self.account.high_value_owned
|
||||
assert owned is not None, "查询跑完必须写「已兑换过的高价值套装」"
|
||||
# _FakeClient 的兑换记录里有一条「破片手榴弹-兔兔白日梦」
|
||||
assert "兔兔白日梦" in "".join(owned)
|
||||
assert self.account.high_value_bairimeng_status == "owned"
|
||||
assert self.account.high_value_mengtu_status == "available"
|
||||
assert self.account.high_value_checked_at is not None
|
||||
|
||||
|
||||
class TestOverviewSummaryMigrationIsSafeToRerun:
|
||||
@@ -1671,7 +1716,9 @@ class TestHighValueAccountFilters:
|
||||
email="e1@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=now,
|
||||
high_value_owned=[],
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=now,
|
||||
points=500,
|
||||
gold_balance=10,
|
||||
elite_opened=True,
|
||||
@@ -1685,7 +1732,9 @@ class TestHighValueAccountFilters:
|
||||
email="e2@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=now,
|
||||
high_value_owned=["套装-兔兔白日梦"],
|
||||
high_value_bairimeng_status="owned",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=now,
|
||||
points=100,
|
||||
gold_balance=0,
|
||||
elite_opened=False,
|
||||
@@ -1699,7 +1748,9 @@ class TestHighValueAccountFilters:
|
||||
email="e3@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=now,
|
||||
high_value_owned=["套装-狂战萌兔"],
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="owned",
|
||||
high_value_checked_at=now,
|
||||
points=50,
|
||||
gold_balance=20,
|
||||
elite_opened=True,
|
||||
@@ -1713,7 +1764,9 @@ class TestHighValueAccountFilters:
|
||||
email="e4@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=now,
|
||||
high_value_owned=["套装-兔兔白日梦", "套装-狂战萌兔"],
|
||||
high_value_bairimeng_status="owned",
|
||||
high_value_mengtu_status="owned",
|
||||
high_value_checked_at=now,
|
||||
points=0,
|
||||
gold_balance=0,
|
||||
elite_opened=False,
|
||||
@@ -1727,7 +1780,9 @@ class TestHighValueAccountFilters:
|
||||
email="e5@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=None,
|
||||
high_value_owned=None,
|
||||
high_value_bairimeng_status=None,
|
||||
high_value_mengtu_status=None,
|
||||
high_value_checked_at=None,
|
||||
points=None,
|
||||
gold_balance=None,
|
||||
elite_opened=None,
|
||||
@@ -1741,13 +1796,34 @@ class TestHighValueAccountFilters:
|
||||
email="e6@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=now,
|
||||
high_value_owned=[],
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=now,
|
||||
points=800,
|
||||
gold_balance=0,
|
||||
elite_opened=True,
|
||||
ck_check_status="invalid",
|
||||
status="normal",
|
||||
)
|
||||
# 7. 查过资料,但**从没读到官方商城**(商城接口对这个账号稳定失败)。
|
||||
# 这类账号既不是「未查资料」(overview_queried_at 有值),
|
||||
# 也不属于「待确认」(high_value_checked_at 为 NULL)。
|
||||
# —— 之前它在界面上**无处可寻**,是本次补的缺口。
|
||||
self.acc_no_mall = Account(
|
||||
username="acc_no_mall",
|
||||
password="p",
|
||||
email="e7@test.com",
|
||||
email_password="p",
|
||||
overview_queried_at=now,
|
||||
high_value_bairimeng_status=None,
|
||||
high_value_mengtu_status=None,
|
||||
high_value_checked_at=None,
|
||||
points=120,
|
||||
gold_balance=0,
|
||||
elite_opened=False,
|
||||
ck_check_status="valid",
|
||||
status="normal",
|
||||
)
|
||||
self.session.add_all(
|
||||
[
|
||||
self.acc_crown,
|
||||
@@ -1756,6 +1832,7 @@ class TestHighValueAccountFilters:
|
||||
self.acc_both_owned,
|
||||
self.acc_unqueried,
|
||||
self.acc_broken,
|
||||
self.acc_no_mall,
|
||||
]
|
||||
)
|
||||
self.session.commit()
|
||||
@@ -1832,6 +1909,49 @@ class TestHighValueAccountFilters:
|
||||
assert "acc_broken" in names
|
||||
assert "acc_both_owned" not in names
|
||||
|
||||
def test_unqueried_filter_keeps_its_original_meaning(self):
|
||||
"""「未查资料」= 从没跑过一键查询(**旧口径**保留)。
|
||||
|
||||
⚠️ 别把它悄悄改成「没读到官方商城」:那是另一个集合。
|
||||
查过资料但商城接口失败的账号(acc_no_mall)**不算**未查资料。
|
||||
"""
|
||||
names = [it.username for it in self._query(high_value_filter="unqueried")]
|
||||
assert names == ["acc_unqueried"]
|
||||
assert "acc_no_mall" not in names
|
||||
|
||||
def test_high_value_never_filter(self):
|
||||
"""「从未读到官方商城状态」这一档必须**单独可筛**。
|
||||
|
||||
之前这批账号(商城接口失败 / 没配 manualID)在界面上无处可寻:
|
||||
既不满足 ``unqueried``(资料查过),也不满足 ``high_value_unknown``
|
||||
(那条要求 ``high_value_checked_at`` 非空)。
|
||||
"""
|
||||
names = [
|
||||
it.username for it in self._query(high_value_filter="high_value_never")
|
||||
]
|
||||
assert set(names) == {"acc_unqueried", "acc_no_mall"}
|
||||
assert "acc_crown" not in names
|
||||
|
||||
def test_high_value_unknown_filter_excludes_never_checked(self):
|
||||
"""「待确认」= **查过**但结论未知/过期,不含「从没查过」。"""
|
||||
names = [
|
||||
it.username for it in self._query(high_value_filter="high_value_unknown")
|
||||
]
|
||||
assert "acc_unqueried" not in names
|
||||
assert "acc_no_mall" not in names
|
||||
|
||||
def test_summary_counts_never_and_unknown_separately(self):
|
||||
"""统计里「从没读到」和「待确认」必须分开计数,不能混成一个数。"""
|
||||
from web.backend.routers.accounts import accounts_summary
|
||||
|
||||
res = accounts_summary(db=self.session, current=self.admin)
|
||||
hv = res.get("high_value", {})
|
||||
# 未查资料:1(acc_unqueried);从没读到商城:2(acc_unqueried + acc_no_mall)
|
||||
assert hv["unqueried"] == 1
|
||||
assert hv["high_value_never"] == 2
|
||||
# 查过但结论未知/过期:0(其它账号状态都是 available/owned)
|
||||
assert hv["high_value_unknown"] == 0
|
||||
|
||||
def test_list_sorts_by_suit_availability(self):
|
||||
# 升序:两套都能换 → 只剩一套 → 都换过 → 没查过。同档按 id。
|
||||
names = [it.username for it in self._query(sort="high_value", order="asc")]
|
||||
@@ -1842,9 +1962,11 @@ class TestHighValueAccountFilters:
|
||||
"acc_mengtu_owned",
|
||||
"acc_both_owned",
|
||||
"acc_unqueried",
|
||||
"acc_no_mall",
|
||||
]
|
||||
names = [it.username for it in self._query(sort="high_value", order="desc")]
|
||||
assert names == [
|
||||
"acc_no_mall",
|
||||
"acc_unqueried",
|
||||
"acc_both_owned",
|
||||
"acc_mengtu_owned",
|
||||
@@ -1907,6 +2029,7 @@ class TestHighValueAccountFilters:
|
||||
"acc_mengtu_owned",
|
||||
"acc_unqueried",
|
||||
"acc_broken",
|
||||
"acc_no_mall",
|
||||
"acc_crown",
|
||||
"acc_both_owned",
|
||||
]
|
||||
@@ -1918,6 +2041,7 @@ class TestHighValueAccountFilters:
|
||||
"acc_mengtu_owned",
|
||||
"acc_unqueried",
|
||||
"acc_broken",
|
||||
"acc_no_mall",
|
||||
]
|
||||
|
||||
def test_list_sorts_points_status_bind_and_tag(self):
|
||||
@@ -1936,6 +2060,7 @@ class TestHighValueAccountFilters:
|
||||
assert [it.username for it in self._query(sort="points", order="desc")] == [
|
||||
"acc_broken",
|
||||
"acc_crown",
|
||||
"acc_no_mall",
|
||||
"acc_mengtu_owned",
|
||||
"acc_bairimeng_owned",
|
||||
"acc_both_owned",
|
||||
@@ -1945,6 +2070,7 @@ class TestHighValueAccountFilters:
|
||||
"acc_both_owned",
|
||||
"acc_bairimeng_owned",
|
||||
"acc_mengtu_owned",
|
||||
"acc_no_mall",
|
||||
"acc_crown",
|
||||
"acc_broken",
|
||||
"acc_unqueried",
|
||||
@@ -1964,6 +2090,7 @@ class TestHighValueAccountFilters:
|
||||
"acc_broken",
|
||||
"acc_crown",
|
||||
"acc_mengtu_owned",
|
||||
"acc_no_mall",
|
||||
"acc_unqueried",
|
||||
]
|
||||
tagged = [it.username for it in self._query(sort="tag", order="asc")]
|
||||
@@ -1994,8 +2121,8 @@ class TestHighValueAccountFilters:
|
||||
assert got[0]["owned"] is True
|
||||
assert got[0]["reason"] == "官方商城显示已达兑换上限"
|
||||
|
||||
def test_null_high_value_owned_not_treated_as_both_available(self):
|
||||
"""high_value_owned 为 None 的账号(如被重置过),绝不能误判为双套均可兑换。"""
|
||||
def test_unknown_high_value_status_not_treated_as_both_available(self):
|
||||
"""官方状态 unknown 绝不能误判为双套均可兑换。"""
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from web.backend.models import Account
|
||||
@@ -2006,14 +2133,286 @@ class TestHighValueAccountFilters:
|
||||
password="p",
|
||||
email="e@test.com",
|
||||
email_password="ep",
|
||||
high_value_owned=None,
|
||||
overview_queried_at=datetime.now(UTC), # 虽然时间不为空,但字段是 None
|
||||
high_value_bairimeng_status="unknown",
|
||||
high_value_mengtu_status="unknown",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
overview_queried_at=datetime.now(UTC),
|
||||
)
|
||||
self.session.add(acc)
|
||||
self.session.commit()
|
||||
|
||||
res = accounts_summary(db=self.session, current=self.admin)
|
||||
hv = res.get("high_value", {})
|
||||
# 绝不计入 both_available,应计入 unqueried
|
||||
# 绝不计入 both_available,应计入待确认
|
||||
assert hv["both_available"] == 2
|
||||
assert hv["unqueried"] == 2
|
||||
assert hv["high_value_unknown"] == 1
|
||||
|
||||
|
||||
class TestHighValueTriState:
|
||||
"""三态本身:可兑换 / 已达上限 / 未知,以及过期与 CK 失效的降级。"""
|
||||
|
||||
def setup_method(self):
|
||||
self.engine = get_test_engine()
|
||||
self.session = make_test_session(self.engine)
|
||||
|
||||
def teardown_method(self):
|
||||
self.session.close()
|
||||
|
||||
def _account(self, **kwargs):
|
||||
kwargs.setdefault(
|
||||
"username",
|
||||
f"hv-{id(kwargs)}-{kwargs.get('high_value_bairimeng_status')}",
|
||||
)
|
||||
acc = Account(
|
||||
password="p",
|
||||
email="e@test.com",
|
||||
email_password="ep",
|
||||
**kwargs,
|
||||
)
|
||||
self.session.add(acc)
|
||||
self.session.commit()
|
||||
return acc
|
||||
|
||||
def test_never_when_never_checked(self):
|
||||
from web.backend.services.high_value_service import high_value_payload
|
||||
|
||||
acc = self._account()
|
||||
payload = high_value_payload(acc)
|
||||
assert payload["state"] == "never"
|
||||
assert payload["bairimeng"] == ""
|
||||
assert payload["mengtu"] == ""
|
||||
|
||||
def test_partial_when_one_suit_unknown(self):
|
||||
from web.backend.services.high_value_service import high_value_payload
|
||||
|
||||
acc = self._account(
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="unknown",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
)
|
||||
payload = high_value_payload(acc)
|
||||
assert payload["state"] == "partial"
|
||||
assert payload["bairimeng"] == "available"
|
||||
assert payload["mengtu"] == "unknown"
|
||||
|
||||
def test_stale_after_seven_days(self):
|
||||
from web.backend.services.high_value_service import high_value_payload
|
||||
|
||||
acc = self._account(
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=datetime.now(UTC) - timedelta(days=8),
|
||||
)
|
||||
payload = high_value_payload(acc)
|
||||
assert payload["state"] == "stale"
|
||||
assert payload["stale"] is True
|
||||
assert payload["fresh"] is False
|
||||
|
||||
def test_ck_invalid_downgrades_to_stale(self):
|
||||
"""CK 失效 = 查不动了,缓存里的「可兑换」必须降级为待确认。"""
|
||||
from web.backend.services.high_value_service import high_value_payload
|
||||
|
||||
acc = self._account(
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
ck_check_status="invalid",
|
||||
)
|
||||
payload = high_value_payload(acc)
|
||||
assert payload["state"] == "stale"
|
||||
assert payload["stale"] is True
|
||||
|
||||
def test_stale_account_is_not_counted_as_available(self):
|
||||
"""过期的账号不能进「双套均可兑换」筛选。"""
|
||||
from web.backend.routers.accounts import accounts_summary
|
||||
|
||||
admin = User(username="hv-stale-admin", password_hash="h", role="super_admin")
|
||||
self.session.add(admin)
|
||||
self.session.flush()
|
||||
self._account(
|
||||
username="hv-stale-acc",
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=datetime.now(UTC) - timedelta(days=8),
|
||||
)
|
||||
self.session.commit()
|
||||
|
||||
res = accounts_summary(db=self.session, current=admin)
|
||||
hv = res.get("high_value", {})
|
||||
assert hv["both_available"] == 0
|
||||
assert hv["high_value_unknown"] == 1
|
||||
|
||||
|
||||
class TestHighValueInvalidatedByCkFailure:
|
||||
"""CK 失效 → 高价值结论**作废**;CK 恢复后**不能**直接显示旧的「可换」。
|
||||
|
||||
官方 ``storehome.status`` 是账号维度的,正常只随这个账号自己的兑换而变。
|
||||
但 CK 失效那段时间,账号**可能被别人手工登录并兑换**(这些号共享给客服)
|
||||
—— 缓存里的「可兑换」就不成立了。
|
||||
|
||||
⚠️ 关键在于:作废必须发生在**数据层**,不能只靠展示层降级。
|
||||
CK 恢复之后展示层就不再降级了 —— 那条陈旧的「可换」会重新变绿,
|
||||
运营会拿着一份失效结论去兑换。
|
||||
"""
|
||||
|
||||
def setup_method(self):
|
||||
self.engine = get_test_engine()
|
||||
self.session = make_test_session(self.engine)
|
||||
|
||||
def teardown_method(self):
|
||||
self.session.close()
|
||||
|
||||
def _account(self, **kwargs):
|
||||
kwargs.setdefault("username", f"hvinv-{id(kwargs)}")
|
||||
acc = Account(
|
||||
password="p",
|
||||
email="e@test.com",
|
||||
email_password="ep",
|
||||
**kwargs,
|
||||
)
|
||||
self.session.add(acc)
|
||||
self.session.commit()
|
||||
return acc
|
||||
|
||||
def test_ck_invalid_invalidates_high_value(self):
|
||||
from web.backend.services.account_lifecycle import on_ck_verdict
|
||||
|
||||
acc = self._account(
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
ck_check_status="valid",
|
||||
)
|
||||
on_ck_verdict(
|
||||
self.session, acc, "invalid", detail={}, occurred_at=datetime.now(UTC)
|
||||
)
|
||||
self.session.commit()
|
||||
self.session.refresh(acc)
|
||||
assert acc.high_value_bairimeng_status == "unknown"
|
||||
assert acc.high_value_mengtu_status == "unknown"
|
||||
|
||||
def test_ck_recovery_does_not_resurrect_stale_conclusion(self):
|
||||
"""CK 恢复 valid 后,陈旧结论**不能**重新显示成「可换」。"""
|
||||
from web.backend.services.account_lifecycle import on_ck_verdict
|
||||
from web.backend.services.high_value_service import high_value_payload
|
||||
|
||||
acc = self._account(
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="available",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
ck_check_status="valid",
|
||||
)
|
||||
on_ck_verdict(
|
||||
self.session, acc, "invalid", detail={}, occurred_at=datetime.now(UTC)
|
||||
)
|
||||
# 重登成功 → CK 恢复
|
||||
on_ck_verdict(
|
||||
self.session, acc, "valid", detail={}, occurred_at=datetime.now(UTC)
|
||||
)
|
||||
self.session.commit()
|
||||
self.session.refresh(acc)
|
||||
|
||||
payload = high_value_payload(acc)
|
||||
assert payload["bairimeng"] == "unknown", "作废的结论不能因为 CK 恢复就复活"
|
||||
assert payload["mengtu"] == "unknown"
|
||||
assert payload["state"] in {"partial", "stale"}
|
||||
|
||||
def test_ck_error_does_not_invalidate(self):
|
||||
"""`error`(查不到)**不**作废 —— 查不到不等于账号出问题了。"""
|
||||
from web.backend.services.account_lifecycle import on_ck_verdict
|
||||
|
||||
acc = self._account(
|
||||
high_value_bairimeng_status="available",
|
||||
high_value_mengtu_status="owned",
|
||||
high_value_checked_at=datetime.now(UTC),
|
||||
ck_check_status="valid",
|
||||
)
|
||||
on_ck_verdict(
|
||||
self.session, acc, "error", detail={}, occurred_at=datetime.now(UTC)
|
||||
)
|
||||
self.session.commit()
|
||||
self.session.refresh(acc)
|
||||
assert acc.high_value_bairimeng_status == "available"
|
||||
assert acc.high_value_mengtu_status == "owned"
|
||||
|
||||
|
||||
class TestHighValueAfterExchange:
|
||||
"""兑换成功后,官方准入必须立刻收口,不能被 storehome 的缓存延迟覆盖回去。"""
|
||||
|
||||
def setup_method(self):
|
||||
self.engine = get_test_engine()
|
||||
self.session = make_test_session(self.engine)
|
||||
self.account = Account(
|
||||
username="hv-exchange",
|
||||
password="p",
|
||||
email="e@test.com",
|
||||
email_password="ep",
|
||||
cookie="acf_uid=1; acf_ccn=c",
|
||||
)
|
||||
self.session.add(self.account)
|
||||
self.session.commit()
|
||||
|
||||
def teardown_method(self):
|
||||
self.session.close()
|
||||
|
||||
def _runner(self, goods):
|
||||
from web.backend.services.douyu_runner_goods import GoodsMixin
|
||||
|
||||
class _Runner(GoodsMixin):
|
||||
def __init__(self):
|
||||
self.logs = []
|
||||
|
||||
def _push_log(self, level, message):
|
||||
self.logs.append((level, message))
|
||||
|
||||
runner = _Runner()
|
||||
client = Mock()
|
||||
client.list_goods.return_value = {"goods": goods}
|
||||
return runner, client
|
||||
|
||||
def test_storehome_cache_delay_still_marks_owned(self):
|
||||
"""官方刚兑换完还返回旧的 status=0 —— 兑换成功是确定事实,必须是 owned。"""
|
||||
runner, client = self._runner(
|
||||
[
|
||||
{"commodityName": "套装-兔兔白日梦", "commodityId": "x", "status": 0},
|
||||
{"commodityName": "套装-狂战萌兔", "commodityId": "y", "status": 0},
|
||||
]
|
||||
)
|
||||
runner._refresh_high_value_after_exchange(
|
||||
client,
|
||||
self.account,
|
||||
manual_id="m",
|
||||
rid="r",
|
||||
commodity_name="套装-兔兔白日梦",
|
||||
)
|
||||
assert self.account.high_value_bairimeng_status == "owned"
|
||||
assert self.account.high_value_mengtu_status == "available"
|
||||
|
||||
def test_storehome_refresh_failure_falls_back_to_owned(self):
|
||||
"""回查失败不能带崩已成功的兑换,也不能把套装留在「可兑换」。"""
|
||||
runner, client = self._runner([])
|
||||
client.list_goods.side_effect = RuntimeError("network down")
|
||||
runner._refresh_high_value_after_exchange(
|
||||
client,
|
||||
self.account,
|
||||
manual_id="m",
|
||||
rid="r",
|
||||
commodity_name="套装-狂兔萌兔",
|
||||
)
|
||||
assert self.account.high_value_bairimeng_status == "unknown"
|
||||
assert any(level == "warning" for level, _ in runner.logs)
|
||||
|
||||
def test_unrelated_goods_name_is_ignored(self):
|
||||
"""换的不是高价值套装时,不能乱改高价值状态。"""
|
||||
runner, client = self._runner(
|
||||
[{"commodityName": "套装-兔兔白日梦", "commodityId": "x", "status": 0}]
|
||||
)
|
||||
runner._refresh_high_value_after_exchange(
|
||||
client,
|
||||
self.account,
|
||||
manual_id="m",
|
||||
rid="r",
|
||||
commodity_name="精英手册-其他道具",
|
||||
)
|
||||
assert self.account.high_value_bairimeng_status == "available"
|
||||
assert self.account.high_value_mengtu_status == "unknown"
|
||||
|
||||
@@ -44,6 +44,8 @@ class _Base:
|
||||
queried_days_ago: int | None = None,
|
||||
auto_managed: bool = True,
|
||||
status: str = "active",
|
||||
hv_checked_days_ago: float | None = None,
|
||||
hv_status: str | None = None,
|
||||
) -> Account:
|
||||
acc = Account(
|
||||
username=name,
|
||||
@@ -59,6 +61,13 @@ class _Base:
|
||||
acc.overview_queried_at = datetime.now(UTC) - timedelta(
|
||||
days=queried_days_ago
|
||||
)
|
||||
if hv_checked_days_ago is not None:
|
||||
acc.high_value_checked_at = datetime.now(UTC) - timedelta(
|
||||
days=hv_checked_days_ago
|
||||
)
|
||||
if hv_status is not None:
|
||||
acc.high_value_bairimeng_status = hv_status
|
||||
acc.high_value_mengtu_status = hv_status
|
||||
self.session.add(acc)
|
||||
self.session.commit()
|
||||
return acc
|
||||
@@ -156,6 +165,110 @@ class TestSelection(_Base):
|
||||
assert job.count_remaining(self.session, self.job, datetime.now(UTC)) >= 4
|
||||
|
||||
|
||||
class TestHighValueRefresh(_Base):
|
||||
"""高价值结论有**自己独立的时钟** —— 资料刷新必须跟着它走。
|
||||
|
||||
缺口长这样:一键查询里商品接口单独失败(其它项都拿到了),
|
||||
``overview_queried_at`` 被刷新了、``high_value_checked_at`` 却停在原地。
|
||||
资料看起来很新,于是**再也不会被选中** —— 高价值状态永久停在旧结论。
|
||||
"""
|
||||
|
||||
def test_stale_high_value_is_selected_even_if_overview_is_fresh(self):
|
||||
"""资料 1 天前查过(很新),但高价值结论 30 天前 —— 必须重选。"""
|
||||
self.account(
|
||||
"ovr-hv-stale",
|
||||
queried_days_ago=1,
|
||||
hv_checked_days_ago=30,
|
||||
hv_status="available",
|
||||
)
|
||||
assert "ovr-hv-stale" in [a.username for a in self.selected()]
|
||||
|
||||
def test_fresh_high_value_is_not_selected(self):
|
||||
"""资料和高价值结论都新鲜 —— 不该被重选(避免重复请求)。"""
|
||||
self.account(
|
||||
"ovr-hv-fresh",
|
||||
queried_days_ago=1,
|
||||
hv_checked_days_ago=1,
|
||||
hv_status="available",
|
||||
)
|
||||
assert "ovr-hv-fresh" not in [a.username for a in self.selected()]
|
||||
|
||||
def test_never_checked_high_value_is_not_selected_on_its_own(self):
|
||||
"""从来没查到过高价值结论,**不**因此被重选。
|
||||
|
||||
这种情况要么是「账号根本还没查过资料」(本来就该被选中),
|
||||
要么是**商品接口对这个账号稳定失败**(没配 manualID、账号没有宝典)。
|
||||
后者若每轮都重选,同一批账号会反复撞墙,把真正有新欠账的挤掉。
|
||||
「资料过期」那条已经兜住了它。
|
||||
"""
|
||||
self.account("ovr-hv-never", queried_days_ago=1)
|
||||
assert "ovr-hv-never" not in [a.username for a in self.selected()]
|
||||
|
||||
def test_high_value_uses_the_same_ruler_as_the_ui_field(self):
|
||||
"""高价值过期**用同一把尺子**(界面上那个「同一账号多久重检」)。
|
||||
|
||||
之前这里读的是 `job.config["refresh_days"]`,界面上那个字段对本作业
|
||||
就是死的;同理,若高价值另设一个窗口,那个字段对本作业就变成半死的。
|
||||
"""
|
||||
self.job.interval_seconds = 100 * 24 * 3600
|
||||
self.session.commit()
|
||||
# 资料 30 天前(按 100 天不该重选),高价值结论 60 天前(同样不该)
|
||||
self.account(
|
||||
"ovr-hv-60d",
|
||||
queried_days_ago=30,
|
||||
hv_checked_days_ago=60,
|
||||
hv_status="available",
|
||||
)
|
||||
assert "ovr-hv-60d" not in [a.username for a in self.selected()]
|
||||
|
||||
# 缩回 7 天 → 高价值 60 天前就过期了,要重选
|
||||
self.job.interval_seconds = 7 * 24 * 3600
|
||||
self.session.commit()
|
||||
assert "ovr-hv-60d" in [a.username for a in self.selected()]
|
||||
|
||||
def test_high_value_refresh_still_requires_valid_ck(self):
|
||||
"""高价值过期**不能**绕过 CK 有效性 —— CK 失效的查了也是白查。"""
|
||||
self.account(
|
||||
"ovr-hv-stale-invalid",
|
||||
ck="invalid",
|
||||
queried_days_ago=1,
|
||||
hv_checked_days_ago=30,
|
||||
hv_status="available",
|
||||
)
|
||||
assert "ovr-hv-stale-invalid" not in [a.username for a in self.selected()]
|
||||
|
||||
def test_invalidated_conclusion_is_rechecked_within_six_hours(self):
|
||||
"""结论被**作废**(unknown)的账号,6 小时内要重查 —— 哪怕重检间隔是 7 天。
|
||||
|
||||
场景:CK 失效期间账号可能被别人手工登录并兑换(这些号共享给客服),
|
||||
所以 CK 一判定失效就把结论作废。CK 恢复之后必须**尽快**重新确认 ——
|
||||
否则运营会一直拿着一份「待确认」的结论,而它其实已经变了。
|
||||
|
||||
⚠️ 这里用的是「资料重检间隔」(7 天)之外的**另一个**窗口:
|
||||
作废的结论等 7 天太久了,运营等不了。但也不能更密 ——
|
||||
商城接口对某些账号稳定失败,那类账号会一直是 unknown,每轮都重选
|
||||
就是反复撞墙,挤掉真正有新欠账的账号。
|
||||
"""
|
||||
# 资料 1 天前(很新,按 7 天不该重选),高价值结论是 10 小时前的 unknown
|
||||
self.account(
|
||||
"ovr-hv-invalidated",
|
||||
queried_days_ago=1,
|
||||
hv_checked_days_ago=10 / 24,
|
||||
hv_status="unknown",
|
||||
)
|
||||
assert "ovr-hv-invalidated" in [a.username for a in self.selected()]
|
||||
|
||||
def test_invalidated_conclusion_is_not_rechecked_too_often(self):
|
||||
"""作废的结论 6 小时内**不**重选 —— 不能反复撞同一个失败的接口。"""
|
||||
self.account(
|
||||
"ovr-hv-invalidated-fresh",
|
||||
queried_days_ago=1,
|
||||
hv_checked_days_ago=1 / 24, # 1 小时前
|
||||
hv_status="unknown",
|
||||
)
|
||||
assert "ovr-hv-invalidated-fresh" not in [a.username for a in self.selected()]
|
||||
|
||||
|
||||
class TestCircuitBreaker(_Base):
|
||||
"""失败率过高就**自己把自己关掉**(风控保护)。
|
||||
|
||||
|
||||
@@ -197,7 +197,9 @@ class TestCkHealthSelection(_Base):
|
||||
)
|
||||
valuable = self.make_account("valuable", ck_checked_at=now - timedelta(hours=7))
|
||||
valuable.overview_queried_at = now
|
||||
valuable.high_value_owned = []
|
||||
valuable.high_value_bairimeng_status = "available"
|
||||
valuable.high_value_mengtu_status = "available"
|
||||
valuable.high_value_checked_at = now
|
||||
valuable.points = 800
|
||||
self.session.commit()
|
||||
|
||||
|
||||
@@ -265,10 +265,14 @@ class TestSelection(_Base):
|
||||
plain = self.make_account("plain")
|
||||
one_suit = self.make_account("one-suit")
|
||||
one_suit.overview_queried_at = datetime.now(UTC)
|
||||
one_suit.high_value_owned = ["套装-兔兔白日梦"]
|
||||
one_suit.high_value_bairimeng_status = "owned"
|
||||
one_suit.high_value_mengtu_status = "available"
|
||||
one_suit.high_value_checked_at = datetime.now(UTC)
|
||||
both = self.make_account("both")
|
||||
both.overview_queried_at = datetime.now(UTC)
|
||||
both.high_value_owned = []
|
||||
both.high_value_bairimeng_status = "available"
|
||||
both.high_value_mengtu_status = "available"
|
||||
both.high_value_checked_at = datetime.now(UTC)
|
||||
self.session.commit()
|
||||
|
||||
ids = self._ids(job)
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
"""0065 高价值三态迁移的 upgrade/downgrade 往返验证(真实 MySQL)。"""
|
||||
|
||||
import secrets
|
||||
from urllib.parse import quote_plus
|
||||
|
||||
from alembic import command
|
||||
from alembic.config import Config
|
||||
from sqlalchemy import create_engine, inspect, text
|
||||
|
||||
import web.backend.database as database_module
|
||||
from tests.support.db import get_mysql_credentials
|
||||
|
||||
|
||||
def test_0065_upgrade_downgrade_roundtrip():
|
||||
creds = get_mysql_credentials()
|
||||
mig_db = f"douyu_login_mig_rt_{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 = create_engine(
|
||||
f"mysql+pymysql://{quote_plus(creds['user'])}:{quote_plus(creds['password'])}"
|
||||
f"@{creds['host']}:{creds['port']}/?charset=utf8mb4"
|
||||
)
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(text(f"CREATE DATABASE `{mig_db}` CHARACTER SET utf8mb4"))
|
||||
|
||||
original = database_module.DATABASE_URL
|
||||
try:
|
||||
database_module.DATABASE_URL = mig_url
|
||||
cfg = Config("alembic.ini")
|
||||
cfg.set_main_option("script_location", "web/backend/migrations")
|
||||
cfg.set_main_option("sqlalchemy.url", mig_url)
|
||||
command.upgrade(cfg, "head")
|
||||
|
||||
insp = inspect(create_engine(mig_url))
|
||||
cols = {c["name"] for c in insp.get_columns("accounts")}
|
||||
assert "high_value_bairimeng_status" in cols
|
||||
assert "high_value_mengtu_status" in cols
|
||||
assert "high_value_checked_at" in cols
|
||||
assert "high_value_owned" not in cols
|
||||
assert "ix_accounts_high_value_checked_at" in {
|
||||
i["name"] for i in insp.get_indexes("accounts")
|
||||
}
|
||||
|
||||
# 塞两行数据:owned/owned 与 owned/unknown,验证降级数组干净
|
||||
engine = create_engine(mig_url)
|
||||
with engine.begin() as conn:
|
||||
for i, (b, m) in enumerate([("owned", "owned"), ("owned", "unknown")]):
|
||||
conn.execute(
|
||||
text(
|
||||
"INSERT INTO accounts (username, password, email, email_password,"
|
||||
" cookie, high_value_bairimeng_status, high_value_mengtu_status)"
|
||||
" VALUES (:u, 'p', 'e@x.com', 'p', '', :b, :m)"
|
||||
),
|
||||
{"u": f"rt-{i}", "b": b, "m": m},
|
||||
)
|
||||
|
||||
command.downgrade(cfg, "20261021_0064")
|
||||
insp = inspect(create_engine(mig_url))
|
||||
cols = {c["name"] for c in insp.get_columns("accounts")}
|
||||
assert "high_value_owned" in cols
|
||||
assert "high_value_bairimeng_status" not in cols
|
||||
assert "ix_accounts_high_value_checked_at" not in {
|
||||
i["name"] for i in insp.get_indexes("accounts")
|
||||
}
|
||||
|
||||
with engine.begin() as conn:
|
||||
rows = conn.execute(
|
||||
text(
|
||||
"SELECT username, high_value_owned FROM accounts ORDER BY username"
|
||||
)
|
||||
).fetchall()
|
||||
# JSON 列读出来是字符串;重点是里面**不能有 null**(旧实现会写出 [null,...])
|
||||
assert rows[0][1] == '["套装-兔兔白日梦", "套装-狂战萌兔"]', rows[0]
|
||||
assert rows[1][1] == '["套装-兔兔白日梦"]', rows[1]
|
||||
assert "null" not in rows[0][1] and "null" not in rows[1][1]
|
||||
|
||||
command.upgrade(cfg, "head")
|
||||
insp = inspect(create_engine(mig_url))
|
||||
cols = {c["name"] for c in insp.get_columns("accounts")}
|
||||
assert "high_value_owned" not in cols
|
||||
assert "high_value_checked_at" in cols
|
||||
finally:
|
||||
database_module.DATABASE_URL = original
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`"))
|
||||
@@ -26,7 +26,7 @@ TESTS_DIR = Path(__file__).resolve().parent
|
||||
PROJECT_ROOT = TESTS_DIR.parent
|
||||
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
||||
|
||||
HEAD_REVISION = "20261021_0064"
|
||||
HEAD_REVISION = "20261106_0065"
|
||||
|
||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||
EXTRA_INDEXES = (
|
||||
|
||||
Reference in New Issue
Block a user