FIx

Author: vtm9

apps/codebattle/assets/js/widgets/middlewares/GroupTournament.js

@@ -92,6 +92,7 @@ export const connectToTournament = (_currentUserId) => (dispatch) => {
       platformError,
       code,
       langSlug,
+      snapshot,
     } = normalizedResponse;
 
     dispatch(
@@ -109,6 +110,10 @@ export const connectToTournament = (_currentUserId) => (dispatch) => {
         langSlug,
       }),
     );
+
+    if (snapshot) {
+      dispatch(actions.setData(snapshot));
+    }
   };
 
   channel.join().receive("ok", onJoinSuccess).receive("error", onJoinFailure);
@@ -188,13 +193,16 @@ const requestJson = async (url, options = {}) => {
 };
 
 export const load = (groupTournamentId) => async (dispatch) => {
-  const response = await requestJson(`/api/v1/group_tournaments/${groupTournamentId}`, {
-    headers: {
-      "Content-Type": "application/json",
-      "x-csrf-token": window.csrf_token,
-    },
-  });
-  console.log(response);
+  try {
+    const response = await requestJson(`/api/v1/group_tournaments/${groupTournamentId}`, {
+      headers: {
+        "Content-Type": "application/json",
+        "x-csrf-token": window.csrf_token || "",
+      },
+    });
 
-  dispatch(actions.setData(response));
+    dispatch(actions.setData(response));
+  } catch (error) {
+    console.error("group_tournament:load failed", error);
+  }
 };

apps/codebattle/assets/js/widgets/pages/groupTournament/EvolutionPanel.jsx

