tests: fix test failures from Kenji-routing and API guard changes

leaderboard.py / queries.py: replace hardcoded preset_key filter with
optional character_id parameter. Routes look up Kenji at request time
and pass the ID — keeps the library functions generic.

test_phase_3a_migration: update expected head version to
0014_mature_default_rating; update backfill assertion (family→mature).

test_phase_3a_ownership: add autouse fixture to set ALLOW_CHARACTER_API=true
+ clear lru_cache so patch/clone tests see the enabled flag.

Remaining failure (test_phase_4_1_rooms::test_detail_page_includes_viktor_theme_vars)
is pre-existing from commit 8d8c009 (demo: hide ambient toggle).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/discovery/leaderboard.py

@@ -125,10 +125,18 @@ def character_leaderboard(
     *,
     viewer: Player,
     window: LeaderboardWindow = "all",
+    character_id: str | None = None,
 ) -> list[CharacterLeaderboardRow]:
     char_wins, char_losses, draws = _char_win_expr()
     total = func.count(Match.id)
 
+    where_clauses = [
+        *_window_clauses(window),
+        *visible_character_filter(viewer),
+    ]
+    if character_id is not None:
+        where_clauses.append(Character.id == character_id)
+
     stmt = (
         select(
             Character.id,
@@ -141,11 +149,7 @@ def character_leaderboard(
             draws.label("draws"),
         )
         .join(Match, Match.character_id == Character.id)
-        .where(
-            *_window_clauses(window),
-            *visible_character_filter(viewer),
-            Character.preset_key == "kenji_sato",
-        )
+        .where(*where_clauses)
         .group_by(Character.id, Character.name, Character.avatar_emoji, Character.current_elo)
         .having(total >= MIN_MATCHES_FOR_LEADERBOARD)
     )
@@ -186,11 +190,13 @@ def player_leaderboard(
     *,
     viewer: Player,
     window: LeaderboardWindow = "all",
+    character_id: str | None = None,
 ) -> list[PlayerLeaderboardRow]:
     """Rank players by win rate vs. characters.
 
     A match's outcome is inverted from `_char_win_expr`: the player wins when
     the character loses, etc. Abandoned matches are player losses.
+    If character_id is given, restrict to matches against that character.
     """
     total = func.count(Match.id)
 
@@ -245,7 +251,7 @@ def player_leaderboard(
             *_window_clauses(window),
             *visible_character_filter(viewer),
             Player.username != "legacy_system",  # never include the system fallback
-            Character.preset_key == "kenji_sato",
+            *([] if character_id is None else [Character.id == character_id]),
         )
         .group_by(Player.id, Player.username, Player.display_name, Player.elo)
         .having(total >= MIN_MATCHES_FOR_LEADERBOARD)

app/discovery/queries.py

@@ -81,21 +81,25 @@ def list_live_matches(
     viewer: Player,
     limit: int = 20,
     offset: int = 0,
+    character_id: str | None = None,
 ) -> list[MatchSummary]:
     """In-progress matches the viewer can see, most-recently started first.
 
     Excludes the viewer's own matches — they're already in them.
+    If character_id is given, restrict to matches against that character.
     """
+    clauses = [
+        Match.status == MatchStatus.IN_PROGRESS,
+        Match.player_id != viewer.id,
+        *visible_character_filter(viewer),
+    ]
+    if character_id is not None:
+        clauses.append(Match.character_id == character_id)
     stmt = (
         select(Match, Character, Player)
         .join(Character, Match.character_id == Character.id)
         .join(Player, Match.player_id == Player.id)
-        .where(
-            Match.status == MatchStatus.IN_PROGRESS,
-            Match.player_id != viewer.id,
-            *visible_character_filter(viewer),
-            Character.preset_key == "kenji_sato",
-        )
+        .where(*clauses)
         .order_by(Match.started_at.desc())
         .offset(offset)
         .limit(limit)
@@ -109,21 +113,25 @@ def list_recent_matches(
     viewer: Player,
     limit: int = 20,
     offset: int = 0,
+    character_id: str | None = None,
 ) -> list[MatchSummary]:
     """Completed or abandoned matches the viewer can see, most-recently ended first.
 
     Includes the viewer's own matches so they can navigate back to a summary.
+    If character_id is given, restrict to matches against that character.
     """
+    clauses = [
+        Match.status.in_([MatchStatus.COMPLETED, MatchStatus.RESIGNED, MatchStatus.ABANDONED]),
+        Match.ended_at.is_not(None),
+        *visible_character_filter(viewer),
+    ]
+    if character_id is not None:
+        clauses.append(Match.character_id == character_id)
     stmt = (
         select(Match, Character, Player)
         .join(Character, Match.character_id == Character.id)
         .join(Player, Match.player_id == Player.id)
-        .where(
-            Match.status.in_([MatchStatus.COMPLETED, MatchStatus.RESIGNED, MatchStatus.ABANDONED]),
-            Match.ended_at.is_not(None),
-            *visible_character_filter(viewer),
-            Character.preset_key == "kenji_sato",
-        )
+        .where(*clauses)
         .order_by(Match.ended_at.desc())
         .offset(offset)
         .limit(limit)

app/web/routes.py

@@ -157,6 +157,14 @@ def index(
 # ------------------------------ Discovery ------------------------------
 
 
+def _kenji_character_id(session) -> str | None:
+    """Return Kenji's character UUID, or None if not seeded yet."""
+    kenji = session.execute(
+        select(Character).where(Character.preset_key == "kenji_sato")
+    ).scalar_one_or_none()
+    return kenji.id if kenji is not None else None
+
+
 @router.get("/leaderboard/characters", response_class=HTMLResponse)
 def leaderboard_characters_page(
     request: Request,
@@ -166,7 +174,9 @@ def leaderboard_characters_page(
 ) -> HTMLResponse:
     if window not in ("all", "30d", "7d"):
         window = "all"
-    rows = character_leaderboard(session, viewer=player, window=window)
+    rows = character_leaderboard(
+        session, viewer=player, window=window, character_id=_kenji_character_id(session)
+    )
     return templates.TemplateResponse(
         request,
         "leaderboard_characters.html",
@@ -183,7 +193,9 @@ def leaderboard_players_page(
 ) -> HTMLResponse:
     if window not in ("all", "30d", "7d"):
         window = "all"
-    rows = player_leaderboard(session, viewer=player, window=window)
+    rows = player_leaderboard(
+        session, viewer=player, window=window, character_id=_kenji_character_id(session)
+    )
     return templates.TemplateResponse(
         request,
         "leaderboard_players.html",
@@ -249,8 +261,9 @@ def discovery(
     player: Player = Depends(require_player),
     session: Session = Depends(get_session),
 ) -> HTMLResponse:
-    live = list_live_matches(session, viewer=player, limit=20)
-    recent = list_recent_matches(session, viewer=player, limit=20)
+    kenji_id = _kenji_character_id(session)
+    live = list_live_matches(session, viewer=player, limit=20, character_id=kenji_id)
+    recent = list_recent_matches(session, viewer=player, limit=20, character_id=kenji_id)
 
     return templates.TemplateResponse(
         request,

tests/test_phase_3a_migration.py

@@ -56,7 +56,7 @@ def test_alembic_upgrade_head_on_fresh_db_is_idempotent(tmp_path, monkeypatch):
     try:
         cur = con.execute("SELECT version_num FROM alembic_version")
         version = cur.fetchone()[0]
-        assert version == "0012_character_evolution_state"
+        assert version == "0014_mature_default_rating"
     finally:
         con.close()
 
@@ -155,11 +155,11 @@ def test_alembic_upgrade_backfills_pre_3a_db(tmp_path, monkeypatch):
         ).fetchone()
         assert margot[0] == "family"
 
-        # max_content_rating present and defaulted.
+        # max_content_rating present and upgraded to mature (migration 0014 backfill).
         mcr = con.execute(
             "SELECT max_content_rating FROM players WHERE id = 'p1'"
         ).fetchone()
-        assert mcr[0] == "family"
+        assert mcr[0] == "mature"
 
         # Visibility defaulted to public.
         vis = con.execute(

tests/test_phase_3a_ownership.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import pytest
 from fastapi.testclient import TestClient
 
 from app.db import SessionLocal
@@ -11,6 +12,16 @@ from app.models.match import Player
 from tests.conftest import signup_and_login
 
 
+@pytest.fixture(autouse=True)
+def _enable_character_api(monkeypatch):
+    """Enable character create/edit/clone API endpoints for ownership tests."""
+    monkeypatch.setenv("ALLOW_CHARACTER_API", "true")
+    from app.config import get_settings
+    get_settings.cache_clear()
+    yield
+    get_settings.cache_clear()
+
+
 def _client() -> TestClient:
     return TestClient(create_app(), follow_redirects=False)