fix(matches): close the second, unguarded match-economy authority

`POST /matches/result` granted coins, XP, level-ups, statistics, four objective
metrics, loan expiry, season progression and achievements across a dozen
SEPARATE writes with no transaction and no idempotency key. Every call
re-credited the same match, and any mid-way failure half-applied it. It sat
beside `/matches/complete`, so nothing stopped one match being paid twice
through two different doors.

It cannot be made exactly-once in place: that needs a caller-supplied match
identity, and this request shape has none. Deriving one from the body would
collapse two legitimate matches with the same scoreline into one — the
under-credit trap already documented for the `fp:` fallback. So the route fails
closed: it rejects with a message naming `/matches/complete`, rather than 404,
so a caller learns why.

The behaviour it uniquely drove is kept, not deleted. `process_match` was the
ONLY caller of loan expiry and Core's season model, so both move into
`complete_match`'s transaction behind opt-in `expire_loans` / `advance_season`
flags. Both default OFF, which keeps the FIFA 17 retail path byte-identical:
FIFA 17 has its own loan and Seasons models, and Core's season END GRANTS coins
and a pack — invisible economy on a path that never asked for it. Their pooled
implementations are replaced by `expire_loans_tx` and
`season::record_match_tx`, so a loan that expires or a season that ends commits
with the match that caused it.

Notifications (level-up / objective / loan / season) were pooled side effects of
the removed path. They now emit from the route AFTER the commit — never inside
the transaction, since a failed notification must not roll back a completed
match — and only when `applied`, so a replay no longer re-notifies. The pooled
path had no replay concept and notified every time.

Also fixes a real bug this surfaced: `/auth/reset` never deleted
`match_completions`, which carries un-cascaded foreign keys to BOTH `matches`
and `profiles`. Any profile that completed a match through the authoritative
route — i.e. every FIFA 17 profile after a retail match — failed to reset with a
database error. It is now deleted first, and ordering is documented.

Tests: the 20 integration call sites move to the authoritative route through one
helper that mints a per-call identity (each call IS a distinct match). New
coverage for the closed path: it rejects without moving the balance or writing
history; Core progression stays off unless opted into; a replay does not
duplicate notifications; and a profile that completed matches can still be
reset.

src/models/match_result.rs

@@ -50,16 +50,6 @@ impl MatchResultKind {
     }
 }
 
-#[derive(Debug, Deserialize)]
-pub struct SubmitMatchRequest {
-    pub squad_id: String,
-    pub opponent_name: String,
-    pub goals_for: i64,
-    pub goals_against: i64,
-    pub mode: String,
-    pub goal_positions: Option<Vec<String>>,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, sqlx::FromRow)]
 pub struct Match {
     pub id: String,
@@ -111,22 +101,6 @@ impl Match {
     }
 }
 
-#[derive(Debug, Serialize)]
-pub struct MatchRewardResult {
-    pub match_record: Match,
-    pub coins_awarded: i64,
-    pub xp_awarded: i64,
-    pub objectives_updated: Vec<String>,
-    /// Owned card IDs removed because the loan expired this match.
-    pub expired_loans: Vec<String>,
-    /// Present when this match completed the current season.
-    pub season_end: Option<crate::models::season::SeasonEndSummary>,
-    /// Non-empty when the player levelled up one or more times from this match's XP.
-    pub level_ups: Vec<LevelUpEvent>,
-    /// Achievements unlocked as a result of this match.
-    pub achievements_unlocked: Vec<AchievementDefinition>,
-}
-
 /// Request to atomically complete a match exactly once. `match_identity` is the
 /// opaque, host-supplied per-match token that keys durable economic idempotency
 /// (persona/profile + match_identity). `result` is the canonical outcome the
