bug: fix reassignment of winner on finished match

Author: lukepolo

hasura/functions/match/match_player_elo.sql

@@ -49,6 +49,11 @@ DECLARE
     _team_avg_kda FLOAT;
     _player_damage_percent FLOAT;
     match_type text;
+
+    -- Series (best-of) scaling
+    _player_map_wins INT := 0;
+    _player_map_losses INT := 0;
+    _series_multiplier INT := 1;
 BEGIN
     SELECT "type" INTO match_type FROM match_options WHERE id = match_record.match_options_id;
 
@@ -79,6 +84,19 @@ BEGIN
         _opponent_lineup_id := match_record.lineup_1_id;
     END IF;
 
+    -- Series multiplier: scale ELO by the net map differential for this player's team.
+    -- BO1 win gives 1x, BO3 2-0 gives 2x, BO3 2-1 gives 1x, BO5 3-0 gives 3x, etc.
+    -- GREATEST(..., 1) keeps ELO moving for ties / zero-recorded-winner forfeits.
+    SELECT
+        COUNT(*) FILTER (WHERE mm.winning_lineup_id = _player_lineup_id),
+        COUNT(*) FILTER (WHERE mm.winning_lineup_id = _opponent_lineup_id)
+    INTO _player_map_wins, _player_map_losses
+    FROM match_maps mm
+    WHERE mm.match_id = match_record.id
+      AND mm.winning_lineup_id IS NOT NULL;
+
+    _series_multiplier := GREATEST(ABS(_player_map_wins - _player_map_losses), 1);
+
     -- Calculate average ELO for player's team
     -- First get the sum of all previous ELO changes for each player in the team
     SELECT 
@@ -215,8 +233,8 @@ BEGIN
     END IF;
 
     -- Calculate the elo change (round to nearest integer)
-    -- ELO change formula: New Rating = Old Rating + K * (Actual Score - Expected Score) * Performance Multiplier
-    _elo_change := ROUND(_k_factor * (_actual_score - _expected_score) * _performance_multiplier);
+    -- ELO change formula: New Rating = Old Rating + K * (Actual Score - Expected Score) * Performance Multiplier * Series Multiplier
+    _elo_change := ROUND(_k_factor * (_actual_score - _expected_score) * _performance_multiplier * _series_multiplier);
 
     -- Return the elo change as JSON with detailed information
     RETURN jsonb_build_object(
@@ -234,7 +252,10 @@ BEGIN
         'kda', _player_kda::FLOAT,
         'team_avg_kda', _team_avg_kda::FLOAT,
         'damage_percent', _player_damage_percent,
-        'performance_multiplier', _performance_multiplier
+        'performance_multiplier', _performance_multiplier,
+        'map_wins', _player_map_wins,
+        'map_losses', _player_map_losses,
+        'series_multiplier', _series_multiplier
     );
 END;
 $$ LANGUAGE plpgsql;

hasura/metadata/databases/default/tables/public_v_player_elo.yaml

@@ -26,6 +26,8 @@ select_permissions:
         - k_factor
         - kda
         - kills
+        - map_losses
+        - map_wins
         - match_created_at
         - match_id
         - match_result
@@ -34,6 +36,7 @@ select_permissions:
         - player_name
         - player_steam_id
         - player_team_elo_avg
+        - series_multiplier
         - team_avg_kda
         - type
         - updated_elo

hasura/views/v_player_elo.sql

@@ -27,7 +27,10 @@ SELECT
     (elo_data->>'kda')::FLOAT AS kda,
     (elo_data->>'team_avg_kda')::FLOAT AS team_avg_kda,
     (elo_data->>'damage_percent')::FLOAT AS damage_percent,
-    (elo_data->>'performance_multiplier')::FLOAT AS performance_multiplier
+    (elo_data->>'performance_multiplier')::FLOAT AS performance_multiplier,
+    (elo_data->>'map_wins')::INTEGER AS map_wins,
+    (elo_data->>'map_losses')::INTEGER AS map_losses,
+    (elo_data->>'series_multiplier')::INTEGER AS series_multiplier
 FROM 
     matches m
 JOIN 

src/matches/matches.module.ts

@@ -193,21 +193,28 @@ export class MatchesModule implements NestModule {
   }
 
   /**
-   * TODO - this is required one time
+   * Runs once per ELO formula change. Keyed off a settings marker so upgrades
+   * that change the ELO math (e.g. best-of series multiplier) re-generate
+   * historical rows. Bump SERIES_MULTIPLIER_BACKFILL_MARKER when the formula
+   * changes again.
    */
   async generatePlayerRatings() {
-    const { player_elo_aggregate } = await this.hasuraService.query({
-      player_elo_aggregate: {
-        aggregate: {
-          count: true,
-        },
+    const SERIES_MULTIPLIER_BACKFILL_MARKER =
+      "player_elo_backfill_series_multiplier_v1";
+
+    const { settings_by_pk } = await this.hasuraService.query({
+      settings_by_pk: {
+        __args: { name: SERIES_MULTIPLIER_BACKFILL_MARKER },
+        value: true,
       },
     });
 
-    if (player_elo_aggregate.aggregate.count > 0) {
+    if (settings_by_pk) {
       return;
     }
 
+    await this.postgres.query(`TRUNCATE TABLE player_elo`);
+
     const matches = await this.hasuraService.query({
       matches: {
         __args: {
@@ -240,9 +247,24 @@ export class MatchesModule implements NestModule {
           `Failed to generate player ratings for match ${match.id}:`,
           error,
         );
-        // Continue with the next match instead of failing completely
       }
     }
+
+    await this.hasuraService.mutation({
+      insert_settings_one: {
+        __args: {
+          object: {
+            name: SERIES_MULTIPLIER_BACKFILL_MARKER,
+            value: new Date().toISOString(),
+          },
+          on_conflict: {
+            constraint: "settings_pkey",
+            update_columns: ["value"],
+          },
+        },
+        __typename: true,
+      },
+    });
   }
 
   configure(consumer: MiddlewareConsumer) {