Fix group tasks

Author: vtm9

apps/codebattle/assets/js/socket.js

@@ -74,6 +74,7 @@ export const channelTopics = {
   tournamentPlayerFinishedTopic: "tournament:player:finished",
   tournamentActivated: "tournament:activated",
   tournamentCanceled: "tournament:canceled",
+  groupTournamentRunUpdated: "group_tournament:run_updated",
   deployHandoffStarted: "deploy:handoff_started",
   deployHandoffDone: "deploy:handoff_done",
   deployHandoffFailed: "deploy:handoff_failed",

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

@@ -1,6 +1,6 @@
 import { camelizeKeys } from "humps";
 
-import { channelMethods } from "../../socket";
+import { channelMethods, channelTopics } from "../../socket";
 import { actions } from "../slices";
 
 import Channel from "./Channel";
@@ -12,7 +12,7 @@ export const setTournamentChannel = (tournamentId) => {
   return channel.setupChannel(newChannelName);
 };
 
-export const connectToTournament = () => (dispatch) => {
+export const connectToTournament = (currentUserId) => (dispatch) => {
   if (!channel) {
     console.error("Channel not initialized");
     return;
@@ -65,6 +65,29 @@ export const connectToTournament = () => (dispatch) => {
 
   channel.join().receive("ok", onJoinSuccess).receive("error", onJoinFailure);
 
+  const handleRunUpdated = (response) => {
+    const latestSolutionEntry = response.solution || null;
+    const currentUserSolution =
+      latestSolutionEntry && latestSolutionEntry.userId === currentUserId
+        ? latestSolutionEntry
+        : null;
+
+    dispatch(
+      actions.applyRunUpdate({
+        groupTournament: response.groupTournament,
+        run: response.run,
+        latestSolutionEntry,
+        solution: currentUserSolution,
+      }),
+    );
+
+    if (response.run?.id) {
+      dispatch(actions.addLog(`Run #${response.run.id} ${response.run.status}`));
+    }
+  };
+
+  channel.addListener(channelTopics.groupTournamentRunUpdated, handleRunUpdated);
+
   return channel;
 };
 

apps/codebattle/assets/js/widgets/slices/groupTournament.js

@@ -64,6 +64,39 @@ const groupTournament = createSlice({
     setData: (state, { payload }) => {
       state.data = payload;
     },
+    applyRunUpdate: (state, { payload }) => {
+      const { groupTournament, run, solution, latestSolutionEntry } = payload;
+
+      state.data = state.data || {};
+
+      if (groupTournament) {
+        state.data.groupTournament = {
+          ...(state.data.groupTournament || {}),
+          ...groupTournament,
+        };
+      }
+
+      if (run) {
+        const currentRuns = state.data.runs || [];
+        state.data.runs = [run, ...currentRuns.filter((item) => item.id !== run.id)];
+      }
+
+      if (latestSolutionEntry) {
+        state.data.latestSolutions = {
+          ...(state.data.latestSolutions || {}),
+          [latestSolutionEntry.userId]: latestSolutionEntry,
+        };
+      }
+
+      if (solution) {
+        const currentHistory = state.data.solutionHistory || [];
+        state.data.solutionHistory = [
+          solution,
+          ...currentHistory.filter((item) => item.id !== solution.id),
+        ];
+        state.data.latestSolution = solution;
+      }
+    },
     resetGroupTournament: () => initialState,
   },
 });

apps/codebattle/assets/js/widgets/utils/useGroupTournamentChannel.js

@@ -1,11 +1,14 @@
 import { useEffect } from "react";
 
 import { useDispatch } from "react-redux";
+import { useSelector } from "react-redux";
 
 import * as TournamentActions from "../middlewares/GroupTournament";
+import * as selectors from "../selectors";
 
 const useGroupTournamentChannel = (tournamentId) => {
   const dispatch = useDispatch();
+  const currentUserId = useSelector(selectors.currentUserIdSelector);
 
   useEffect(() => {
     if (!tournamentId) {
@@ -20,11 +23,11 @@ const useGroupTournamentChannel = (tournamentId) => {
       }
     };
 
-    TournamentActions.connectToTournament()(dispatch);
+    TournamentActions.connectToTournament(currentUserId)(dispatch);
 
     return clearTournamentChannel;
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch, tournamentId]);
+  }, [currentUserId, dispatch, tournamentId]);
 };
 
 export default useGroupTournamentChannel;

apps/codebattle/lib/codebattle/group_task.ex

@@ -5,9 +5,7 @@ defmodule Codebattle.GroupTask do
 
   import Ecto.Changeset
 
-  alias Codebattle.GroupTaskRun
   alias Codebattle.GroupTaskSolution
-  alias Codebattle.GroupTaskToken
 
   @type t :: %__MODULE__{}
 
@@ -16,9 +14,7 @@ defmodule Codebattle.GroupTask do
     field(:runner_url, :string)
     field(:time_to_solve_sec, :integer)
 
-    has_many(:runs, GroupTaskRun)
     has_many(:solutions, GroupTaskSolution)
-    has_many(:tokens, GroupTaskToken)
 
     timestamps()
   end