@@ -3,15 +3,24 @@ import dayjs from "../../../i18n/dayjs";
 import i18n from "../../../i18n";
 
 const getExternalUrl = (url) => {
-  const externalUrl = new URL(`${url.replace(/\/$/, "")}/browse/README.md`);
+  if (!url) {
+    return null;
+  }
 
-  externalUrl.searchParams.set("rev", "main");
-  externalUrl.searchParams.set(
-    "chatMessage",
-    "Это ИИ-ассистент, который поможет тебе решить задачу.",
-  );
+  try {
+    const externalUrl = new URL(`${url.replace(/\/$/, "")}/browse/README.md`);
 
-  return externalUrl.toString();
+    externalUrl.searchParams.set("rev", "main");
+    externalUrl.searchParams.set(
+      "chatMessage",
+      "Это ИИ-ассистент, который поможет тебе решить задачу.",
+    );
+
+    return externalUrl.toString();
+  } catch (error) {
+    console.error("group_tournament: invalid repo url", url, error);
+    return null;
+  }
 };
 
 const formatInsertedAtTooltip = (insertedAt) => {
@@ -48,6 +57,7 @@ const findBestRunId = (items) => {
 function EvolutionPanel({ items, tournamentStatus, runId, setRunId, repoUrl }) {
   const bestRunId = findBestRunId(items);
   const [hoverTooltip, setHoverTooltip] = useState(null);
+  const externalUrl = tournamentStatus !== "finished" ? getExternalUrl(repoUrl) : null;
 
   return (
     <>
@@ -73,9 +83,9 @@ function EvolutionPanel({ items, tournamentStatus, runId, setRunId, repoUrl }) {
             scrollbarGutter: "stable",
           }}
         >
-          {tournamentStatus !== "finished" && repoUrl && (
+          {externalUrl && (
             <a
-              href={getExternalUrl(repoUrl)}
+              href={externalUrl}
               target="_blank"
               rel="noopener noreferrer"
               className="d-block text-decoration-none mb-3"

apps/codebattle/assets/js/widgets/pages/groupTournament/Header.jsx

@@ -10,11 +10,11 @@ const statusBadge = {
 };
 
 function TournamentTimer({ groupTournament }) {
-  const startedAt = groupTournament?.startedAt;
+  const roundStartedAt = groupTournament?.lastRoundStartedAt || groupTournament?.startedAt;
   const timeoutSeconds = groupTournament?.roundTimeoutSeconds;
   const endsAt =
-    startedAt && Number.isInteger(timeoutSeconds)
-      ? moment.utc(startedAt).add(timeoutSeconds, "seconds")
+    roundStartedAt && Number.isInteger(timeoutSeconds)
+      ? moment.utc(roundStartedAt).add(timeoutSeconds, "seconds")
       : null;
 
   const [time, seconds] = useTimer(endsAt);

apps/codebattle/lib/codebattle_web/channels/group_tournament_channel.ex

@@ -3,11 +3,13 @@ defmodule CodebattleWeb.GroupTournamentChannel do
   use CodebattleWeb, :channel
 
   alias Codebattle.ExternalPlatformInvite.Context, as: InviteContext
+  alias Codebattle.GroupTask.Context, as: GroupTaskContext
   alias Codebattle.GroupTournament.Context, as: GroupTournamentContext
   alias Codebattle.GroupTournament.Server, as: GroupTournamentServer
   alias Codebattle.PubSub.Message
   alias Codebattle.UserGroupTournament.Context, as: UserGroupTournamentContext
   alias Codebattle.Workers.PlatformInviteAdvancerWorker
+  alias Runner.Languages
 
   def join("group_tournament:" <> tournament_id, _payload, socket) do
     case parse_tournament_id(tournament_id) do
@@ -58,7 +60,8 @@ defmodule CodebattleWeb.GroupTournamentChannel do
        require_invitation: true,
        run_on_external_platform: group_tournament.run_on_external_platform,
        platform_error: platform_error,
-       external_setup: serialize_external_setup(external_setup, user, group_tournament)
+       external_setup: serialize_external_setup(external_setup, user, group_tournament),
+       snapshot: build_snapshot(group_tournament, user)
      }, socket}
   end
 
@@ -71,10 +74,55 @@ defmodule CodebattleWeb.GroupTournamentChannel do
        invite: %{state: "accepted"},
        require_invitation: false,
        run_on_external_platform: group_tournament.run_on_external_platform,
-       external_setup: serialize_external_setup(external_setup, current_user, group_tournament)
+       external_setup: serialize_external_setup(external_setup, current_user, group_tournament),
+       snapshot: build_snapshot(group_tournament, current_user)
      }, socket}
   end
 
+  defp build_snapshot(group_tournament, current_user) do
+    player_ids = Enum.map(group_tournament.players, & &1.user_id)
+
+    latest_solutions =
+      GroupTaskContext.list_latest_solutions(group_tournament.group_task_id, player_ids,
+        group_tournament_id: group_tournament.id
+      )
+
+    current_user_solutions =
+      GroupTaskContext.list_user_solutions(group_tournament.group_task_id, current_user.id,
+        group_tournament_id: group_tournament.id
+      )
+
+    current_player = Enum.find(group_tournament.players, &(&1.user_id == current_user.id))
+
+    %{
+      group_tournament: GroupTournamentContext.serialize_group_tournament(group_tournament),
+      current_player: serialize_player(current_player),
+      players: Enum.map(group_tournament.players, &serialize_player/1),
+      latest_solutions: Map.new(latest_solutions, &{&1.user_id, serialize_solution(&1)}),
+      solution_history: Enum.map(current_user_solutions, &serialize_solution/1),
+      latest_solution: current_user_solutions |> List.first() |> serialize_solution(),
+      runs:
+        group_tournament
+        |> GroupTournamentContext.list_runs(limit: :infinity)
+        |> Enum.map(&GroupTournamentContext.serialize_run/1),
+      langs: Languages.get_langs()
+    }
+  end
+
+  defp serialize_player(nil), do: nil
+
+  defp serialize_player(player) do
+    %{
+      id: player.id,
+      user_id: player.user_id,
+      name: player.user && player.user.name,
+      lang: player.lang,
+      state: player.state,
+      last_setup_at: player.last_setup_at,
+      inserted_at: player.inserted_at
+    }
+  end
+
   def handle_in("request_invite_update", _, socket) do
     current_user = socket.assigns.current_user