@@ -143,6 +117,22 @@ pub struct CompleteMatchRequest {
     pub mode: String,
     #[serde(default)]
     pub goal_positions: Option<Vec<String>>,
+    /// Tick down `loan_matches_remaining` for this squad's starters and remove
+    /// the cards whose loan ran out.
+    ///
+    /// OFF by default so a game whose loan model is its own (FIFA 17 does not
+    /// route loans through Core) is unaffected. Callers of Core's own match
+    /// modes opt in.
+    #[serde(default)]
+    pub expire_loans: bool,
+    /// Advance Core's OWN season model (division progress, and its end-of-season
+    /// coin/pack award).
+    ///
+    /// OFF by default: this grants economy, and it is NOT the same thing as a
+    /// game's native seasons (FIFA 17 offline Seasons are the adapter's, keyed by
+    /// its own wire). Only a caller using Core's season model opts in.
+    #[serde(default)]
+    pub advance_season: bool,
 }
 
 /// Outcome of [`crate::services::match_service::complete_match`].
@@ -165,5 +155,11 @@ pub struct MatchCompletionResult {
     pub level_ups: Vec<LevelUpEvent>,
     /// Achievements unlocked by this match (empty on a replay).
     pub achievements_unlocked: Vec<AchievementDefinition>,
+    /// Owned card ids removed because their loan expired on this match. Empty
+    /// unless the caller set `expire_loans`, and empty on a replay.
+    pub expired_loans: Vec<String>,
+    /// Present when this match ended a Core season. `None` unless the caller set
+    /// `advance_season`, and `None` on a replay.
+    pub season_end: Option<crate::models::season::SeasonEndSummary>,
     pub match_record: Match,
 }

src/routes/auth.rs

@@ -102,7 +102,12 @@ pub async fn post_auth_reset(
         }
     }
 
