Fix

vtm9 · ReDBrother · commit bd331c51c448 · 2026-06-29T09:39:09.000+03:00
diff --git a/apps/codebattle/lib/codebattle/tournament/ranking/by_user.ex b/apps/codebattle/lib/codebattle/tournament/ranking/by_user.ex
@@ -63,6 +63,19 @@ defmodule Codebattle.Tournament.Ranking.ByUser do
     end
   end
 
+  def add_new_player(%{type: "top200", state: state} = tournament, _player)
+      when state in ["waiting_participants", "active"] do
+    round_position = tournament.current_round_position || 0
+
+    if Enum.empty?(TournamentResult.get_user_round_delta(tournament, round_position)) do
+      ranking = build_initial_ranking(tournament)
+      set_places_with_score_to_players(tournament, ranking)
+      Ranking.put_ranking(tournament, ranking)
+    end
+
+    tournament
+  end
+
   def add_new_player(%{state: state} = tournament, player) when state in ["waiting_participants", "active"] do
     place = Ranking.count(tournament) + 1
 
diff --git a/apps/codebattle/lib/codebattle/tournament/strategy/base.ex b/apps/codebattle/lib/codebattle/tournament/strategy/base.ex
@@ -956,6 +956,7 @@ defmodule Codebattle.Tournament.Base do
 
         players
         |> Enum.reject(& &1.is_bot)
+        |> Enum.sort_by(& &1.id)
         |> Enum.map(&reset_player_for_retry/1)
       end
 
diff --git a/apps/codebattle/test/codebattle/tournament/context_test.exs b/apps/codebattle/test/codebattle/tournament/context_test.exs
@@ -490,6 +490,7 @@ defmodule Codebattle.Tournament.ContextTest do
       assert tournament.cheater_ids == []
       assert Tournament.Helpers.players_count(tournament) == 2
       assert Enum.sort(Enum.map(players, & &1.id)) == Enum.sort([player_1.id, player_2.id])
+      assert tournament |> Tournament.Ranking.get_first(10) |> Enum.map(& &1.id) == Enum.sort([player_1.id, player_2.id])
 
       Enum.each(players, fn player ->
         assert player.state == "active"
diff --git a/apps/codebattle/test/codebattle/tournament/ranking/by_user_test.exs b/apps/codebattle/test/codebattle/tournament/ranking/by_user_test.exs
@@ -6,6 +6,41 @@ defmodule Codebattle.Tournament.Ranking.ByUserTest do
   alias Codebattle.Tournament.Ranking
   alias Codebattle.Tournament.Ranking.ByUser
 
+  test "add_new_player keeps top200 initial ranking ordered by player id" do
+    tournament_id = System.unique_integer([:positive])
+
+    tournament =
+      :tournament
+      |> insert(
+        id: tournament_id,
+        type: "top200",
+        ranking_type: "by_user",
+        state: "active",
+        current_round_position: 0
+      )
+      |> Map.merge(%{
+        players_table: Players.create_table(tournament_id),
+        ranking_table: Ranking.create_table(tournament_id)
+      })
+
+    Enum.each([3, 1, 2], fn id ->
+      player = Player.new!(%{id: id, name: "player-#{id}", lang: "js", state: "active"})
+
+      Players.put_player(tournament, player)
+      ByUser.add_new_player(tournament, player)
+    end)
+
+    assert Enum.map(ByUser.get_page(tournament, 1, 10).entries, &{&1.id, &1.place}) == [
+             {1, 1},
+             {2, 2},
+             {3, 3}
+           ]
+
+    assert %{place: 1} = Players.get_player(tournament, 1)
+    assert %{place: 2} = Players.get_player(tournament, 2)
+    assert %{place: 3} = Players.get_player(tournament, 3)
+  end
+
   test "set_places_with_score_to_players updates place and score without overwriting lang" do
     tournament_id = System.unique_integer([:positive])
 
