Fix tournaments

Author: vtm9

services/app/apps/codebattle/assets/js/widgets/pages/tournament/TournamentHeader.jsx

@@ -262,7 +262,7 @@ function TournamentHeader({
                         || type === 'swiss'
                       }
                       isShowLeave={
-                        type !== 'arena' || state !== TournamentStates.active
+                        type === 'arena' || state !== TournamentStates.active
                       }
                       isParticipant={!!players[currentUserId]}
                       disabled={!isOnline || !isLive}

services/app/apps/codebattle/lib/codebattle/pub_sub/events.ex

@@ -34,6 +34,7 @@ defmodule Codebattle.PubSub.Events do
         payload: %{
           tournament: %{
             last_round_ended_at: params.tournament.last_round_ended_at,
+            round_timeout_seconds: params.tournament.round_timeout_seconds,
             last_round_started_at: params.tournament.last_round_started_at,
             state: params.tournament.state,
             break_state: "off",
@@ -273,7 +274,7 @@ defmodule Codebattle.PubSub.Events do
   end
 
   def get_messages("tournament:match:created", params) do
-    players = Tournament.Helpers.get_players(params.tournament, params.match.player_ids)
+    players = params.tournament |> Tournament.Helpers.get_players(params.match.player_ids) |> Enum.reject(&is_nil/1)
 
     Enum.map(players, fn player ->
       if params.tournament.waiting_room_name do
@@ -300,6 +301,7 @@ defmodule Codebattle.PubSub.Events do
     players =
       params.tournament
       |> Tournament.Helpers.get_players(params.match.player_ids)
+      |> Enum.reject(&is_nil/1)
       |> Enum.map(&get_player_changed_fields/1)
 
     Enum.map(players, fn player ->
@@ -345,6 +347,7 @@ defmodule Codebattle.PubSub.Events do
     user_messages =
       game
       |> Game.Helpers.get_players()
+      |> Enum.reject(&is_nil/1)
       |> Enum.map(fn player ->
         %Message{
           topic: "user:#{player.id}",

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

@@ -590,19 +590,19 @@ defmodule Codebattle.Tournament.Base do
 
       defp bulk_insert_round_games({tournament, player_pairs}, round_params) do
         task_id = get_task_id_by_params(round_params)
+        task = get_task(tournament, task_id)
+        timeout_seconds = get_game_timeout(tournament, task)
 
         player_pairs
         |> Enum.with_index(matches_count(tournament))
         |> Enum.chunk_every(50)
-        |> Enum.each(&bulk_create_round_games_and_matches(&1, tournament, task_id))
+        |> Enum.each(&bulk_create_round_games_and_matches(&1, tournament, task, timeout_seconds))
 
-        tournament
+        update_struct(tournament, %{round_timeout_seconds: timeout_seconds})
       end
 
-      defp bulk_create_round_games_and_matches(batch, tournament, task_id) do
+      defp bulk_create_round_games_and_matches(batch, tournament, task, timeout_seconds) do
         reset_task_ids = tournament.task_provider == "task_pack_per_round"
-        task = get_task(tournament, task_id)
-        timeout_seconds = get_game_timeout(tournament, task)
 
         batch
         |> Enum.map(fn
@@ -980,11 +980,13 @@ defmodule Codebattle.Tournament.Base do
             |> Enum.each(fn player_id ->
               player = Tournament.Players.get_player(tournament, player_id)
 
-              Tournament.Players.put_player(tournament, %{
-                player
-                | score: player.score + player_results[player_id].score,
-                  lang: player_results[player_id].lang
-              })
+              if player do
+                Tournament.Players.put_player(tournament, %{
+                  player
+                  | score: player.score + player_results[player_id].score,
+                    lang: player_results[player_id].lang
+                })
+              end
             end)
           end
         )

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

@@ -11,7 +11,7 @@ defmodule Codebattle.Tournament.Swiss do
   @impl Tournament.Base
   def complete_players(tournament) do
     # just for the UI test
-    # bots = Bot.Context.build_list(11)
+    # bots = Bot.Context.build_list(30)
     # add_players(tournament, %{users: bots})
     tournament
   end

services/app/apps/codebattle/lib/codebattle/users_rank_update_server.ex

@@ -44,6 +44,7 @@ defmodule Codebattle.UsersRankUpdateServer do
   def handle_info(:work, state) do
     if FunWithFlags.enabled?(:skip_user_rank_server) do
       :noop
+      {:noreply, state}
     else
       do_work()
       Process.send_after(self(), :work, @timeout)

services/app/apps/codebattle/lib/codebattle_web/templates/root/waiting.html.heex

@@ -20,7 +20,7 @@
         data-method="post"
         data-to="/games/training"
       >
-        <%= gettext("Go!") %>
+        <%= gettext("Try simple battle") %>
       </button>
     </div>
   </div>

services/app/apps/codebattle/lib/codebattle_web/templates/session/local_password.html.heex

@@ -12,6 +12,16 @@
       </div>
     <% end %>
   </div>
+  <div>
+    <button
+      class="btn btn-info w-100"
+      data-csrf={csrf_token()}
+      data-method="post"
+      data-to="/games/training"
+    >
+      <%= gettext("Try simple battle") %>
+    </button>
+  </div>
 
   <div class="w-100" style="max-width: 400px;">
     <%= form_for @conn, Routes.session_path(@conn, :create), [as: :session], fn f -> %>

services/app/apps/codebattle/priv/gettext/ru/LC_MESSAGES/default.po

@@ -922,8 +922,8 @@ msgstr "Уровень сложности"
 msgid "Play with"
 msgstr "Играть с"
 
-msgid "Go!"
-msgstr "Вперед!"
+msgid "Try simple battle"
+msgstr "Попробовать простую игру"
 
 msgid "You don't have access to this game"
 msgstr "У вас нет доступа к этой игре"

services/app/apps/codebattle/test/codebattle_web/integration/tournament/swiss_95_percentile_test.exs

@@ -183,6 +183,7 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
         event: "tournament:round_created",
         payload: %{
           tournament: %{
+            round_timeout_seconds: 180,
             break_state: "off",
             current_round_position: 0,
             last_round_ended_at: nil,
@@ -309,6 +310,27 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
 
     assert Process.info(self(), :message_queue_len) == {:message_queue_len, 0}
 
+    # ----------------
+    # somebody leave
+    # ----------------
+    #
+    Phoenix.ChannelTest.push(socket6, "tournament:leave", %{})
+
+    :timer.sleep(100)
+    left_id = user6.id
+
+    Enum.each(1..10, fn _i ->
+      assert_receive %Message{
+        event: "tournament:player:left",
+        payload: %{
+          player_id: ^left_id,
+          tournament: %{players_count: 8}
+        }
+      }
+    end)
+
+    assert Process.info(self(), :message_queue_len) == {:message_queue_len, 0}
+
     # ----------------
     # finish 1 round
     # start 2 round
@@ -318,8 +340,8 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
 
     :timer.sleep(100)
 
-    # 5 players got match timeout notification
-    Enum.each(1..5, fn _i ->
+    # 4 players got match timeout notification
+    Enum.each(1..3, fn _i ->
       assert_receive %Message{
         event: "tournament:match:upserted",
         payload: %{
@@ -329,6 +351,15 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
       }
     end)
 
+    # event without left_player
+    assert_receive %Message{
+      event: "tournament:match:upserted",
+      payload: %{
+        players: [%{state: "active"}],
+        match: %{state: "timeout", task_id: ^t1_id}
+      }
+    }
+
     # 8 users got notification about round finished
     Enum.each(1..8, fn _i ->
       assert_receive %Message{
@@ -409,7 +440,7 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
       }
     }
 
-    Enum.each(1..7, fn _i ->
+    Enum.each(1..6, fn _i ->
       assert_receive %Message{
         event: "tournament:match:upserted",
         payload: %{
@@ -529,7 +560,7 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
     :timer.sleep(100)
 
     # 5 players got match timeout notification
-    Enum.each(1..6, fn _i ->
+    Enum.each(1..5, fn _i ->
       assert_receive %Message{
         event: "tournament:match:upserted",
         payload: %{
@@ -618,7 +649,7 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
       }
     }
 
-    Enum.each(1..7, fn _i ->
+    Enum.each(1..6, fn _i ->
       assert_receive %Message{
         event: "tournament:match:upserted",
         payload: %{
@@ -655,11 +686,12 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
             _player6,
             _player7,
             _player8,
-            _player_bot
+            _player_bot1,
+            _player_bot2
           ],
           page_number: 1,
           page_size: 10,
-          total_entries: 9
+          total_entries: 10
         }
       }
     }
@@ -739,7 +771,7 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
     :timer.sleep(100)
 
     # 5 players got match timeout notification
-    Enum.each(1..6, fn _i ->
+    Enum.each(1..5, fn _i ->
       assert_receive %Message{
         event: "tournament:match:upserted",
         payload: %{
@@ -836,14 +868,15 @@ defmodule CodebattleWeb.Integration.Tournament.SwissClan95PercentileTest do
             _player3,
             _player4,
             _player5,
-            _player6,
             _player7,
             _player8,
-            _player_bot
+            _player_bot1,
+            _player_bot2,
+            _player_bot3
           ],
           page_number: 1,
           page_size: 10,
-          total_entries: 9
+          total_entries: 11
         }
       }
     }