FIxes

Author: vtm9

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

@@ -192,7 +192,6 @@ defmodule Codebattle.Game.Engine do
               lang: editor_lang
             })
 
-
             {:ok, _game} = store_result!(new_game)
 
             Codebattle.PubSub.broadcast("game:finished", %{game: new_game})
@@ -389,7 +388,7 @@ 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, %{player_id: player_id})
+    {:ok, {_old_game_state, new_game}} = fire_transition(game.id, :toggle_ban_player, %{player_id: player_id})
     {:ok, new_game}
   end
 
@@ -398,7 +397,6 @@ defmodule Codebattle.Game.Engine do
     {:ok, game}
   end
 
-
   def trigger_timeout(%Game{} = game) do
     Logger.debug("Trigger timeout for game: #{game.id}")
     {:ok, {old_game_state, new_game}} = fire_transition(game.id, :timeout, %{})

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

@@ -16,11 +16,11 @@ defmodule Codebattle.Tournament.Context do
   @states_from_restore ["waiting_participants"]
 
   def get_user_latest_game_id(tournament, user_id) do
-    player = Tournament.Players.get_player(tournament, user_id)
-
-    if player && player.matches_ids != [] do
-      match_id = Enum.max(player.matches_ids)
-      tournament |> Tournament.Matches.get_match(match_id) |> Map.get(:game_id)
+    tournament
+    |> Tournament.Helpers.get_player_latest_match(user_id)
+    |> case do
+      %{game_id: game_id} -> game_id
+      _ -> nil
     end
   end
 

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

@@ -238,33 +238,20 @@ defmodule Codebattle.Tournament.Helpers do
   #   end
   # end
 
-  def get_active_game_id(tournament, player_id) do
-    player = get_player(tournament, player_id)
-
-    if player do
-      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
+  def get_player_latest_match(tournament, player_id) do
+    with player when not is_nil(player) <- get_player(tournament, player_id),
+         true <- player.matches_ids != [],
+         match_id when not is_nil(match_id) <- Enum.max(player.matches_ids) do
+      get_match(tournament, match_id)
+    else
+      _ -> nil
     end
   end
 
-  def get_active_player_game_id(_tournament, nil), do: nil
-
-  def get_active_player_game_id(tournament, player) do
-    match_id = List.last(player.matches_ids)
-    if match_id do
-      get_match(tournament, match_id)
-      |> case do
-        %{game_id: game_id} -> game_id
-        _ -> nil
-      end
+  def get_active_game_id(tournament, player_id) do
+    case get_player_latest_match(tournament, player_id) do
+      %{state: "playing", game_id: game_id} -> game_id
+      _ -> nil
     end
   end
 

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

@@ -210,30 +210,31 @@ defmodule Codebattle.Tournament.Base do
       end
 
       def unban_player(tournament, player, game_ids) do
-          new_state =
-            if tournament.state == "finished" do
-              "finished"
-            else
-              "active"
-            end
-
-          new_player = %{player | state: new_state}
-          Tournament.Players.put_player(tournament, new_player)
+        new_state =
+          if tournament.state == "finished" do
+            "finished"
+          else
+            "active"
+          end
 
-          Codebattle.PubSub.broadcast("tournament:player:unbanned", %{
-            tournament: tournament,
-            player: new_player,
-            game_ids: game_ids
-          })
+        new_player = %{player | state: new_state}
+        Tournament.Players.put_player(tournament, new_player)
 
+        Codebattle.PubSub.broadcast("tournament:player:unbanned", %{
+          tournament: tournament,
+          player: new_player,
+          game_ids: game_ids
+        })
       end
 
       def toggle_ban_player(tournament, %{user_id: user_id}) do
         player = Tournament.Players.get_player(tournament, user_id)
+
         if player do
-          game_id = get_active_player_game_id(tournament, player)
+          game_id = get_active_game_id(tournament, user_id)
+
           if game_id do
-            Game.Context.toggle_ban_player(game_id, %{player_id: player.id})
+            Game.Context.toggle_ban_player(game_id, %{player_id: user_id})
           end
 
           if player.state == "banned" do
@@ -242,6 +243,7 @@ defmodule Codebattle.Tournament.Base do
             ban_player(tournament, player, [game_id])
           end
         end
+
         tournament
       end
 

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

@@ -43,8 +43,6 @@ defmodule CodebattleWeb.GameChannel do
           %{entries: ranking}
         end)
 
-      banned? = current_player.state == 'banned'
-
       {:ok,
        %{
          active_game_id: active_game_id,
@@ -65,7 +63,7 @@ defmodule CodebattleWeb.GameChannel do
        },
        assign(socket,
          tournament_id: game.tournament_id,
-         banned?: banned?,
+         banned?: current_player.state == "banned",
          game_id: game_id,
          follow_id: follow_id
        )}
@@ -326,7 +324,7 @@ defmodule CodebattleWeb.GameChannel do
   def handle_info(%{event: "user:banned", payload: %{player: player}}, socket) do
     user_id = socket.assigns.current_user.id
 
-    if (user_id == player.id) do
+    if user_id == player.id do
       socket = assign(socket, banned?: true)
     end
 
@@ -337,7 +335,7 @@ defmodule CodebattleWeb.GameChannel do
   def handle_info(%{event: "user:unbanned", payload: %{player: player}}, socket) do
     user_id = socket.assigns.current_user.id
 
-    if (user_id == player.id) do
+    if user_id == player.id do
       socket = assign(socket, banned?: false)
     end