+    // Order matters: `match_completions` carries un-cascaded foreign keys to BOTH
+    // `matches` and `profiles`, so it has to go before either of them or the
+    // reset fails with a constraint error. Any profile that completed a match
+    // through /matches/complete has rows here.
     for table in [
+        "match_completions",
         "fut_champs_sessions",
         "sbc_submissions",
         "objective_progress",

src/routes/matches.rs

@@ -8,11 +8,9 @@ use serde_json::{json, Value};
 
 use crate::{
     app::AppState,
-    error::AppResult,
-    models::match_result::{
-        CompleteMatchRequest, Match, MatchCompletionResult, MatchRewardResult, SubmitMatchRequest,
-    },
-    services::{club as club_svc, match_service, profile as profile_svc},
+    error::{AppError, AppResult},
+    models::match_result::{CompleteMatchRequest, Match, MatchCompletionResult},
+    services::{club as club_svc, match_service, notification, profile as profile_svc},
 };
 
 #[derive(Deserialize)]
@@ -65,25 +63,28 @@ pub async fn get_opponent(
     Ok(Json(opponent))
 }
 
-pub async fn post_match_result(
-    State(state): State<AppState>,
-    game: GameId,
-    Json(req): Json<SubmitMatchRequest>,
-) -> AppResult<Json<MatchRewardResult>> {
-    let profile = profile_svc::get_active_profile(&state.pool, game.as_str()).await?;
-    let club = club_svc::get_club_by_profile(&state.pool, &profile.id).await?;
-
-    let result = match_service::process_match(
-        &state.pool,
-        &profile.id,
-        &club.id,
-        &req,
-        &state.obj_defs,
-        &state.achievement_defs,
-    )
-    .await?;
-
-    Ok(Json(result))
+/// `POST /matches/result` — REMOVED as an economy path, and deliberately kept as
+/// an explicit rejection rather than a 404.
+///
+/// It used to grant coins, XP, level-ups, statistics, objectives, loan expiry,
+/// season progression and achievements across a dozen separate writes with NO
+/// transaction and NO idempotency key, which made it a second economy authority
+/// that could re-credit the same match on every call and could half-apply on any
+/// mid-way failure. Exactly-once needs a caller-supplied match identity, which
+/// this request shape does not carry and cannot derive (a body fingerprint would
+/// collapse two legitimate matches with the same scoreline into one).
+///
+/// Callers submit to `/matches/complete` with a `match_identity`; the loan and
+/// season behaviour this route used to trigger is available there via
+/// `expire_loans` / `advance_season`.
+pub async fn post_match_result() -> AppResult<Json<Value>> {
+    Err(AppError::BadRequest(
+        "POST /matches/result is no longer an economy path: it had no transaction \
+         and no idempotency key. Submit to POST /matches/complete with a \
+         match_identity (and expire_loans / advance_season if you need Core's loan \
+         and season progression)."
+            .into(),
+    ))
 }
 
 /// `POST /matches/complete` — the authoritative, atomic, exactly-once match
@@ -108,5 +109,79 @@ pub async fn post_match_complete(
     )
     .await?;
 
+    // Player-visible notifications are non-durable side effects, so they are
+    // emitted AFTER the economy transaction commits, never inside it — a failed
+    // notification must not roll back a completed match. Gated on `applied`, so
+    // an idempotent replay does not re-notify (the pooled path this replaced had
+    // no such guard). Achievement notifications are written in-transaction by
+    // `check_and_unlock_tx` and are deliberately not repeated here.
+    if result.applied {
+        emit_match_notifications(&state, &result).await;
+    }
+
     Ok(Json(result))
 }
+
+async fn emit_match_notifications(state: &AppState, result: &MatchCompletionResult) {
+    for ev in &result.level_ups {
+        let body = match &ev.pack_granted {
+            Some(pack) => format!(
+                "You reached level {}! Reward: {} coins + {pack}.",
+                ev.new_level, ev.coins_granted
+            ),
+            None => format!(
+                "You reached level {}! Reward: {} coins.",
+                ev.new_level, ev.coins_granted
+            ),
+        };
+        let _ = notification::create(
+            &state.pool,
+            "level_up",
+            &format!("Level {}!", ev.new_level),
+            &body,
+        )
+        .await;
+    }
+
+    for obj_id in &result.objectives_updated {
+        let display_name = state
+            .obj_defs
+            .iter()
+            .find(|d| &d.id == obj_id)
+            .map(|d| d.title.as_str())
+            .unwrap_or(obj_id.as_str());
+        let body = format!("\"{display_name}\" is now complete. Claim your reward in Objectives.");
+        let _ = notification::create(
+            &state.pool,
+            "objective_complete",
+            "Objective complete!",
+            &body,
+        )
+        .await;
+    }
+
+    for owned_id in &result.expired_loans {
+        let body =
+            format!("Loan card (id: {owned_id}) has expired and been removed from your club.");
+        let _ = notification::create(&state.pool, "loan_expired", "Loan card expired", &body).await;
+    }
+
+    if let Some(se) = &result.season_end {
+        use crate::models::season::SeasonResult;
+        let direction = match se.result {
+            SeasonResult::Promoted => "Promoted",
+            SeasonResult::Relegated => "Relegated",
+            SeasonResult::Maintained => "Maintained",
+        };
+        let body = format!(
+            "{direction} — now in Division {}. Rewards: {} coins{}.",
+            se.new_division,
+            se.coins_awarded,
+            se.pack_awarded
+                .as_deref()
+                .map(|p| format!(" + {p}"))
+                .unwrap_or_default()
+        );
+        let _ = notification::create(&state.pool, "season_end", "Season complete!", &body).await;
+    }
+}

src/services/match_service.rs

@@ -4,17 +4,11 @@ use crate::{
     models::{
         achievement::AchievementDefinition,
         card::OwnedCard,
-        match_result::{
-            CompleteMatchRequest, Match, MatchCompletionResult, MatchResultKind, MatchRewardResult,
-            SubmitMatchRequest,
-        },
+        match_result::{CompleteMatchRequest, Match, MatchCompletionResult, MatchResultKind},
         objective::ObjectiveDefinition,
         profile::{coins_for_level, level_for_xp, pack_for_level, LevelUpEvent},
     },
-    services::{
-        achievement, card_db::CardDb, club, notification, objective, profile, season as season_svc,
-        statistics,
-    },
+    services::{achievement, card_db::CardDb, objective, season as season_svc, statistics},
 };
 use rand::{seq::SliceRandom, Rng};
 use sqlx::{Sqlite, Transaction};
@@ -127,182 +121,15 @@ const XP_WIN: i64 = 200;
 const XP_DRAW: i64 = 75;
 const XP_LOSS: i64 = 30;
 
-pub async fn process_match(
-    pool: &Pool,
-    profile_id: &str,
+/// Decrement `loan_matches_remaining` for each loan card in the squad's starting
+/// XI, removing the cards whose loan ran out and returning their
+/// `owned_card_id`s. Runs inside the caller's transaction so a loan that expires
+/// commits (or rolls back) with the match that consumed it.
+async fn expire_loans_tx(
+    tx: &mut Transaction<'_, Sqlite>,
     club_id: &str,
-    req: &SubmitMatchRequest,
-    obj_defs: &[ObjectiveDefinition],
-    ach_defs: &[AchievementDefinition],
-) -> AppResult<MatchRewardResult> {
-    if req.goals_for < 0 || req.goals_against < 0 || req.goals_for > 99 || req.goals_against > 99 {
-        return Err(crate::error::AppError::BadRequest(
-            "goals_for and goals_against must each be between 0 and 99".into(),
-        ));
-    }
-
-    let outcome = if req.goals_for > req.goals_against {
-        "win"
-    } else if req.goals_for == req.goals_against {
-        "draw"
-    } else {
-        "loss"
-    };
-
-    let (coins, xp) = match outcome {
-        "win" => (COINS_WIN, XP_WIN),
-        "draw" => (COINS_DRAW, XP_DRAW),
-        _ => (COINS_LOSS, XP_LOSS),
-    };
-
-    let match_record = Match::new(
-        profile_id,
-        &req.squad_id,
-        &req.opponent_name,
-        req.goals_for,
-        req.goals_against,
-        &req.mode,
-        coins,
-        xp,
-    );
-
-    sqlx::query(
-        "INSERT INTO matches (id, profile_id, squad_id, opponent_name, goals_for, goals_against, outcome, coins_awarded, xp_awarded, mode, played_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
-    )
-    .bind(&match_record.id)
-    .bind(&match_record.profile_id)
-    .bind(&match_record.squad_id)
-    .bind(&match_record.opponent_name)
-    .bind(match_record.goals_for)
-    .bind(match_record.goals_against)
-    .bind(&match_record.outcome)
-    .bind(match_record.coins_awarded)
-    .bind(match_record.xp_awarded)
-    .bind(&match_record.mode)
-    .bind(&match_record.played_at)
-    .execute(pool)
-    .await?;
-
-    club::add_coins(pool, club_id, coins).await?;
-    let level_ups = profile::add_xp_with_levelup(pool, profile_id, club_id, xp).await?;
-
-    for ev in &level_ups {
-        let body = if let Some(ref pack) = ev.pack_granted {
-            format!(
-                "You reached level {}! Reward: {} coins + {pack}.",
-                ev.new_level, ev.coins_granted
-            )
-        } else {
-            format!(
-                "You reached level {}! Reward: {} coins.",
-                ev.new_level, ev.coins_granted
-            )
-        };
-        let _ = notification::create(pool, "level_up", &format!("Level {}!", ev.new_level), &body)
-            .await;
-    }
-
-    statistics::record_match(
-        pool,
-        profile_id,
-        outcome,
-        req.goals_for,
-        req.goals_against,
-        coins,
-    )
-    .await?;
-
-    if let Some(positions) = &req.goal_positions {
-        statistics::record_position_goals(pool, profile_id, positions).await?;
-    }
-
-    let mut objectives_updated = Vec::new();
-
-    let mut completed =
-        objective::increment_metric(pool, profile_id, obj_defs, "matchesplayed", 1).await?;
-    objectives_updated.append(&mut completed);
-
-    if outcome == "win" {
-        let mut c =
-            objective::increment_metric(pool, profile_id, obj_defs, "matcheswon", 1).await?;
-        objectives_updated.append(&mut c);
-    }
-
-    let mut c =
-        objective::increment_metric(pool, profile_id, obj_defs, "goalsscored", req.goals_for)
-            .await?;
-    objectives_updated.append(&mut c);
-
-    let mut c =
-        objective::increment_metric(pool, profile_id, obj_defs, "coinsearned", coins).await?;
-    objectives_updated.append(&mut c);
-
-    for obj_id in &objectives_updated {
-        let display_name = obj_defs
-            .iter()
-            .find(|d| &d.id == obj_id)
-            .map(|d| d.title.as_str())
-            .unwrap_or(obj_id.as_str());
-        let body = format!(
-            "\"{}\" is now complete. Claim your reward in Objectives.",
-            display_name
-        );
-        let _ =
-            notification::create(pool, "objective_complete", "Objective complete!", &body).await;
-    }
-
-    // Decrement loan matches remaining for squad starters; collect expired loan IDs.
-    let expired_loans = process_loan_expiry(pool, club_id, &req.squad_id).await?;
-
-    for owned_id in &expired_loans {
-        let body =
-            format!("Loan card (id: {owned_id}) has expired and been removed from your club.");
-        let _ = notification::create(pool, "loan_expired", "Loan card expired", &body).await;
-    }
-
-    // Update season progress (creates the season row if it doesn't exist yet).
-    season_svc::get_or_create(pool, profile_id).await?;
-    let (_, season_end) = season_svc::record_match(pool, club_id, profile_id, outcome).await?;
-
-    if let Some(ref se) = season_end {
-        use crate::models::season::SeasonResult;
-        let direction = match se.result {
-            SeasonResult::Promoted => "Promoted",
-            SeasonResult::Relegated => "Relegated",
-            SeasonResult::Maintained => "Maintained",
-        };
-        let body = format!(
-            "{direction} — now in Division {}. Rewards: {} coins{}.",
-            se.new_division,
-            se.coins_awarded,
-            se.pack_awarded
-                .as_deref()
-                .map(|p| format!(" + {p}"))
-                .unwrap_or_default()
-        );
-        let _ = notification::create(pool, "season_end", "Season complete!", &body).await;
-    }
-
-    let achievements_unlocked = achievement::check_and_unlock(pool, ach_defs, profile_id, club_id)
-        .await
-        .unwrap_or_default();
-
-    Ok(MatchRewardResult {
-        match_record,
-        coins_awarded: coins,
-        xp_awarded: xp,
-        objectives_updated,
-        expired_loans,
-        season_end,
-        level_ups,
-        achievements_unlocked,
-    })
-}
-
-/// Decrement `loan_matches_remaining` for each loan card in the squad's starting XI.
-/// Removes cards whose remaining count hits 0 and returns their owned_card_ids.
-async fn process_loan_expiry(pool: &Pool, club_id: &str, squad_id: &str) -> AppResult<Vec<String>> {
-    // Get starters (is_on_bench = 0) for this squad
+    squad_id: &str,
+) -> AppResult<Vec<String>> {
     let starters: Vec<(String, String)> = sqlx::query_as(
         "SELECT sp.id, sp.owned_card_id FROM squad_players sp \
          JOIN squads s ON s.id = sp.squad_id \
@@ -310,39 +137,36 @@ async fn process_loan_expiry(pool: &Pool, club_id: &str, squad_id: &str) -> AppR
     )
     .bind(squad_id)
     .bind(club_id)
-    .fetch_all(pool)
+    .fetch_all(&mut **tx)
     .await?;
 
     let mut expired = Vec::new();
-
     for (_sp_id, owned_id) in starters {
         let card = sqlx::query_as::<_, OwnedCard>(
             "SELECT id, club_id, card_id, is_loan, loan_matches_remaining, acquired_at \
              FROM owned_cards WHERE id = ? AND is_loan = 1",
         )
         .bind(&owned_id)
-        .fetch_optional(pool)
+        .fetch_optional(&mut **tx)
         .await?;
 
         if let Some(c) = card {
             let remaining = c.loan_matches_remaining.unwrap_or(0);
             if remaining <= 1 {
-                // Loan expired — remove from collection
                 sqlx::query("DELETE FROM owned_cards WHERE id = ?")
                     .bind(&owned_id)
-                    .execute(pool)
+                    .execute(&mut **tx)
                     .await?;
                 expired.push(owned_id);
             } else {
                 sqlx::query("UPDATE owned_cards SET loan_matches_remaining = ? WHERE id = ?")
                     .bind(remaining - 1)
                     .bind(&owned_id)
-                    .execute(pool)
+                    .execute(&mut **tx)
                     .await?;
             }
         }
     }
-
     Ok(expired)
 }
 
@@ -526,6 +350,8 @@ async fn complete_match_inner(
     let mut objectives_updated = Vec::new();
     let mut level_ups = Vec::new();
     let mut achievements_unlocked = Vec::new();
+    let mut expired_loans = Vec::new();
+    let mut season_end = None;
 
     // A no-contest is recorded (history + idempotency) but has ZERO economic
     // effect: no coins, XP, statistics, objectives, or achievements.
@@ -617,6 +443,18 @@ async fn complete_match_inner(
         // 7. Achievements.
         achievements_unlocked =
             achievement::check_and_unlock_tx(&mut tx, ach_defs, profile_id, club_id, &now).await?;
+
+        // 8. Opt-in progression. Both default OFF: a game whose loans and
+        //    seasons are its own (FIFA 17) must not have Core's model advance —
+        //    and Core's season end GRANTS coins and a pack, which would be
+        //    invisible economy on a path that never asked for it.
+        if req.expire_loans {
+            expired_loans = expire_loans_tx(&mut tx, club_id, &req.squad_id).await?;
+        }
+        if req.advance_season {
+            season_end =
+                season_svc::record_match_tx(&mut tx, club_id, profile_id, outcome, &now).await?;
+        }
     }
     inject_fault(fault, FaultPoint::BeforeCommit)?;
 
@@ -637,6 +475,8 @@ async fn complete_match_inner(
         objectives_updated,
         level_ups,
         achievements_unlocked,
+        expired_loans,
+        season_end,
         match_record,
     })
 }
@@ -685,6 +525,8 @@ async fn already_completed(
         coins_balance,
         objectives_updated: vec![],
         level_ups: vec![],
+        expired_loans: vec![],
+        season_end: None,
         achievements_unlocked: vec![],
         match_record,
     })
