Minor change

Author: vtm9

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

@@ -73,35 +73,25 @@ defmodule CodebattleWeb.TournamentController do
       if latest_game_id do
         redirect(conn, to: Routes.game_path(conn, :show, latest_game_id))
       else
-        redirect(conn,
-          to:
-            Routes.tournament_path(
-              conn,
-              :show,
-              tournament.id,
-              tournament_access_params(params)
-            )
-        )
+        render_tournament(conn, tournament, params)
       end
     else
-      conn
-      |> put_view(CodebattleWeb.TournamentView)
-      |> put_meta_tags(%{
-        title: tournament.name,
-        description: tournament.description,
-        image: Routes.tournament_image_url(conn, :show, tournament.id),
-        url: Routes.tournament_url(conn, :show, tournament.id)
-      })
-      |> put_gon(tournament_id: tournament.id)
-      |> put_gon(event_id: tournament.event_id)
-      |> put_gon(tournament_access_token: params["access_token"])
-      |> render("show.html")
+      render_tournament(conn, tournament, params)
     end
   end
 
-  defp tournament_access_params(%{"access_token" => access_token}) when is_binary(access_token) do
-    [access_token: access_token]
+  defp render_tournament(conn, tournament, params) do
+    conn
+    |> put_view(CodebattleWeb.TournamentView)
+    |> put_meta_tags(%{
+      title: tournament.name,
+      description: tournament.description,
+      image: Routes.tournament_image_url(conn, :show, tournament.id),
+      url: Routes.tournament_url(conn, :show, tournament.id)
+    })
+    |> put_gon(tournament_id: tournament.id)
+    |> put_gon(event_id: tournament.event_id)
+    |> put_gon(tournament_access_token: params["access_token"])
+    |> render("show.html")
   end
-
-  defp tournament_access_params(_params), do: []
 end

apps/codebattle/test/codebattle_web/controllers/live_view_tournament_controller_test.exs

@@ -112,4 +112,37 @@ defmodule CodebattleWeb.LiveViewTournamentControllerTest do
       |> get(Routes.tournament_path(conn, :show, 12_313_221))
     end
   end
+
+  test "renders tournament page when redirect-to-latest-game is enabled and user has no latest game", %{conn: conn} do
+    FunWithFlags.enable(:tournament_redirect_to_latest_game)
+
+    on_exit(fn ->
+      FunWithFlags.disable(:tournament_redirect_to_latest_game)
+    end)
+
+    creator = insert(:user)
+
+    {:ok, tournament} =
+      Tournament.Context.create(%{
+        "starts_at" => "2022-02-24T06:00",
+        "name" => "Redirect Guard Tournament",
+        "description" => "Redirect Guard Tournament description",
+        "user_timezone" => "Etc/UTC",
+        "level" => "easy",
+        "creator" => creator,
+        "access_type" => "token",
+        "access_token" => "access_token",
+        "break_duration_seconds" => 0,
+        "type" => "swiss",
+        "state" => "waiting_participants",
+        "players_limit" => 200
+      })
+
+    new_conn =
+      conn
+      |> put_session(:user_id, creator.id)
+      |> get(Routes.tournament_path(conn, :show, tournament.id))
+
+    assert new_conn.status == 200
+  end
 end