Improve tournaments

Author: vtm9

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

@@ -282,6 +282,10 @@ export const restartTournament = () => {
   channel.push("tournament:restart", {});
 };
 
+export const retryTournament = () => {
+  channel.push("tournament:retry", {});
+};
+
 export const startRoundTournament = () => {
   channel.push("tournament:start_round", {});
 };

apps/codebattle/assets/js/widgets/pages/game/EditorContainer.jsx

@@ -94,7 +94,9 @@ function EditorContainer({
   const isPremium = useSelector(selectors.currentUserIsPremiumSelector);
   const gameId = useSelector(selectors.gameIdSelector);
   const gameMode = useSelector(selectors.gameModeSelector);
-  const { tournamentId, startsAt } = useSelector(selectors.gameStatusSelector);
+  const { tournamentId, startsAt, hideBannedPlayerControls } = useSelector(
+    selectors.gameStatusSelector,
+  );
   const subscriptionType = useSelector(selectors.subscriptionTypeSelector);
 
   const currentUserId = useSelector(selectors.currentUserIdSelector);
@@ -214,6 +216,7 @@ function EditorContainer({
     isAdmin,
     isPremium,
     actionBtnsProps,
+    hideToolbarControls: hideBannedPlayerControls,
     ...userSettings,
   };
 

apps/codebattle/assets/js/widgets/pages/game/EditorToolbar.jsx

@@ -40,6 +40,7 @@ function EditorToolbar({
   langPickerStatus,
   actionBtnsProps,
   showControlBtns,
+  hideToolbarControls = false,
   isAdmin = false,
   isHistory = false,
 }) {
@@ -53,16 +54,18 @@ function EditorToolbar({
         <div className={toolbarClassNames} role="toolbar">
           <div className="d-flex justify-content-between">
             <div className={editorSettingClassNames} role="group" aria-label="Editor settings">
-              <LanguagePicker editor={editor} status={langPickerStatus} />
+              {!hideToolbarControls && <LanguagePicker editor={editor} status={langPickerStatus} />}
             </div>
-            {showControlBtns && !isHistory && <ModeButtons player={player} />}
+            {showControlBtns && !isHistory && !hideToolbarControls && (
+              <ModeButtons player={player} />
+            )}
           </div>
 
           <div className="d-flex justify-content-between">
-            {showControlBtns && !isHistory && editorState !== "banned" && (
+            {showControlBtns && !isHistory && !hideToolbarControls && editorState !== "banned" && (
               <GameActionButtons {...actionBtnsProps} />
             )}
-            {!showControlBtns && (
+            {!showControlBtns && !hideToolbarControls && (
               <div className="py-2" role="group" aria-label="Report actions">
                 <GameReportButton userId={player.id} gameId={gameId} />
                 {isAdmin && (

apps/codebattle/assets/js/widgets/pages/tournament/EditTournament.jsx

@@ -198,6 +198,8 @@ function EditTournament({ tournamentId, taskPackNames = [], userTimezone = "UTC"
     break_duration_seconds: tournament.breakDurationSeconds || 42,
     use_chat: tournament.useChat !== undefined ? tournament.useChat : true,
     use_clan: tournament.useClan !== undefined ? tournament.useClan : false,
+    exclude_banned_players:
+      tournament.excludeBannedPlayers !== undefined ? tournament.excludeBannedPlayers : false,
     ranking_type: tournament.rankingType || "by_user",
     score_strategy: tournament.scoreStrategy || "75_percentile",
     meta_json: tournament.meta ? JSON.stringify(tournament.meta, null, 2) : "{}",

apps/codebattle/assets/js/widgets/pages/tournament/TournamentForm.jsx

@@ -74,6 +74,10 @@ function TournamentForm({
     break_duration_seconds: initialValues.break_duration_seconds || 42,
     use_chat: initialValues.use_chat !== undefined ? initialValues.use_chat : true,
     use_clan: initialValues.use_clan !== undefined ? initialValues.use_clan : false,
+    exclude_banned_players:
+      initialValues.exclude_banned_players !== undefined
+        ? initialValues.exclude_banned_players
+        : false,
     ranking_type: initialValues.ranking_type || "by_user",
     score_strategy: initialValues.score_strategy || "75_percentile",
     meta_json: initialValues.meta_json || "{}",
@@ -283,6 +287,20 @@ function TournamentForm({
                 Use Clan
               </label>
             </div>
+
+            <div className="form-check">
+              <input
+                type="checkbox"
+                id="exclude_banned_players"
+                name="exclude_banned_players"
+                className="form-check-input"
+                checked={formData.exclude_banned_players}
+                onChange={handleChange}
+              />
+              <label htmlFor="exclude_banned_players" className="form-check-label text-white">
+                Exclude Banned Players
+              </label>
+            </div>
           </div>
         </div>
       </div>
@@ -651,6 +669,7 @@ TournamentForm.propTypes = {
     break_duration_seconds: PropTypes.number,
     use_chat: PropTypes.bool,
     use_clan: PropTypes.bool,
+    exclude_banned_players: PropTypes.bool,
     ranking_type: PropTypes.string,
     score_strategy: PropTypes.string,
     meta_json: PropTypes.string,

apps/codebattle/assets/js/widgets/pages/tournament/TournamentMainControlButtons.jsx

@@ -12,6 +12,7 @@ import CustomEventStylesContext from "@/components/CustomEventStylesContext";
 import {
   cancelTournament,
   restartTournament as handleRestartTournament,
+  retryTournament as handleRetryTournament,
   finishRoundTournament as handleFinishRoundTournament,
   openUpTournament as handleOpenUpTournament,
   showTournamentResults as handleShowResults,
@@ -50,6 +51,7 @@ function TournamentMainControlButtons({
   const confirmBtnRef = useRef(null);
   const hasCustomEventStyle = useContext(CustomEventStylesContext);
   const [restartConfirmationModalShowing, setRestartConfirmationModalShowing] = useState(false);
+  const [retryConfirmationModalShowing, setRetryConfirmationModalShowing] = useState(false);
 
   const handleStartTournament = useCallback(() => {
     handleStartRound("firstRound");
@@ -70,6 +72,16 @@ function TournamentMainControlButtons({
     handleRestartTournament();
     closeRestartConfirmationModal();
   }, [closeRestartConfirmationModal]);
+  const openRetryConfirmationModal = useCallback(() => {
+    setRetryConfirmationModalShowing(true);
+  }, []);
+  const closeRetryConfirmationModal = useCallback(() => {
+    setRetryConfirmationModalShowing(false);
+  }, []);
+  const confirmRetryTournament = useCallback(() => {
+    handleRetryTournament();
+    closeRetryConfirmationModal();
+  }, [closeRetryConfirmationModal]);
 
   const restartBtnClassName = cn(
     "btn text-nowrap ml-lg-2 rounded-left btn-secondary cb-btn-secondary",
@@ -126,6 +138,33 @@ function TournamentMainControlButtons({
           </div>
         </Modal.Footer>
       </Modal>
+      <Modal
+        show={retryConfirmationModalShowing}
+        onHide={closeRetryConfirmationModal}
+        contentClassName="cb-bg-panel cb-text"
+      >
+        <Modal.Header className="cb-border-color" closeButton>
+          <Modal.Title>Retry tournament</Modal.Title>
+        </Modal.Header>
+        <Modal.Body className="cb-border-color">
+          <div className="d-flex flex-column">
+            <h4 className="mb-3">Are you sure you want to retry this tournament?</h4>
+            <p className="mb-0 text-muted">
+              This will clear tournament games and results, then restore the current player roster.
+            </p>
+          </div>
+        </Modal.Body>
+        <Modal.Footer className="cb-border-color">
+          <div className="d-flex justify-content-between w-100">
+            <Button onClick={closeRetryConfirmationModal} className={cancelBtnClassName}>
+              Cancel
+            </Button>
+            <Button onClick={confirmRetryTournament} className={confirmBtnClassName}>
+              Retry tournament
+            </Button>
+          </div>
+        </Modal.Footer>
+      </Modal>
       {!streamMode && (
         <>
           {canStartRound ? (
@@ -235,6 +274,16 @@ function TournamentMainControlButtons({
             <FontAwesomeIcon className="mr-2" icon="cog" />
             Tournament details
           </Dropdown.Item>
+          <Dropdown.Item
+            as="button"
+            disabled={disabled}
+            key="retry"
+            className="cb-dropdown-item"
+            onSelect={openRetryConfirmationModal}
+          >
+            <FontAwesomeIcon className="mr-2" icon="redo" />
+            Retry
+          </Dropdown.Item>
           <Dropdown.Item
             as="button"
             disabled={disabled}

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

@@ -107,6 +107,7 @@ export const defaultGameStatusState = {
   timeoutSeconds: null,
   durationSec: null,
   finishesAt: null,
+  hideBannedPlayerControls: false,
   rematchState: null,
   rematchInitiatorId: null,
   checking: {},

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

@@ -11,6 +11,7 @@ export const getGameStatus = ({
   timeoutSeconds,
   durationSec,
   finishesAt,
+  hideBannedPlayerControls,
   rematchState,
   tournamentId,
   rematchInitiatorId,
@@ -25,6 +26,7 @@ export const getGameStatus = ({
   timeoutSeconds,
   durationSec,
   finishesAt,
+  hideBannedPlayerControls,
   rematchState,
   rematchInitiatorId,
   tournamentId,

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

@@ -7,7 +7,9 @@ defmodule Codebattle.Tournament.Context do
   alias Codebattle.Game
   alias Codebattle.Repo
   alias Codebattle.Tournament
+  alias Codebattle.Tournament.Round
   alias Codebattle.User
+  alias Codebattle.UserGameReport
   alias Runner.AtomizedMap
 
   @type tournament_id :: pos_integer() | String.t()
@@ -354,6 +356,23 @@ defmodule Codebattle.Tournament.Context do
     :ok
   end
 
+  @spec retry(Tournament.t()) :: :ok
+  def retry(tournament) do
+    tournament_info = Tournament.Server.get_tournament_info(tournament.id)
+
+    Game.Context.terminate_tournament_games(tournament.id)
+
+    :timer.sleep(59)
+
+    Tournament.GlobalSupervisor.terminate_tournament(tournament.id)
+    drop_tournament_tables(tournament_info)
+    clear_tournament_info_cache(tournament.id)
+    clear_tournament_history(tournament.id)
+    Tournament.GlobalSupervisor.start_tournament(tournament)
+    Codebattle.PubSub.broadcast("tournament:restarted", %{tournament: tournament})
+    :ok
+  end
+
   @spec move_upcoming_to_live(Tournament.t()) :: :ok
   def move_upcoming_to_live(tournament) do
     tournament =
@@ -500,6 +519,14 @@ defmodule Codebattle.Tournament.Context do
     end)
   end
 
+  defp clear_tournament_history(tournament_id) do
+    Repo.delete_all(from(ugr in UserGameReport, where: ugr.tournament_id == ^tournament_id))
+    Tournament.TournamentResult.clean_results(tournament_id)
+    Tournament.TournamentUserResult.clean_results(tournament_id)
+    Repo.delete_all(from(g in Game, where: g.tournament_id == ^tournament_id))
+    Repo.delete_all(from(r in Round, where: r.tournament_id == ^tournament_id))
+  end
+
   def mark_as_live(tournament), do: Map.put(tournament, :is_live, true)
 
   defp get_module(%{type: "top200"}), do: Tournament.Top200

apps/codebattle/lib/codebattle/tournament/strategy/base.ex

@@ -48,6 +48,12 @@ defmodule Codebattle.Tournament.Base do
         Enum.reduce(users, tournament, &add_player(&2, &1))
       end
 
+      defp maybe_add_player_clan(tournament, player) do
+        if tournament.use_clan do
+          Tournament.Clans.add_players_clan(tournament, player)
+        end
+      end
+
       def join(%{state: "waiting_participants"} = tournament, %{users: users} = params) do
         player_params = Map.delete(params, :users)
         Enum.reduce(users, tournament, &join(&2, Map.put(player_params, :user, &1)))
@@ -318,6 +324,46 @@ defmodule Codebattle.Tournament.Base do
 
       def restart(tournament, _user), do: tournament
 
+      def retry(tournament, %{user: user}) do
+        if can_moderate?(tournament, user) do
+          Tournament.Round.disable_all_rounds(tournament.id)
+
+          reset_players = reset_players_for_retry(tournament)
+
+          Enum.each(reset_players, fn player ->
+            Tournament.Players.put_player(tournament, player)
+            Tournament.Ranking.add_new_player(tournament, player)
+            maybe_add_player_clan(tournament, player)
+          end)
+
+          tournament
+          |> update_struct(%{
+            meta: reset_meta(tournament.meta),
+            matches: %{},
+            break_state: "off",
+            cheater_ids: [],
+            players_count: Enum.count(reset_players),
+            current_round_position: 0,
+            current_round: nil,
+            current_round_id: nil,
+            last_round_ended_at: nil,
+            last_round_started_at: nil,
+            finished_at: nil,
+            started_at: nil,
+            starts_at: :second |> DateTime.utc_now() |> DateTime.add(300, :second),
+            winner_ids: [],
+            top_player_ids: [],
+            state: "waiting_participants"
+          })
+          |> db_save!(:with_ets)
+          |> tap(&broadcast_tournament_update/1)
+        else
+          tournament
+        end
+      end
+
+      def retry(tournament, _user), do: tournament
+
       def start(tournament, params \\ %{})
 
       def start(%{state: "waiting_participants"} = tournament, %{user: user} = params) do
@@ -798,6 +844,33 @@ defmodule Codebattle.Tournament.Base do
         tournament
       end
 
+      defp reset_players_for_retry(tournament) do
+        tournament.players
+        |> Map.values()
+        |> Enum.reject(& &1.is_bot)
+        |> Enum.map(&reset_player_for_retry/1)
+      end
+
+      defp reset_player_for_retry(player) do
+        player
+        |> Map.merge(%{
+          draw_index: 1,
+          last_ranked_round_position: -1,
+          matches_ids: [],
+          max_draw_index: 0,
+          place: 0,
+          rank: 5432,
+          rating: 1200,
+          score: 0,
+          state: "active",
+          task_ids: [],
+          total_duration_sec: 0,
+          wins_count: 0,
+          wr_joined_at: nil
+        })
+        |> Tournament.Player.new!()
+      end
+
       defp recalculate_player_wins_count(tournament) do
         wins_count_by_user = Tournament.TournamentResult.get_wins_count_by_user(tournament)