guke
b4fe20aaca
前端确定"首页可见"埋点为 event=show + page=home(组合,非单一 event 名),故活跃口径 不能只改一个常量: - activity.active_event_condition():首页可见(event=show & page=home)∪ 比价 ∪ 领券, worker 子查询(last_active_subqueries)与 admin _attach_last_active 共用(单一真源); ACTIVE_EVENTS 收窄为仅两个纯 event 名,HOME_VIEW_EVENT="show" + 新增 HOME_VIEW_PAGE="home" - 测试:新增 show/home 算活跃、show/其他页不算的用例;_add_event 支持 page;口径常量断言更新 - seed 脚本 / spec / plan 同步 home_view → show+page=home Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
102 lines
4.3 KiB
Python
102 lines
4.3 KiB
Python
"""活跃口径唯一真源:worker(不活跃清零)与 admin(最近活跃/DAU)共用,防两处漂移。
|
||
|
||
口径 = max(User.created_at, AnalyticsEvent[首页可见 show/home + 比价 + 领券], CouponPromptEngagement[claim_started])。
|
||
**不含 last_login_at**(登录/re-login 不代表在用 App);created_at 为恒非空基线。
|
||
清零/预警按北京自然日 0 点对齐(见 reset_cutoff)。
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
from datetime import date, datetime, timedelta, timezone
|
||
|
||
from sqlalchemy import and_, func, or_, select
|
||
from sqlalchemy.orm import Session
|
||
|
||
from app.core.rewards import CN_TZ, cn_today
|
||
from app.models.analytics_event import AnalyticsEvent
|
||
from app.models.coupon_state import CouponPromptEngagement
|
||
|
||
# —— 活跃口径事件(与"用户管理"口径一致)——
|
||
# 首页可见:前端埋点 event=show + page=home(组合判定,单个 event 名不足以区分,见
|
||
# active_event_condition);其余为纯 event 名。
|
||
HOME_VIEW_EVENT = "show"
|
||
HOME_VIEW_PAGE = "home"
|
||
COMPARE_START_EVENT = "real_compare_start" # 发起比价(含浮窗触发)
|
||
COUPON_START_EVENT = "real_coupon_start" # 发起领券
|
||
# 纯 event 名即可判定的活跃事件(首页可见是 event+page 组合、不在此列)
|
||
ACTIVE_EVENTS = (COMPARE_START_EVENT, COUPON_START_EVENT)
|
||
ACTIVE_ENGAGE_TYPE = "claim_started" # coupon_prompt_engagement 一键领取
|
||
|
||
|
||
def active_event_condition():
|
||
"""analytics_event 中算"活跃"的行为过滤:首页可见(event=show & page=home)
|
||
∪ 发起比价 ∪ 发起领券。worker 子查询与 admin 展示共用,单一真源。"""
|
||
return or_(
|
||
and_(AnalyticsEvent.event == HOME_VIEW_EVENT, AnalyticsEvent.page == HOME_VIEW_PAGE),
|
||
AnalyticsEvent.event.in_(ACTIVE_EVENTS),
|
||
)
|
||
|
||
|
||
def as_utc(value: datetime) -> datetime:
|
||
"""任意 datetime → tz-aware UTC(无时区按 UTC 解释)。用于与 DateTime(timezone=True) 列比较,
|
||
比较绝对时刻、与会话时区无关(口径同 admin queries._as_utc)。"""
|
||
if value.tzinfo is None:
|
||
return value.replace(tzinfo=timezone.utc)
|
||
return value.astimezone(timezone.utc)
|
||
|
||
|
||
def norm_utc(dt: datetime | None) -> datetime | None:
|
||
"""naive 视为 UTC 补 tzinfo(SQLite 读回 naive、PG 读回 aware,混着 max() 会 TypeError)。"""
|
||
if dt is None:
|
||
return None
|
||
return dt if dt.tzinfo is not None else dt.replace(tzinfo=timezone.utc)
|
||
|
||
|
||
def cn_midnight_utc(d: date) -> datetime:
|
||
"""北京 d 日 00:00 → tz-aware UTC datetime。"""
|
||
return as_utc(datetime(d.year, d.month, d.day, tzinfo=CN_TZ))
|
||
|
||
|
||
def reset_cutoff(reset_days: int, today: date | None = None) -> datetime:
|
||
"""应清零边界(tz-aware UTC):last_active < 此值 ⟺ 距末次活跃已满 reset_days 天(北京 0 点对齐)。
|
||
= 北京 00:00 of (today − (reset_days − 1))。例:reset_days=15、today=1/20 → 北京 1/6 00:00。"""
|
||
today = today or cn_today()
|
||
return cn_midnight_utc(today - timedelta(days=reset_days - 1))
|
||
|
||
|
||
def last_active_subqueries(db: Session):
|
||
"""两个按 user_id 预聚合的派生表:最近活跃事件(见 active_event_condition)、
|
||
最近领券发起(claim_started)。返回 (ev_sub, eng_sub)。口径同 admin,LEFT JOIN 用。"""
|
||
ev_sub = (
|
||
select(
|
||
AnalyticsEvent.user_id.label("user_id"),
|
||
func.max(AnalyticsEvent.created_at).label("last_at"),
|
||
)
|
||
.where(AnalyticsEvent.user_id.is_not(None), active_event_condition())
|
||
.group_by(AnalyticsEvent.user_id)
|
||
.subquery()
|
||
)
|
||
eng_sub = (
|
||
select(
|
||
CouponPromptEngagement.user_id.label("user_id"),
|
||
func.max(CouponPromptEngagement.created_at).label("last_at"),
|
||
)
|
||
.where(
|
||
CouponPromptEngagement.user_id.is_not(None),
|
||
CouponPromptEngagement.engage_type == ACTIVE_ENGAGE_TYPE,
|
||
)
|
||
.group_by(CouponPromptEngagement.user_id)
|
||
.subquery()
|
||
)
|
||
return ev_sub, eng_sub
|
||
|
||
|
||
def last_active_expr(base_col, ev_sub, eng_sub, dialect: str):
|
||
"""max(base_col, 最近活跃事件, 最近领券) 的 SQL 表达式。PG 用 greatest、SQLite 用 max。
|
||
子聚合缺失(未命中)时 coalesce 到 base_col(= User.created_at,恒非空基线)。"""
|
||
greatest = func.greatest if dialect == "postgresql" else func.max
|
||
return greatest(
|
||
base_col,
|
||
func.coalesce(ev_sub.c.last_at, base_col),
|
||
func.coalesce(eng_sub.c.last_at, base_col),
|
||
)
|