Add last_user_game to public_tournaments

Author: vtm9

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

@@ -134,7 +134,7 @@ defmodule Codebattle.Task do
           generator_lang: Map.get(params, :generator_lang, "js"),
           input_signature: params.input_signature,
           level: params.level,
-          time_to_solve_sec: params.time_to_solve_sec,
+          time_to_solve_sec: Map.get(params, :time_to_solve_sec, nil),
           origin: params.origin,
           output_signature: params.output_signature,
           solution: Map.get(params, :solution, ""),

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

@@ -15,6 +15,15 @@ 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 and player.matches_ids != [] do
+      match_id = Enum.max(player.matches_ids)
+      tournament |> Tournament.Matches.get_match(match_id) |> Map.get(:game_id)
+    end
+  end
+
   @spec get_tournament_info(tournament_id()) :: Tournament.t() | map()
   def get_tournament_info(tournament_id) do
     case Tournament.Server.get_tournament_info(tournament_id) do

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

@@ -2,7 +2,6 @@ defmodule Codebattle.User do
   @moduledoc """
     Represents authenticatable user
   """
-
   use Ecto.Schema
 
   import Ecto.Changeset
@@ -12,6 +11,10 @@ defmodule Codebattle.User do
   alias Codebattle.Repo
   alias Codebattle.User.SoundSettings
 
+  defimpl FunWithFlags.Actor, for: Codebattle.User do
+    def id(%{name: name}), do: "user:#{name}"
+  end
+
   @type t :: %__MODULE__{}
   @type raw_id :: String.t() | integer()
 

services/app/apps/codebattle/lib/codebattle_web/controllers/public_event_controller.ex

@@ -9,40 +9,48 @@ defmodule CodebattleWeb.PublicEventController do
 
   require Logger
 
-  plug(CodebattleWeb.Plugs.RequireAuth when action in [:show, :create_action])
+  plug(CodebattleWeb.Plugs.RequireAuth when action in [:show, :stage])
 
   def show(conn, %{"slug" => slug}) do
-    user = conn.assigns.current_user
-    event = Event.get_by_slug!(slug)
-    user_event = UserEvent.get_by_user_id_and_event_id(user.id, event.id)
-
-    conn = put_meta_tags(conn, Application.get_all_env(:phoenix_meta_tags))
-
-    conn
-    |> assign(:ticker_text, event.ticker_text)
-    |> assign(:show_header, true)
-    |> put_gon(
-      event: %{
-        event: event,
-        user_event: user_event
-      }
-    )
-    |> render("show.html", layout: {CodebattleWeb.LayoutView, :external})
+    if FunWithFlags.enabled?(:event, for_actor: conn.assigns.current_user) do
+      user = conn.assigns.current_user
+      event = Event.get_by_slug!(slug)
+      user_event = UserEvent.get_by_user_id_and_event_id(user.id, event.id)
+
+      conn = put_meta_tags(conn, Application.get_all_env(:phoenix_meta_tags))
+
+      conn
+      |> assign(:ticker_text, event.ticker_text)
+      |> assign(:show_header, true)
+      |> put_gon(
+        event: %{
+          event: event,
+          user_event: user_event
+        }
+      )
+      |> render("show.html", layout: {CodebattleWeb.LayoutView, :external})
+    else
+      redirect(conn, to: Routes.root_path(conn, :index))
+    end
   end
 
   def stage(conn, %{"slug" => slug, "stage_slug" => stage_slug}) do
-    user = conn.assigns.current_user
-
-    case Event.Context.start_stage_for_user(user, slug, stage_slug) do
-      {:ok, %Tournament{} = tournament} ->
-        redirect(conn, to: Routes.tournament_path(conn, :show, tournament.id))
-
-      {:error, error} ->
-        Logger.error("Error starting stage: #{inspect(error)}")
-
-        conn
-        |> put_flash(:error, error)
-        |> redirect(to: Routes.public_event_path(conn, :show, slug))
+    if FunWithFlags.enabled?(:event, for_actor: conn.assigns.current_user) do
+      user = conn.assigns.current_user
+
+      case Event.Context.start_stage_for_user(user, slug, stage_slug) do
+        {:ok, %Tournament{} = tournament} ->
+          redirect(conn, to: Routes.tournament_path(conn, :show, tournament.id))
+
+        {:error, error} ->
+          Logger.error("Error starting stage: #{inspect(error)}")
+
+          conn
+          |> put_flash(:error, error)
+          |> redirect(to: Routes.public_event_path(conn, :show, slug))
+      end
+    else
+      redirect(conn, to: Routes.root_path(conn, :index))
     end
   end
 end

services/app/apps/codebattle/lib/codebattle_web/controllers/tournament_controller.ex

@@ -4,6 +4,9 @@ defmodule CodebattleWeb.TournamentController do
   import PhoenixGon.Controller
 
   alias Codebattle.Tournament
+  alias Codebattle.User
+
+  plug(CodebattleWeb.Plugs.RequireAuth when action in [:index, :show])
 
   def index(conn, _params) do
     current_user = conn.assigns[:current_user]
@@ -18,6 +21,25 @@ defmodule CodebattleWeb.TournamentController do
     tournament = Tournament.Context.get!(params["id"])
 
     if Tournament.Helpers.can_access?(tournament, current_user, params) do
+      handle_tournament_for_user(conn, tournament, current_user)
+    else
+      conn
+      |> put_status(:not_found)
+      |> put_view(CodebattleWeb.ErrorView)
+      |> render("404.html", %{msg: gettext("Tournament not found")})
+    end
+  end
+
+  defp handle_tournament_for_user(conn, tournament, current_user) do
+    if FunWithFlags.enabled?(:tournament_redirect_to_latest_game) and !User.admin?(current_user) do
+      latest_game_id = Tournament.Context.get_user_latest_game_id(tournament, current_user.id)
+
+      if latest_game_id do
+        redirect(conn, to: Routes.game_url(conn, :show, latest_game_id))
+      else
+        redirect(conn, to: Routes.tournament_url(conn, :show, tournament.id))
+      end
+    else
       conn
       |> put_view(CodebattleWeb.TournamentView)
       |> put_meta_tags(%{
@@ -29,11 +51,6 @@ defmodule CodebattleWeb.TournamentController do
       |> put_gon(tournament_id: params["id"])
       |> put_gon(event_id: tournament.event_id)
       |> render("show.html")
-    else
-      conn
-      |> put_status(:not_found)
-      |> put_view(CodebattleWeb.ErrorView)
-      |> render("404.html", %{msg: gettext("Tournament not found")})
     end
   end
 end