Finish top200 tournament

Author: vtm9

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

@@ -407,15 +407,15 @@ defmodule Codebattle.Game.Engine do
       case {old_game_state, new_game.state} do
         {old_state, "timeout"}
         when old_state in ["waiting_opponent", "playing"] ->
-          Codebattle.PubSub.broadcast("game:finished", %{game: new_game})
-
           update_game!(new_game, %{
             state: get_state(new_game),
             players: get_game_players(new_game),
             duration_sec: new_game.duration_sec,
             finishes_at: new_game.finishes_at
           })
 
+          Codebattle.PubSub.broadcast("game:finished", %{game: new_game})
+
           if game.tournament_id do
             terminate_game_after(game, 1)
           else

services/app/apps/codebattle/lib/codebattle/tournament/strategy/top200.ex

@@ -8,14 +8,14 @@ defmodule Codebattle.Tournament.Top200 do
   @impl Tournament.Base
   def complete_players(tournament) do
     # just for the UI test
-    users =
-      Codebattle.User
-      |> Codebattle.Repo.all()
-      |> Enum.filter(&(&1.is_bot == false and &1.subscription_type != :admin))
-      |> Enum.take(199)
-
-    add_players(tournament, %{users: users})
-    # tournament
+    # users =
+    #   Codebattle.User
+    #   |> Codebattle.Repo.all()
+    #   |> Enum.filter(&(&1.is_bot == false and &1.subscription_type != :admin))
+    #   |> Enum.take(199)
+
+    # add_players(tournament, %{users: users})
+    tournament
   end
 
   @impl Tournament.Base
@@ -221,7 +221,7 @@ defmodule Codebattle.Tournament.Top200 do
     total_ranking = TournamentResult.get_user_ranking(tournament)
 
     # Get winners from first 8 matches
-    top_match_winner_ids =
+    top_8_winner_ids =
       tournament
       |> get_round_matches(3)
       |> Enum.sort_by(& &1.id)
@@ -232,16 +232,7 @@ defmodule Codebattle.Tournament.Top200 do
         (get_in(ranking, [p1_id, :score]) >= get_in(ranking, [p2_id, :score]) && p1_id) || p2_id
       end)
 
-    # Take top 8 winners based on ranking
-    top_8_winner_ids =
-      ranking
-      |> Map.values()
-      |> Enum.filter(&(&1.id in top_match_winner_ids))
-      |> Enum.sort_by(&{-&1.score, &1.id})
-      |> Enum.map(& &1.id)
-      |> Enum.take(8)
-
-    # Pick top 6 from the 8 winners
+    # Take top 6 winners based on ranking
     top_6_winner_ids =
       ranking
       |> Map.values()
@@ -250,23 +241,22 @@ defmodule Codebattle.Tournament.Top200 do
       |> Enum.map(& &1.id)
       |> Enum.take(6)
 
-    # Get all remaining players
-    remaining_ids = ranking |> Map.values() |> Enum.map(& &1.id) |> Kernel.--(top_8_winner_ids)
-
     # Pick top 2 from remaining players
     top_2_remaining_ids =
       total_ranking
-      |> Map.values()
-      |> Enum.filter(&(&1.id in remaining_ids))
+      |> Enum.filter(&(&1.id not in top_6_winner_ids))
       |> Enum.sort_by(&{-&1.score, &1.id})
       |> Enum.map(& &1.id)
       |> Enum.take(2)
 
     # Combine top 6 winners with top 2 remaining players
     top_8_ids = top_6_winner_ids ++ top_2_remaining_ids
 
+    # Get all remaining players
+    remaining_ids = ranking |> Map.values() |> Enum.map(& &1.id) |> Kernel.--(top_8_ids)
+
     # Create 4 pairs from top 8 players
-    top_pair_ids = Enum.chunk_every(Enum.shuffle(top_8_ids), 2)
+    top_pair_ids = top_8_ids |> Enum.shuffle() |> Enum.chunk_every(2)
 
     # Shuffle and pair the rest of the players
     remaining_pair_ids = remaining_ids |> Enum.shuffle() |> Enum.chunk_every(2)

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

@@ -94,16 +94,16 @@ defmodule Codebattle.Tournament.TournamentResult do
       g.id as game_id,
       g.round_position,
       g.was_cheated,
-      dt.min_duration,
-      dt.max_duration,
-      dt.base_score,
+      COALESCE(dt.base_score, 0) AS base_score,
+      COALESCE(dt.min_duration, 0) AS min_duration,
+      COALESCE(dt.max_duration, 0) AS max_duration,
       CASE
       -- Handle timeout case where both players lost
       WHEN g.state = 'timeout' THEN
-        0.5 * dt.base_score * COALESCE((p.player_info->>'result_percent')::numeric, 0) / 100.0
+        0.5 * COALESCE(dt.base_score, 0) * COALESCE((p.player_info->>'result_percent')::numeric, 0) / 100.0
       ELSE
-        dt.base_score * (
-          2 - ((g.duration_sec - dt.min_duration)::numeric / GREATEST(dt.max_duration - dt.min_duration, 1))
+        COALESCE(dt.base_score, 0) * (
+          2 - ((g.duration_sec - COALESCE(dt.min_duration, 0))::numeric / GREATEST(COALESCE(dt.max_duration - COALESCE(dt.min_duration, 0), 1), 1))
         ) * COALESCE((p.player_info->>'result_percent')::numeric, 0) / 100.0
       END AS score,
       g.level,
@@ -112,7 +112,7 @@ defmodule Codebattle.Tournament.TournamentResult do
       from games g
       CROSS JOIN LATERAL
       jsonb_array_elements(g.players) AS p(player_info)
-      inner join duration_percentile_for_tasks dt
+      left join duration_percentile_for_tasks dt
       on dt.task_id = g.task_id
       where g.tournament_id = #{tournament.id}
       and state in ('game_over', 'timeout')