Top 200 history

Author: vtm9

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

@@ -369,6 +369,7 @@ defmodule Codebattle.Tournament.Helpers do
 
     top_8_ids = total_ranking |> Enum.take(8) |> Enum.map(& &1.id)
     user_history = Tournament.TournamentResult.get_users_history(tournament, top_8_ids)
+    max_draw_index = players |> Enum.map(& &1.draw_index) |> Enum.max()
 
     %{
       "tournament_id" => tournament.id,
@@ -383,10 +384,11 @@ defmodule Codebattle.Tournament.Helpers do
             "total_score" => player.score,
             "total_tasks" => Enum.count(player.matches_ids),
             "won_tasks" => player.wins_count,
-            "rank" => player.rank,
+            "rank" => player.place,
             # TODO: do win_prob based on the top 8 people
             "win_prob" => "42",
-            "active" => if(player.in_main_draw, do: 1, else: 0),
+            "returned" => if(player.returned, do: 1, else: 0),
+            "active" => if(player.draw_index == max_draw_index, do: 1, else: 0),
             "history" => user_history[player.id] || []
           }
         end)

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

@@ -24,7 +24,7 @@ defmodule Codebattle.Tournament.Player do
     :rating,
     :score,
     :team_id,
-    :in_main_draw,
+    :draw_index,
     :wr_joined_at,
     :wins_count
   ]
@@ -44,13 +44,14 @@ defmodule Codebattle.Tournament.Player do
     field(:clan_id, :integer)
     field(:id, :integer)
     field(:is_bot, :boolean)
-    field(:in_main_draw, :boolean, default: true)
+    field(:draw_index, :integer, default: 1)
     field(:lang, :string)
     field(:matches_ids, {:array, :integer}, default: [])
     field(:name, :string)
     field(:place, :integer, default: 0)
     field(:rank, :integer, default: 5432)
     field(:rating, :integer)
+    field(:returned, :boolean, default: false)
     field(:score, :integer, default: 0)
     field(:state, :string, default: "active")
     field(:task_ids, {:array, :integer}, default: [])

services/app/apps/codebattle/lib/codebattle/tournament/storage/players.ex

@@ -45,13 +45,4 @@ defmodule Codebattle.Tournament.Players do
       get_player(tournament, player_id)
     end)
   end
-
-  def move_players_from_main_draw(tournament, player_ids) do
-    Enum.each(player_ids, fn player_id ->
-      tournament
-      |> get_player(player_id)
-      |> Map.put(:in_main_draw, false)
-      |> then(&put_player(tournament, &1))
-    end)
-  end
 end