fix tournament langs picker (#643)

hexlet-codebattle · Feb 24, 2020 · 244bfb4 · 244bfb4
1 parent 9eace74
commit 244bfb4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/services/app/lib/codebattle/game_process/engine/tournament.ex b/services/app/lib/codebattle/game_process/engine/tournament.ex
@@ -1,6 +1,8 @@
 defmodule Codebattle.GameProcess.Engine.Tournament do
   alias Codebattle.Bot.PlaybookAsyncRunner
 
+  alias Codebattle.Languages
+
   alias Codebattle.GameProcess.{
     GlobalSupervisor,
     Engine,
@@ -27,7 +29,7 @@ defmodule Codebattle.GameProcess.Engine.Tournament do
         task_id: task.id
       })
 
-    new_players = Enum.map(players, &Player.build/1)
+    new_players = Enum.map(players, &Player.build(&1, %{task: task}))
 
     fsm =
       build_fsm(%{
@@ -39,6 +41,7 @@ defmodule Codebattle.GameProcess.Engine.Tournament do
         type: "tournament",
         inserted_at: game.inserted_at,
         task: task,
+        langs: Languages.get_langs_with_solutions(task),
         tournament_id: params.tournament.id,
         timeout_seconds: timeout_seconds,
         starts_at: TimeHelper.utc_now()

diff --git a/services/app/lib/codebattle/game_process/player.ex b/services/app/lib/codebattle/game_process/player.ex
@@ -71,7 +71,7 @@ defmodule Codebattle.GameProcess.Player do
   end
 
   def build(%Tournament.Types.Player{} = player, params) do
-    new_player = %__MODULE__{
+    init_player = %__MODULE__{
       id: player.id,
       public_id: player.public_id,
       is_bot: player.is_bot,
@@ -82,7 +82,13 @@ defmodule Codebattle.GameProcess.Player do
       lang: player.lang || "js"
     }
 
-    Map.merge(new_player, params)
+    player =
+      case params[:task] do
+        nil -> init_player
+        task -> setup_editor_params(init_player, %{task: task})
+      end
+
+    Map.merge(player, params)
   end
 
   def build(user, params) do