Improve active_game_id

Author: vtm9

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

@@ -239,12 +239,16 @@ defmodule Codebattle.Tournament.Helpers do
   # end
 
   def get_active_game_id(tournament, player_id) do
-    tournament
-    |> get_matches("playing")
-    |> Enum.find(fn match -> player_id in match.player_ids end)
-    |> case do
-      nil -> nil
-      match -> match.game_id
+    player = get_player(tournament, player_id)
+    match_id = List.last(player.matches_ids)
+
+    if match_id do
+      tournament
+      |> get_match(match_id)
+      |> case do
+        %{state: "playing"} -> match_id
+        _ -> nil
+      end
     end
   end
 

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

@@ -35,13 +35,6 @@ defmodule Codebattle.Tournament.Base do
 
       require Logger
 
-      @custom_round_tiemouts_in_sec %{
-        "elementary" => 5 * 60,
-        "easy" => 6 * 60,
-        "medium" => 10 * 60,
-        "hard" => 25 * 60
-      }
-
       def add_player(tournament, player) do
         tournament_player = Tournament.Player.new!(player)
         Tournament.Players.put_player(tournament, tournament_player)
@@ -967,11 +960,8 @@ defmodule Codebattle.Tournament.Base do
         end
       end
 
-      defp get_custom_round_timeout_seconds(tournament, nil), do: get_round_timeout_seconds(tournament)
-
       defp get_custom_round_timeout_seconds(tournament, task) do
-        Map.get(@custom_round_tiemouts_in_sec, task.level) ||
-          get_round_timeout_seconds(tournament)
+        (task && task.time_to_solve_sec) || get_round_timeout_seconds(tournament)
       end
 
       defp seconds_to_end_round(tournament) do

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

@@ -25,7 +25,6 @@ defmodule CodebattleWeb.GameChannel do
 
           active_game_id = Tournament.Helpers.get_active_game_id(tournament, user_id)
 
-          # TODO: think about active_game_id
           {user_id, active_game_id}
         else
           {nil, nil}