Compare commits
1 Commits
0.4.2
...
feat-recordpage
| Author | SHA1 | Date | |
|---|---|---|---|
| 96444d67fa |
@@ -0,0 +1,52 @@
|
|||||||
|
"""add composite index (user_id, created_at, id) on comparison_record
|
||||||
|
|
||||||
|
C 端「我的比价记录」列表(GET /api/v1/compare/records)是
|
||||||
|
`WHERE user_id=? ORDER BY created_at DESC, id DESC LIMIT n` —— 原来只有单列 user_id 索引,
|
||||||
|
过滤完还要把该用户的**全部**记录取出来排序才能拿前 n 条,重度用户随记录数线性变慢。
|
||||||
|
|
||||||
|
本复合索引的反向扫恰好等于 (created_at DESC, id DESC),规划器直接取前 n 条、免排序。
|
||||||
|
列序 (user_id, created_at, id) 与查询一一对应,不要调整。
|
||||||
|
|
||||||
|
Revision ID: comparison_user_created_idx
|
||||||
|
Revises: merge_active_phone
|
||||||
|
Create Date: 2026-07-21
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
|
||||||
|
revision = "comparison_user_created_idx"
|
||||||
|
down_revision = "merge_active_phone"
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
INDEX_NAME = "ix_comparison_user_created"
|
||||||
|
COLUMNS = ["user_id", "created_at", "id"]
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
bind = op.get_bind()
|
||||||
|
if bind.dialect.name == "postgresql":
|
||||||
|
# 线上 comparison_record 已有数据量,普通 CREATE INDEX 持表写锁会阻塞比价 harvest 写入;
|
||||||
|
# 用 CONCURRENTLY 不锁表(须脱离事务,autocommit_block 切到自动提交)。
|
||||||
|
# 同 comparison_status_created_idx 的做法。
|
||||||
|
with op.get_context().autocommit_block():
|
||||||
|
op.create_index(
|
||||||
|
INDEX_NAME, "comparison_record", COLUMNS,
|
||||||
|
unique=False, postgresql_concurrently=True,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
op.create_index(INDEX_NAME, "comparison_record", COLUMNS, unique=False)
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
bind = op.get_bind()
|
||||||
|
if bind.dialect.name == "postgresql":
|
||||||
|
with op.get_context().autocommit_block():
|
||||||
|
op.drop_index(
|
||||||
|
INDEX_NAME, table_name="comparison_record",
|
||||||
|
postgresql_concurrently=True,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
op.drop_index(INDEX_NAME, table_name="comparison_record")
|
||||||
@@ -115,13 +115,22 @@ def list_records(
|
|||||||
db: DbSession,
|
db: DbSession,
|
||||||
limit: int = Query(20, ge=1, le=100),
|
limit: int = Query(20, ge=1, le=100),
|
||||||
cursor: int | None = Query(None, description="上一页末条 id"),
|
cursor: int | None = Query(None, description="上一页末条 id"),
|
||||||
|
ordered: bool | None = Query(
|
||||||
|
None,
|
||||||
|
description="true=只看「已下单」(店名命中本人真实下单)的记录;不传=全部",
|
||||||
|
),
|
||||||
|
keyword: str | None = Query(
|
||||||
|
None,
|
||||||
|
max_length=64,
|
||||||
|
description="按店名 / 菜名模糊搜索,忽略大小写;空白串等同不传",
|
||||||
|
),
|
||||||
include_trace: bool = Query(
|
include_trace: bool = Query(
|
||||||
False,
|
False,
|
||||||
description="客户端开了本机 agent 调试模式时带 true,放行本人记录的 trace_url",
|
description="客户端开了本机 agent 调试模式时带 true,放行本人记录的 trace_url",
|
||||||
),
|
),
|
||||||
) -> ComparisonRecordPage:
|
) -> ComparisonRecordPage:
|
||||||
items, next_cursor = crud_compare.list_records(
|
items, next_cursor = crud_compare.list_records(
|
||||||
db, user.id, limit=limit, cursor=cursor
|
db, user.id, limit=limit, cursor=cursor, ordered=ordered, keyword=keyword
|
||||||
)
|
)
|
||||||
outs = [ComparisonRecordOut.model_validate(it) for it in items]
|
outs = [ComparisonRecordOut.model_validate(it) for it in items]
|
||||||
# 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url(列表页「复制调试链接」靠它)。
|
# 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url(列表页「复制调试链接」靠它)。
|
||||||
|
|||||||
@@ -45,6 +45,10 @@ class ComparisonRecord(Base):
|
|||||||
# 首页轮播 / 省钱战绩聚合都按 status='success' 过滤 + created_at 近期排序;
|
# 首页轮播 / 省钱战绩聚合都按 status='success' 过滤 + created_at 近期排序;
|
||||||
# 复合索引避免随数据量增大退化成全表扫(单列 created_at 索引不含 status)。
|
# 复合索引避免随数据量增大退化成全表扫(单列 created_at 索引不含 status)。
|
||||||
Index("ix_comparison_status_created", "status", "created_at"),
|
Index("ix_comparison_status_created", "status", "created_at"),
|
||||||
|
# C 端「我的比价记录」列表:WHERE user_id=? ORDER BY created_at DESC, id DESC LIMIT n。
|
||||||
|
# 单列 user_id 索引只能过滤,排序仍要把该用户全部记录取出来排一遍;这条复合索引的**反向扫**
|
||||||
|
# 恰好等于 (created_at DESC, id DESC),PG 直接取前 n 条、免排序。列序不能动。
|
||||||
|
Index("ix_comparison_user_created", "user_id", "created_at", "id"),
|
||||||
)
|
)
|
||||||
|
|
||||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ from __future__ import annotations
|
|||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from sqlalchemy import func, select
|
from sqlalchemy import func, or_, select
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session, defer
|
||||||
|
|
||||||
from app.core.rewards import CN_TZ
|
from app.core.rewards import CN_TZ
|
||||||
from app.models.ad_feed_reward import AdFeedRewardRecord
|
from app.models.ad_feed_reward import AdFeedRewardRecord
|
||||||
@@ -375,19 +375,48 @@ def harvest_abort(
|
|||||||
return rec
|
return rec
|
||||||
|
|
||||||
|
|
||||||
def _ordered_shop_names(db: Session, user_id: int) -> set[str]:
|
def _ordered_shop_name_select(user_id: int):
|
||||||
"""该用户「真实下单」(source='compare')覆盖到的店名集合,用来给比价记录打「已下单」。
|
"""该用户「真实下单」(source='compare')覆盖到的店名 select,给「已下单」筛选当子查询。
|
||||||
|
|
||||||
|
口径与 [_ordered_shop_names] 完全一致,只是时机不同:那边是**拿到本页之后**按 candidates
|
||||||
|
反查打标;这边是**分页之前**就要过滤,拿不到 candidates,只能整段下推成子查询。
|
||||||
|
没有先捞成集合再展开 IN (...) 字面量 —— 重度用户下单过的店名可能上千,展开会撞 SQLite
|
||||||
|
的绑定变量上限,而且又变回了那个「随下单量线性变慢」的老写法。
|
||||||
|
"""
|
||||||
|
return select(SavingsRecord.shop_name).where(
|
||||||
|
SavingsRecord.user_id == user_id,
|
||||||
|
SavingsRecord.source == "compare",
|
||||||
|
SavingsRecord.shop_name.is_not(None),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _like_escape(kw: str) -> str:
|
||||||
|
"""转义 LIKE 通配符(百分号 / 下划线 / 反斜杠),让用户输入只按字面量匹配(配合 escape 参数)。
|
||||||
|
|
||||||
|
不转义的话搜一个「%」就等于把整表拉回来。
|
||||||
|
"""
|
||||||
|
return kw.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
|
||||||
|
|
||||||
|
|
||||||
|
def _ordered_shop_names(db: Session, user_id: int, candidates: set[str]) -> set[str]:
|
||||||
|
"""[candidates] 里哪些店名被该用户「真实下单」(source='compare')覆盖过,用来打「已下单」。
|
||||||
|
|
||||||
只认 compare(归因命中后真实上报),demo 演示数据不算。下单上报不带 trace_id,
|
只认 compare(归因命中后真实上报),demo 演示数据不算。下单上报不带 trace_id,
|
||||||
只能按店名对齐——两边店名同源(都来自比价意图识别阶段的门店名 query),精确相等即视为同店。
|
只能按店名对齐——两边店名同源(都来自比价意图识别阶段的门店名 query),精确相等即视为同店。
|
||||||
语义=店级:同一家店比价过多次,这些记录会一并标「已下单」。
|
语义=店级:同一家店比价过多次,这些记录会一并标「已下单」。
|
||||||
|
|
||||||
|
⚠️ 只查**本页出现过的店名**(candidates ≤ limit 条),不再把该用户全部下单店名捞回内存:
|
||||||
|
老写法随下单量线性增长,重度用户几千行全读一遍只为跟 50 条记录取交集。空集合直接返回
|
||||||
|
(避免 IN () 非法)。
|
||||||
"""
|
"""
|
||||||
|
if not candidates:
|
||||||
|
return set()
|
||||||
rows = db.execute(
|
rows = db.execute(
|
||||||
select(SavingsRecord.shop_name).where(
|
select(SavingsRecord.shop_name).where(
|
||||||
SavingsRecord.user_id == user_id,
|
SavingsRecord.user_id == user_id,
|
||||||
SavingsRecord.source == "compare",
|
SavingsRecord.source == "compare",
|
||||||
SavingsRecord.shop_name.is_not(None),
|
SavingsRecord.shop_name.in_(candidates),
|
||||||
)
|
).distinct()
|
||||||
).scalars().all()
|
).scalars().all()
|
||||||
return {s for s in rows if s}
|
return {s for s in rows if s}
|
||||||
|
|
||||||
@@ -415,17 +444,60 @@ def _ad_coins_by_trace(db: Session, user_id: int, trace_ids: list[str]) -> dict[
|
|||||||
return {tid: int(coin) for tid, coin in rows if tid}
|
return {tid: int(coin) for tid, coin in rows if tid}
|
||||||
|
|
||||||
|
|
||||||
|
# 列表出参(ComparisonRecordOut)根本不读、但 select(ORM) 默认会一并捞回来的重型 JSON 列:
|
||||||
|
# - raw_payload:done.params 上报体全量,**每条记录都有**(harvest 与 POST 两条写路径都落)。
|
||||||
|
# 单条几 KB~几十 KB,一页 50 条就是稳定几百 KB~几 MB 的白读 + 白反序列化。
|
||||||
|
# - llm_calls:每次 LLM 调用的 input_messages + output 全文。只有走老客户端 POST /compare/record
|
||||||
|
# 的记录才有(_backfill_llm_calls 回填;harvest 路径不落),但有的时候单条就能到 MB 级 —— 一页里
|
||||||
|
# 混进几条这种记录,整个请求就被它们拖住。
|
||||||
|
# - llm_price_snapshot:逐模型单价快照,同样只在回填时落。
|
||||||
|
# 三列全部读出来再被 pydantic 丢掉,是「比价记录/全部记录」页慢的主要来源。
|
||||||
|
# ⚠️ defer 的列一旦在别处被读到会触发**逐行**懒加载(N+1);列表这条链路(ComparisonRecordOut
|
||||||
|
# 不声明这三个字段 → 不会 getattr 到)是安全的。详情接口 get_record 不 defer,raw_payload 照常返回。
|
||||||
|
_LIST_DEFERRED = (
|
||||||
|
ComparisonRecord.raw_payload,
|
||||||
|
ComparisonRecord.llm_calls,
|
||||||
|
ComparisonRecord.llm_price_snapshot,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def list_records(
|
def list_records(
|
||||||
db: Session,
|
db: Session,
|
||||||
user_id: int,
|
user_id: int,
|
||||||
*,
|
*,
|
||||||
limit: int = 20,
|
limit: int = 20,
|
||||||
cursor: int | None = None,
|
cursor: int | None = None,
|
||||||
|
ordered: bool | None = None,
|
||||||
|
keyword: str | None = None,
|
||||||
) -> tuple[list[ComparisonRecord], int | None]:
|
) -> tuple[list[ComparisonRecord], int | None]:
|
||||||
"""比价记录分页(按创建时间倒序、id 兜底,游标式)。附「已下单」店级标记 + 「看广告赚的金币」(瞬态,不写库)。"""
|
"""比价记录分页(按创建时间倒序、id 兜底,游标式)。附「已下单」店级标记 + 「看广告赚的金币」(瞬态,不写库)。"""
|
||||||
stmt = select(ComparisonRecord).where(ComparisonRecord.user_id == user_id)
|
stmt = (
|
||||||
|
select(ComparisonRecord)
|
||||||
|
.where(ComparisonRecord.user_id == user_id)
|
||||||
|
.options(*(defer(col) for col in _LIST_DEFERRED))
|
||||||
|
)
|
||||||
if cursor is not None:
|
if cursor is not None:
|
||||||
stmt = stmt.where(ComparisonRecord.id < cursor)
|
stmt = stmt.where(ComparisonRecord.id < cursor)
|
||||||
|
# 「已下单」tab 与搜索框的过滤都下推到这里,不能留给客户端对整页结果 filter ——
|
||||||
|
# 分页之后一页里可能一条都不命中,列表看着就是空的/卡住的,得翻很多页才蹦出一条。
|
||||||
|
if ordered:
|
||||||
|
stmt = stmt.where(
|
||||||
|
ComparisonRecord.store_name.in_(_ordered_shop_name_select(user_id))
|
||||||
|
)
|
||||||
|
kw = (keyword or "").strip()
|
||||||
|
if kw:
|
||||||
|
# product_names 是写路径从 items[].name 派生的普通文本列(items 本身是 JSON,SQLite 下
|
||||||
|
# 中文被 ensure_ascii 转义,没法直接 LIKE)—— 搜「菜名」靠的就是它。
|
||||||
|
# ilike:PG 原生 ILIKE,SQLite 渲染成 lower() LIKE lower(),两边都忽略大小写。
|
||||||
|
pattern = f"%{_like_escape(kw)}%"
|
||||||
|
stmt = stmt.where(
|
||||||
|
or_(
|
||||||
|
ComparisonRecord.store_name.ilike(pattern, escape="\\"),
|
||||||
|
ComparisonRecord.product_names.ilike(pattern, escape="\\"),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
# 排序与 ix_comparison_user_created(user_id, created_at, id)对齐 —— DESC/DESC 正好是该索引的
|
||||||
|
# 反向扫,PG 免排序直接取前 limit 条。改排序方向前先想清楚索引还吃不吃得上。
|
||||||
stmt = stmt.order_by(ComparisonRecord.created_at.desc(), ComparisonRecord.id.desc()).limit(limit)
|
stmt = stmt.order_by(ComparisonRecord.created_at.desc(), ComparisonRecord.id.desc()).limit(limit)
|
||||||
|
|
||||||
items = list(db.execute(stmt).scalars().all())
|
items = list(db.execute(stmt).scalars().all())
|
||||||
@@ -433,7 +505,10 @@ def list_records(
|
|||||||
|
|
||||||
# 「已下单」标记:本页记录的 store_name 若落在该用户真实下单的店名集合里即 True。
|
# 「已下单」标记:本页记录的 store_name 若落在该用户真实下单的店名集合里即 True。
|
||||||
# ordered / ad_coins_earned 均非 ORM 列,仅挂实例上供 ComparisonRecordOut(from_attributes) 读出,不持久化。
|
# ordered / ad_coins_earned 均非 ORM 列,仅挂实例上供 ComparisonRecordOut(from_attributes) 读出,不持久化。
|
||||||
ordered_shops = _ordered_shop_names(db, user_id)
|
page_shops = {it.store_name for it in items if it.store_name}
|
||||||
|
# ordered=True 时上面已按同一口径(_ordered_shop_name_select)筛过,本页必然全是已下单,
|
||||||
|
# 省掉这次反查;其余情况照旧按本页店名反查 savings。
|
||||||
|
ordered_shops = page_shops if ordered else _ordered_shop_names(db, user_id, page_shops)
|
||||||
# 「本次比价看广告赚的金币」:按本页 trace_id 一次性聚合(同 ordered 范式)。
|
# 「本次比价看广告赚的金币」:按本页 trace_id 一次性聚合(同 ordered 范式)。
|
||||||
ad_coins = _ad_coins_by_trace(db, user_id, [it.trace_id for it in items])
|
ad_coins = _ad_coins_by_trace(db, user_id, [it.trace_id for it in items])
|
||||||
for it in items:
|
for it in items:
|
||||||
|
|||||||
@@ -25,6 +25,18 @@ server {
|
|||||||
# (纯文字反馈体积小、不受影响 → 呈现为「时好时坏」)。根治仍需客户端上传前压缩。
|
# (纯文字反馈体积小、不受影响 → 呈现为「时好时坏」)。根治仍需客户端上传前压缩。
|
||||||
client_max_body_size 32m;
|
client_max_body_size 32m;
|
||||||
|
|
||||||
|
# JSON 响应压缩。nginx 默认 gzip off,且就算 on 了 gzip_types 也只含 text/html、
|
||||||
|
# gzip_proxied 默认 off(反代来的响应一律不压)—— 三个默认值凑一起 = 我们所有接口都在裸奔。
|
||||||
|
# 比价记录列表这种一次 50 条、字段名 + 中文店名/菜名高度重复的 JSON,gzip 压缩比稳定在 8~10 倍
|
||||||
|
# (几百 KB → 几十 KB),弱网下省的就是首屏那几秒。
|
||||||
|
# 只压 JSON:APK 直链(/media/shaguabijia.apk)、图片本身已是压缩格式,再压纯浪费 CPU。
|
||||||
|
gzip on;
|
||||||
|
gzip_proxied any; # 反代响应也压(默认 off = 对我们这套反代等于没开)
|
||||||
|
gzip_types application/json;
|
||||||
|
gzip_min_length 1024; # 小响应压了反而更大(gzip 头开销),不值当
|
||||||
|
gzip_comp_level 5; # 5 是体积/CPU 的常用折中点,再往上收益递减
|
||||||
|
gzip_vary on; # 给 CDN/中间缓存正确按 Accept-Encoding 分桶
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:8770;
|
proxy_pass http://127.0.0.1:8770;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
|
|||||||
@@ -10,6 +10,12 @@
|
|||||||
|---|---|---|---|---|
|
|---|---|---|---|---|
|
||||||
| `limit` | int | ❌ | 20 | 1–100 |
|
| `limit` | int | ❌ | 20 | 1–100 |
|
||||||
| `cursor` | int | ❌ | null | 上一页末条 `id`,首页不传 |
|
| `cursor` | int | ❌ | null | 上一页末条 `id`,首页不传 |
|
||||||
|
| `ordered` | bool | ❌ | null | `true`=只出「已下单」(店名命中本人真实下单)的记录;不传=不筛 |
|
||||||
|
| `keyword` | string | ❌ | null | 按店名 / 菜名模糊搜索,忽略大小写,≤64 字符;纯空白等同不传 |
|
||||||
|
| `include_trace` | bool | ❌ | false | 客户端开了本机 agent 调试模式时带 `true`,放行**本人**记录的 `trace_url` |
|
||||||
|
|
||||||
|
`ordered` / `keyword` 都在服务端过滤后再分页,客户端不要拿一页结果自己 filter ——
|
||||||
|
分页之后一页里可能一条都不命中,列表会看着像空的。
|
||||||
|
|
||||||
## 出参
|
## 出参
|
||||||
响应 `200`:`{ items: ComparisonRecordOut[], next_cursor: int|null }`(分页见 [索引#游标分页约定](./README.md#游标分页约定))
|
响应 `200`:`{ items: ComparisonRecordOut[], next_cursor: int|null }`(分页见 [索引#游标分页约定](./README.md#游标分页约定))
|
||||||
@@ -38,6 +44,9 @@
|
|||||||
| `items` | object[] | 下单菜品 `{name, qty, specs?}` |
|
| `items` | object[] | 下单菜品 `{name, qty, specs?}` |
|
||||||
| `comparison_results` | object[] | 逐平台对比(price 单位元,已按 rank 升序) |
|
| `comparison_results` | object[] | 逐平台对比(price 单位元,已按 rank 升序) |
|
||||||
| `skipped_dish_names` | string[] | 被跳过的菜名 |
|
| `skipped_dish_names` | string[] | 被跳过的菜名 |
|
||||||
|
| `ordered` | bool | 「已下单」店级标记:店名命中本人 `source='compare'` 的下单记录即 `true`。**瞬态字段,不在表里**,每次查询现算 |
|
||||||
|
| `ad_coins_earned` | int | 本次比价看信息流广告实发的金币(按 `trace_id` 聚合)。同为瞬态字段 |
|
||||||
|
| `trace_url` | string \| null | pricebot 调试链接。未开 `debug_trace_enabled` 且未带 `include_trace=true` 时为 `null` |
|
||||||
| `created_at` | datetime | 时间 |
|
| `created_at` | datetime | 时间 |
|
||||||
|
|
||||||
## 错误
|
## 错误
|
||||||
|
|||||||
@@ -222,6 +222,210 @@ def test_stats_compare_count_and_saved(client) -> None:
|
|||||||
assert s2["compare_count"] == 2 # 仍 2(failed 不计)
|
assert s2["compare_count"] == 2 # 仍 2(failed 不计)
|
||||||
|
|
||||||
|
|
||||||
|
def test_records_ordered_flag(client) -> None:
|
||||||
|
"""「已下单」店级标记:店名命中该用户 source='compare' 的下单记录才 True。
|
||||||
|
|
||||||
|
覆盖 list_records 只按**本页店名**反查 savings 的写法(原来是把该用户全部下单店名捞回内存
|
||||||
|
再取交集,随下单量线性变慢)——两种写法结果必须一致,故这里按店名逐条断言。
|
||||||
|
"""
|
||||||
|
token = _login(client, "13800002010")
|
||||||
|
|
||||||
|
# 两条比价记录:一条海底捞(稍后会有对应下单),一条没下过单的店
|
||||||
|
client.post("/api/v1/compare/record", json=_food_payload("ord-1"), headers=_auth(token))
|
||||||
|
other = _food_payload("ord-2")
|
||||||
|
other["store_name"] = "没下过单的店"
|
||||||
|
client.post("/api/v1/compare/record", json=other, headers=_auth(token))
|
||||||
|
|
||||||
|
# 下单前:两条都不该带「已下单」
|
||||||
|
items = client.get("/api/v1/compare/records", headers=_auth(token)).json()["items"]
|
||||||
|
assert {it["store_name"]: it["ordered"] for it in items} == {
|
||||||
|
"海底捞(朝阳店)": False,
|
||||||
|
"没下过单的店": False,
|
||||||
|
}
|
||||||
|
|
||||||
|
# 对海底捞真实下单一笔(order/report 写 source='compare' 的 savings_record)
|
||||||
|
r = client.post(
|
||||||
|
"/api/v1/order/report",
|
||||||
|
json={
|
||||||
|
"client_event_id": "evt-ordered-flag",
|
||||||
|
"platform": "美团",
|
||||||
|
"platform_package": "com.sankuai.meituan",
|
||||||
|
"pay_channel": "wechat",
|
||||||
|
"compared_price_cents": 12350,
|
||||||
|
"paid_amount_cents": 12350,
|
||||||
|
"shop_name": "海底捞(朝阳店)",
|
||||||
|
"original_price_cents": 12850,
|
||||||
|
},
|
||||||
|
headers=_auth(token),
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
|
||||||
|
# 下单后:只有同店名那条翻成 True,另一条不受影响
|
||||||
|
items = client.get("/api/v1/compare/records", headers=_auth(token)).json()["items"]
|
||||||
|
assert {it["store_name"]: it["ordered"] for it in items} == {
|
||||||
|
"海底捞(朝阳店)": True,
|
||||||
|
"没下过单的店": False,
|
||||||
|
}
|
||||||
|
|
||||||
|
# 别人的下单不该影响本人标记(_ordered_shop_names 按 user_id 过滤)
|
||||||
|
token_b = _login(client, "13800002011")
|
||||||
|
client.post("/api/v1/compare/record", json=_food_payload("ord-b"), headers=_auth(token_b))
|
||||||
|
items_b = client.get("/api/v1/compare/records", headers=_auth(token_b)).json()["items"]
|
||||||
|
assert [it["ordered"] for it in items_b] == [False]
|
||||||
|
|
||||||
|
|
||||||
|
def test_records_list_omits_raw_payload(client) -> None:
|
||||||
|
"""列表出参不含 raw_payload(仓库层 defer 掉了重型 JSON 列);详情接口照常返回。
|
||||||
|
|
||||||
|
defer 的列一旦被 ORM 实例读到会触发逐行懒加载(N+1),而列表 schema 本就不该带 raw_payload
|
||||||
|
—— 这条同时守住「列表不泄露上报体全量」和「没人不小心把它加回出参」。
|
||||||
|
"""
|
||||||
|
token = _login(client, "13800002012")
|
||||||
|
rid = client.post(
|
||||||
|
"/api/v1/compare/record", json=_food_payload("no-raw"), headers=_auth(token)
|
||||||
|
).json()["id"]
|
||||||
|
|
||||||
|
items = client.get("/api/v1/compare/records", headers=_auth(token)).json()["items"]
|
||||||
|
assert len(items) == 1
|
||||||
|
assert "raw_payload" not in items[0]
|
||||||
|
# 概要字段照常齐全(defer 没误伤列表要用的列)
|
||||||
|
assert items[0]["store_name"] == "海底捞(朝阳店)"
|
||||||
|
assert items[0]["best_platform_id"] == "meituan"
|
||||||
|
assert items[0]["comparison_results"] and items[0]["items"]
|
||||||
|
|
||||||
|
# 详情不 defer:raw_payload 全量还在
|
||||||
|
d = client.get(f"/api/v1/compare/records/{rid}", headers=_auth(token)).json()
|
||||||
|
assert d["raw_payload"]["trace_id"] == "no-raw"
|
||||||
|
|
||||||
|
|
||||||
|
def test_records_ordered_filter(client) -> None:
|
||||||
|
"""ordered=true 只出「已下单」的记录,且过滤结果自身能翻页。
|
||||||
|
|
||||||
|
这个筛选必须在服务端做:客户端早先是对「已经拉回来的那一页」做 filter,分页之后一页里
|
||||||
|
很可能一条已下单都没有 ——「已下单」tab 就会看着像空的,得手动翻很多页才蹦出一条。
|
||||||
|
"""
|
||||||
|
token = _login(client, "13800002013")
|
||||||
|
|
||||||
|
# 3 条「下过单的店」+ 2 条没下过单的店,交错写入,确保过滤不是靠顺序碰巧对上
|
||||||
|
for i in range(3):
|
||||||
|
p = _food_payload(f"of-ordered-{i}")
|
||||||
|
p["store_name"] = "下过单的店"
|
||||||
|
client.post("/api/v1/compare/record", json=p, headers=_auth(token))
|
||||||
|
if i < 2:
|
||||||
|
q = _food_payload(f"of-plain-{i}")
|
||||||
|
q["store_name"] = "没下过单的店"
|
||||||
|
client.post("/api/v1/compare/record", json=q, headers=_auth(token))
|
||||||
|
|
||||||
|
client.post(
|
||||||
|
"/api/v1/order/report",
|
||||||
|
json={
|
||||||
|
"client_event_id": "evt-ordered-filter",
|
||||||
|
"platform": "美团",
|
||||||
|
"platform_package": "com.sankuai.meituan",
|
||||||
|
"pay_channel": "wechat",
|
||||||
|
"compared_price_cents": 12350,
|
||||||
|
"paid_amount_cents": 12350,
|
||||||
|
"shop_name": "下过单的店",
|
||||||
|
"original_price_cents": 12850,
|
||||||
|
},
|
||||||
|
headers=_auth(token),
|
||||||
|
)
|
||||||
|
|
||||||
|
# 不传 ordered:5 条全出(「全部记录」tab 口径不变)
|
||||||
|
assert len(client.get("/api/v1/compare/records", headers=_auth(token)).json()["items"]) == 5
|
||||||
|
|
||||||
|
# ordered=true:只出那 3 条,且每条都自带 ordered=True
|
||||||
|
page = client.get("/api/v1/compare/records?ordered=true", headers=_auth(token)).json()
|
||||||
|
assert [it["store_name"] for it in page["items"]] == ["下过单的店"] * 3
|
||||||
|
assert all(it["ordered"] for it in page["items"])
|
||||||
|
assert page["next_cursor"] is None
|
||||||
|
|
||||||
|
# 游标只在「已下单」集合内走 —— 不会把没下单的记录算进一页的 limit 里
|
||||||
|
p1 = client.get(
|
||||||
|
"/api/v1/compare/records?ordered=true&limit=2", headers=_auth(token)
|
||||||
|
).json()
|
||||||
|
assert len(p1["items"]) == 2
|
||||||
|
assert p1["next_cursor"] is not None
|
||||||
|
p2 = client.get(
|
||||||
|
f"/api/v1/compare/records?ordered=true&limit=2&cursor={p1['next_cursor']}",
|
||||||
|
headers=_auth(token),
|
||||||
|
).json()
|
||||||
|
assert [it["store_name"] for it in p2["items"]] == ["下过单的店"]
|
||||||
|
# 两页不重叠,合起来正好 3 条
|
||||||
|
assert len({it["id"] for it in p1["items"] + p2["items"]}) == 3
|
||||||
|
|
||||||
|
# 别人的下单不该让本人记录进「已下单」
|
||||||
|
token_b = _login(client, "13800002014")
|
||||||
|
pb = _food_payload("of-b")
|
||||||
|
pb["store_name"] = "下过单的店"
|
||||||
|
client.post("/api/v1/compare/record", json=pb, headers=_auth(token_b))
|
||||||
|
assert client.get(
|
||||||
|
"/api/v1/compare/records?ordered=true", headers=_auth(token_b)
|
||||||
|
).json()["items"] == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_records_keyword_search(client) -> None:
|
||||||
|
"""keyword 按店名 / 菜名模糊搜(忽略大小写),LIKE 通配符只当字面量;搜索结果也能翻页。
|
||||||
|
|
||||||
|
菜名走写路径派生的 product_names 文本列 —— items 是 JSON,SQLite 下中文被 ensure_ascii
|
||||||
|
转义,直接 LIKE 搜不到。
|
||||||
|
"""
|
||||||
|
token = _login(client, "13800002015")
|
||||||
|
|
||||||
|
b = _food_payload("kw-b")
|
||||||
|
b["store_name"] = "Pizza Hut"
|
||||||
|
b["items"] = [{"name": "榴莲比萨", "qty": 1}]
|
||||||
|
client.post("/api/v1/compare/record", json=b, headers=_auth(token))
|
||||||
|
|
||||||
|
c = _food_payload("kw-c")
|
||||||
|
c["store_name"] = "100%纯牛肉汉堡"
|
||||||
|
c["items"] = [{"name": "双层牛肉堡", "qty": 1}]
|
||||||
|
client.post("/api/v1/compare/record", json=c, headers=_auth(token))
|
||||||
|
|
||||||
|
# 默认 payload 的店名是「海底捞(朝阳店)」
|
||||||
|
client.post("/api/v1/compare/record", json=_food_payload("kw-a"), headers=_auth(token))
|
||||||
|
|
||||||
|
def _search(kw: str, **extra) -> list[str]:
|
||||||
|
r = client.get(
|
||||||
|
"/api/v1/compare/records",
|
||||||
|
params={"keyword": kw, **extra},
|
||||||
|
headers=_auth(token),
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
return [it["store_name"] for it in r.json()["items"]]
|
||||||
|
|
||||||
|
assert _search("海底捞") == ["海底捞(朝阳店)"] # 店名命中
|
||||||
|
assert _search("榴莲") == ["Pizza Hut"] # 菜名命中(product_names)
|
||||||
|
assert _search("pizza") == ["Pizza Hut"] # 忽略大小写
|
||||||
|
assert _search("PIZZA") == ["Pizza Hut"]
|
||||||
|
assert _search("不存在的店") == [] # 没命中就是空
|
||||||
|
# 通配符只当普通字符:搜 % 不该把整表拉回来,搜 _ 也不该匹配任意单字符
|
||||||
|
assert _search("%") == ["100%纯牛肉汉堡"]
|
||||||
|
assert _search("_") == []
|
||||||
|
# 纯空白等同不传 → 不过滤
|
||||||
|
assert len(_search(" ")) == 3
|
||||||
|
|
||||||
|
# 搜索结果自身可翻页
|
||||||
|
for i in range(3):
|
||||||
|
p = _food_payload(f"kw-page-{i}")
|
||||||
|
p["store_name"] = "连锁烤鱼店"
|
||||||
|
client.post("/api/v1/compare/record", json=p, headers=_auth(token))
|
||||||
|
p1 = client.get(
|
||||||
|
"/api/v1/compare/records",
|
||||||
|
params={"keyword": "烤鱼", "limit": 2},
|
||||||
|
headers=_auth(token),
|
||||||
|
).json()
|
||||||
|
assert len(p1["items"]) == 2
|
||||||
|
assert p1["next_cursor"] is not None
|
||||||
|
p2 = client.get(
|
||||||
|
"/api/v1/compare/records",
|
||||||
|
params={"keyword": "烤鱼", "limit": 2, "cursor": p1["next_cursor"]},
|
||||||
|
headers=_auth(token),
|
||||||
|
).json()
|
||||||
|
assert [it["store_name"] for it in p2["items"]] == ["连锁烤鱼店"]
|
||||||
|
assert len({it["id"] for it in p1["items"] + p2["items"]}) == 3
|
||||||
|
|
||||||
|
|
||||||
def test_requires_auth(client) -> None:
|
def test_requires_auth(client) -> None:
|
||||||
"""不带 token 统一 401。"""
|
"""不带 token 统一 401。"""
|
||||||
assert client.post("/api/v1/compare/record", json={"trace_id": "t"}).status_code == 401
|
assert client.post("/api/v1/compare/record", json={"trace_id": "t"}).status_code == 401
|
||||||
|
|||||||
Reference in New Issue
Block a user