improve tournaments

Author: Vitaly

services/app/apps/codebattle/lib/codebattle/game/engine.ex

@@ -336,7 +336,7 @@ defmodule Codebattle.Game.Engine do
 
       update_game!(game, %{
         state: get_state(game),
-        players: get_game_players(game),
+        players: get_players(game),
         duration_sec: params[:duration_sec] || game.duration_sec,
         finishes_at: game.finishes_at
       })
@@ -359,21 +359,15 @@ defmodule Codebattle.Game.Engine do
     |> Repo.update!()
   end
 
-  @spec update_game!(Game.t()) :: Game.t()
   @spec update_game!(Game.t(), map()) :: Game.t()
-  def update_game!(%Game{} = game) do
-    case Repo.get(Game, game.id) do
-      nil ->
-        game
-
-      game ->
-        game
-        |> Game.changeset(Map.from_struct(game))
-        |> Repo.update!()
-    end
-  end
-
   def update_game!(%Game{} = game, params) do
+    params =
+      if Map.has_key?(params, :players) do
+        Map.put(params, :players, sanitize_players(params.players))
+      else
+        params
+      end
+
     case Repo.get(Game, game.id) do
       nil ->
         game
@@ -390,7 +384,9 @@ defmodule Codebattle.Game.Engine do
   end
 
   def toggle_ban_player(%Game{} = game, player_id) do
-    {:ok, {_old_game_state, new_game}} = fire_transition(game.id, :toggle_ban_player, %{id: player_id})
+    {:ok, {_old_game_state, new_game}} =
+      fire_transition(game.id, :toggle_ban_player, %{id: player_id})
+
     {:ok, new_game}
   end
 
@@ -409,7 +405,7 @@ defmodule Codebattle.Game.Engine do
         when old_state in ["waiting_opponent", "playing"] ->
           update_game!(new_game, %{
             state: get_state(new_game),
-            players: get_game_players(new_game),
+            players: get_players(new_game),
             duration_sec: new_game.duration_sec,
             finishes_at: new_game.finishes_at
           })
@@ -518,10 +514,8 @@ defmodule Codebattle.Game.Engine do
     end)
   end
 
-  defp get_game_players(game) do
-    game
-    |> get_players()
-    |> Enum.map(fn player ->
+  defp sanitize_players(players) do
+    Enum.map(players, fn player ->
       editor_text = Utils.sanitize_jsonb(player.editor_text)
 
       player

services/app/apps/codebattle/lib/codebattle/tournament/tournament_result.ex

@@ -77,10 +77,7 @@ defmodule Codebattle.Tournament.TournamentResult do
       games g
       where tournament_id = #{tournament.id}
       and state = 'game_over'
-      and id not in (
-        select distinct g.id from user_games ug inner join games g on g.id = ug.game_id
-        where ug.is_bot = 't' and ug.result = 'won' and g.tournament_id = #{tournament.id}
-      )
+      and bot_won = FALSE
       GROUP BY
       task_id, level),
       stats as (

services/app/apps/codebattle/lib/codebattle_web/channels/tournament_admin_channel.ex

@@ -433,7 +433,7 @@ defmodule CodebattleWeb.TournamentAdminChannel do
 
     # end
 
-    active_game_id = tournament.id |> get_active_game() |> dbg()
+    active_game_id = get_active_game(tournament.id)
 
     %{
       tasks_info: tasks_info,

services/app/apps/codebattle/priv/repo/migrations/20250926113010_add_bot_won_to_games.exs

@@ -0,0 +1,19 @@
+defmodule Codebattle.Repo.Migrations.AddBotWonToGames do
+  use Ecto.Migration
+  @disable_ddl_transaction true
+  @disable_migration_lock true
+
+  def change do
+    execute("""
+    ALTER TABLE games
+    ADD COLUMN bot_won boolean
+    GENERATED ALWAYS AS (players @> '[{"is_bot": true, "result": "won"}]') STORED
+    """)
+
+    execute("""
+    CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_games_over_tourn_task_dur_nowin
+    ON games (tournament_id, task_id, duration_sec)
+    WHERE state = 'game_over' AND bot_won = FALSE
+    """)
+  end
+end