@@ -821,6 +663,8 @@ mod match_completion_tests {
             goals_against: ga,
             mode: "seasons".into(),
             goal_positions: None,
+            expire_loans: false,
+            advance_season: false,
         }
     }
 

src/services/season.rs

@@ -2,8 +2,8 @@ use crate::{
     db::Pool,
     error::{AppError, AppResult},
     models::season::{Season, SeasonEndSummary, SeasonHistoryEntry, SeasonResult},
-    services::{club, pack},
 };
+use sqlx::{Sqlite, Transaction};
 use uuid::Uuid;
 
 /// Get the current season for a profile, creating it if it doesn't exist.
@@ -38,21 +38,34 @@ async fn fetch(pool: &Pool, profile_id: &str) -> AppResult<Option<Season>> {
     Ok(s)
 }
 
-/// Record a match result in the season; end the season if the quota is met.
+/// Record a match in Core's season model inside the caller's transaction,
+/// ending the season when the quota is met.
 ///
-/// Returns the updated season and an optional end-of-season summary.
-pub async fn record_match(
-    pool: &Pool,
+/// Mirrors [`record_match`] but every write — the season row, the rollover, the
+/// end-of-season coin and pack award, and the history entry — commits or rolls
+/// back with the match that caused it. Creates the season row if absent, so a
+/// first match does not need a separate call.
+pub async fn record_match_tx(
+    tx: &mut Transaction<'_, Sqlite>,
     club_id: &str,
     profile_id: &str,
     outcome: &str,
-) -> AppResult<(Season, Option<SeasonEndSummary>)> {
+    now: &str,
+) -> AppResult<Option<SeasonEndSummary>> {
+    sqlx::query(
+        "INSERT OR IGNORE INTO seasons (profile_id, division, season_number, season_points, \
+         matches_played, wins, draws, losses, started_at) VALUES (?, 5, 1, 0, 0, 0, 0, 0, ?)",
+    )
+    .bind(profile_id)
+    .bind(now)
+    .execute(&mut **tx)
+    .await?;
+
     let points = match outcome {
         "win" => 3,
         "draw" => 1,
         _ => 0,
     };
-
     sqlx::query(
         "UPDATE seasons SET \
             season_points  = season_points + ?, \
@@ -67,32 +80,28 @@ pub async fn record_match(
     .bind(outcome)
     .bind(outcome)
     .bind(profile_id)
-    .execute(pool)
+    .execute(&mut **tx)
     .await?;
 
-    let season = fetch(pool, profile_id).await?.ok_or_else(|| {
+    let season = fetch_tx(tx, profile_id).await?.ok_or_else(|| {
         AppError::Internal(anyhow::anyhow!(
-            "season row missing after record_match update"
+            "season row missing after record_match_tx update"
         ))
     })?;
-
     if !season.is_complete() {
-        return Ok((season, None));
+        return Ok(None);
     }
 
-    // Season complete — calculate result and start next
     let result = season.end_result();
     let old_div = season.division;
     let coins = season.season_reward_coins();
     let pack_id = season.season_reward_pack();
-
     let new_div = match result {
         SeasonResult::Promoted => (old_div - 1).max(1),
         SeasonResult::Relegated => (old_div + 1).min(10),
         SeasonResult::Maintained => old_div,
     };
     let new_season = season.season_number + 1;
-    let now = chrono::Utc::now().to_rfc3339();
 
     sqlx::query(
         "UPDATE seasons SET division = ?, season_number = ?, season_points = 0, \
@@ -101,30 +110,46 @@ pub async fn record_match(
     )
     .bind(new_div)
     .bind(new_season)
-    .bind(&now)
+    .bind(now)
     .bind(profile_id)
-    .execute(pool)
+    .execute(&mut **tx)
     .await?;
 
-    // Grant rewards
-    club::add_coins(pool, club_id, coins).await?;
+    if coins > 0 {
+        let credited =
+            sqlx::query("UPDATE clubs SET coins = coins + ?, updated_at = ? WHERE id = ?")
+                .bind(coins)
+                .bind(now)
+                .bind(club_id)
+                .execute(&mut **tx)
+                .await?;
+        if credited.rows_affected() != 1 {
+            return Err(AppError::NotFound("club not found".into()));
+        }
+    }
     if let Some(pack_def) = pack_id {
-        pack::grant_pack(pool, club_id, pack_def).await?;
+        sqlx::query(
+            "INSERT INTO packs (id, club_id, definition_id, opened, created_at) VALUES (?, ?, ?, 0, ?)",
+        )
+        .bind(Uuid::new_v4().to_string())
+        .bind(club_id)
+        .bind(pack_def)
+        .bind(now)
+        .execute(&mut **tx)
+        .await?;
     }
 
-    // Persist history entry before rolling over
     let result_str = match result {
         SeasonResult::Promoted => "promoted",
         SeasonResult::Maintained => "maintained",
         SeasonResult::Relegated => "relegated",
     };
-    let history_id = Uuid::new_v4().to_string();
-    let _ = sqlx::query(
+    sqlx::query(
         "INSERT INTO season_history (id, profile_id, season_number, division, season_points, \
          wins, draws, losses, result, new_division, coins_awarded, pack_awarded, ended_at) \
          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)",
     )
-    .bind(&history_id)
+    .bind(Uuid::new_v4().to_string())
     .bind(profile_id)
     .bind(season.season_number)
     .bind(old_div)
@@ -136,23 +161,28 @@ pub async fn record_match(
     .bind(new_div)
     .bind(coins)
     .bind(pack_id)
-    .bind(&now)
-    .execute(pool)
-    .await;
+    .bind(now)
+    .execute(&mut **tx)
+    .await?;
 
-    let summary = SeasonEndSummary {
+    Ok(Some(SeasonEndSummary {
         result,
         old_division: old_div,
         new_division: new_div,
         new_season_number: new_season,
         coins_awarded: coins,
         pack_awarded: pack_id.map(String::from),
-    };
+    }))
+}
 
-    let updated = fetch(pool, profile_id).await?.ok_or_else(|| {
-        AppError::Internal(anyhow::anyhow!("season row missing after season rollover"))
-    })?;
-    Ok((updated, Some(summary)))
+async fn fetch_tx(tx: &mut Transaction<'_, Sqlite>, profile_id: &str) -> AppResult<Option<Season>> {
+    Ok(sqlx::query_as::<_, Season>(
+        "SELECT profile_id, division, season_number, season_points, matches_played, \
+         wins, draws, losses, started_at FROM seasons WHERE profile_id = ?",
+    )
+    .bind(profile_id)
+    .fetch_optional(&mut **tx)
+    .await?)
 }
 
 /// Return past seasons for a profile, newest first (max 20).