Add comments to tasks

Author: vtm9

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

@@ -13,24 +13,25 @@ defmodule Codebattle.Task do
 
   @derive {Jason.Encoder,
            only: [
+             :arguments_generator,
+             :asserts,
+             :asserts_examples,
+             :comment,
+             :creator_id,
+             :description_en,
+             :description_ru,
+             :examples,
+             :generator_lang,
              :id,
-             :name,
+             :input_signature,
              :level,
-             :examples,
-             :description_ru,
-             :description_en,
-             :tags,
-             :state,
+             :name,
              :origin,
-             :visibility,
-             :creator_id,
-             :input_signature,
              :output_signature,
-             :asserts,
-             :asserts_examples,
              :solution,
-             :arguments_generator,
-             :generator_lang
+             :state,
+             :tags,
+             :visibility
            ]}
 
   @level_order %{
@@ -62,6 +63,7 @@ defmodule Codebattle.Task do
     field(:description_en, :string)
     field(:name, :string)
     field(:level, :string)
+    field(:comment, :string)
     field(:input_signature, {:array, AtomizedMap}, default: [])
     field(:output_signature, AtomizedMap, default: %{})
     field(:asserts_examples, {:array, AtomizedMap}, default: [])
@@ -84,23 +86,24 @@ defmodule Codebattle.Task do
   def changeset(struct, params \\ %{}) do
     struct
     |> cast(params, [
-      :examples,
+      :arguments_generator,
       :asserts,
-      :description_ru,
+      :comment,
+      :creator_id,
       :description_en,
-      :name,
-      :level,
-      :input_signature,
-      :output_signature,
+      :description_ru,
       :disabled,
-      :tags,
-      :state,
+      :examples,
+      :generator_lang,
+      :input_signature,
+      :level,
+      :name,
       :origin,
-      :visibility,
-      :creator_id,
+      :output_signature,
       :solution,
-      :arguments_generator,
-      :generator_lang
+      :state,
+      :tags,
+      :visibility
     ])
     |> validate_required([:examples, :description_en, :name, :level, :asserts])
     |> validate_inclusion(:state, @states)
@@ -116,22 +119,24 @@ defmodule Codebattle.Task do
     |> Codebattle.Repo.insert!(
       on_conflict: [
         set: [
+          arguments_generator: Map.get(params, :arguments_generator, ""),
+          asserts: params.asserts,
+          asserts_examples: Map.get(params, :asserts_examples, []),
+          comment: Map.get(params, :comment),
+          conflict: params.conflict,
           creator_id: params[:creator_id],
-          origin: params.origin,
-          state: params.state,
-          visibility: params.visibility,
-          examples: params.examples,
           description_en: params.description_en,
           description_ru: params.description_ru,
-          level: params.level,
+          examples: params.examples,
+          generator_lang: Map.get(params, :generator_lang, "js"),
           input_signature: params.input_signature,
+          level: params.level,
+          origin: params.origin,
           output_signature: params.output_signature,
-          asserts: params.asserts,
-          asserts_examples: Map.get(params, :asserts_examples, []),
           solution: Map.get(params, :solution, ""),
-          arguments_generator: Map.get(params, :arguments_generator, ""),
-          generator_lang: Map.get(params, :generator_lang, "js"),
-          tags: params.tags
+          state: params.state,
+          tags: params.tags,
+          visibility: params.visibility
         ]
       ],
       conflict_target: :name
@@ -233,6 +238,7 @@ defmodule Codebattle.Task do
       name: "",
       description_ru: "",
       description_en: "",
+      comment: "",
       level: "elementary",
       input_signature: [],
       output_signature: %{

services/app/apps/codebattle/lib/codebattle/tournament/strategy/swiss.ex

@@ -9,19 +9,12 @@ defmodule Codebattle.Tournament.Swiss do
 
   @impl Tournament.Base
   def complete_players(tournament) do
-    if rem(players_count(tournament), 2) == 0 do
-      tournament
+    # just for the UI test
+    if false do
+      bots = Bot.Context.build_list(111)
+      add_players(tournament, %{users: bots})
     else
-      bot = Tournament.Player.new!(Bot.Context.build())
-      # bots = Bot.Context.build_list(11)
-      # add_players(tournament, %{users: bots})
-
-      Codebattle.PubSub.broadcast("tournament:player:joined", %{
-        tournament: tournament,
-        player: bot
-      })
-
-      add_players(tournament, %{users: [bot]})
+      tournament
     end
   end
 
@@ -55,16 +48,28 @@ defmodule Codebattle.Tournament.Swiss do
 
   @impl Tournament.Base
   def build_round_pairs(tournament) do
-    tournament
-    |> get_players()
-    |> Enum.map(&{&1.id, &1.score})
-    |> Tournament.PairBuilder.ByScore.call()
+    {player_pair_ids, unmatched_player_ids} =
+      tournament
+      |> get_players()
+      |> Enum.filter(&(&1.state == "active"))
+      |> Enum.map(&{&1.id, &1.score})
+      |> Tournament.PairBuilder.ByScore.call()
+
+    opponent_bot = Bot.Context.build() |> Tournament.Player.new!()
+
+    unmatched =
+      unmatched_player_ids
+      |> Enum.map(fn id ->
+        [get_player(tournament, id), opponent_bot]
+      end)
 
-    {player_pairs, new_played_pair_ids} = build_player_pairs(tournament)
+    played_pair_ids = []
 
     {
-      update_struct(tournament, %{played_pair_ids: new_played_pair_ids}),
-      player_pairs
+      update_struct(tournament, %{played_pair_ids: played_pair_ids}),
+      player_pair_ids
+      |> Enum.map(&get_players(tournament, &1))
+      |> Enum.concat(unmatched)
     }
   end
 

services/app/apps/codebattle/priv/repo/migrations/20250214115849_add_comment_to_task.exs

@@ -0,0 +1,9 @@
+defmodule Codebattle.Repo.Migrations.AddCommentToTask do
+  use Ecto.Migration
+
+  def change do
+    alter table(:tasks) do
+      add(:comment, :string)
+    end
+  end
+end

services/app/apps/runner/lib/runner/languages.ex

@@ -30,6 +30,7 @@ defmodule Runner.Languages do
       def solution(<%= arguments %>)
         <%= return_statement %>
       end
+      # <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %>", delimiter: ", "},
       return_template: "<%= default_value %>",
@@ -66,6 +67,7 @@ defmodule Runner.Languages do
       const solution = (<%= arguments %>) => {
         <%= return_statement %>
       };
+      // <%= comment %>
 
       module.exports = solution;
       """,
@@ -112,6 +114,8 @@ defmodule Runner.Languages do
 
       };
 
+      // <%= comment %>
+
       export default solution;
       """,
       arguments_template: %{argument: "<%= name %>: <%= type %>", delimiter: ", "},
@@ -145,6 +149,7 @@ defmodule Runner.Languages do
       <%= expected %>solution(<%= arguments %>) {
 
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= type %> <%= name %>", delimiter: ", "},
       expected_template: "<%= type %> ",
@@ -180,6 +185,7 @@ defmodule Runner.Languages do
       <%= expected %> solution(<%= arguments %>) {
         <%= return_statement %>
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= type %> <%= name %>", delimiter: ", "},
       return_template: "return <%= default_value %>;",
@@ -232,6 +238,7 @@ defmodule Runner.Languages do
 
         }
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= type %> <%= name %>", delimiter: ", "},
       expected_template: "<%= type %> ",
@@ -274,6 +281,7 @@ defmodule Runner.Languages do
       fun solution(<%= arguments %>):<%= expected %> {
 
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %>: <%= type %>", delimiter: ", "},
       expected_template: " <%= type %>",
@@ -322,6 +330,7 @@ defmodule Runner.Languages do
           }
         }
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= type %> <%= name %>", delimiter: ", "},
       expected_template: " <%= type %>",
@@ -364,6 +373,7 @@ defmodule Runner.Languages do
       func solution(<%= arguments %>)<%= expected %> {
 
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %> <%= type %>", delimiter: ", "},
       expected_template: " <%= type %>",
@@ -400,6 +410,7 @@ defmodule Runner.Languages do
           <%= return_statement %>
         end
       end
+      # <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %>", delimiter: ", "},
       return_template: "<%= default_value %>",
@@ -434,6 +445,7 @@ defmodule Runner.Languages do
 
       def solution(<%= arguments %>)<%= expected %>:
         <%= return_statement %>
+      # <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %>: <%= type %>", delimiter: ", "},
       expected_template: " -> <%= type %>",
@@ -478,6 +490,7 @@ defmodule Runner.Languages do
       function solution(<%= arguments %>) {
         <%= return_statement %>
       }
+      // <%= comment %>
       """,
       return_template: "return <%= default_value %>;",
       arguments_template: %{argument: "<%= type %> $<%= name %>", delimiter: ", "},
@@ -525,6 +538,7 @@ defmodule Runner.Languages do
       (defn solution [<%= arguments %>]
         <%= return_statement %>
       )
+      ; <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %>", delimiter: " "},
       return_template: "<%= default_value %>",
@@ -586,6 +600,7 @@ defmodule Runner.Languages do
         vector
         vector-algorithms
       -}
+      -- <%= comment %>
       """,
       typespec_template: %{argument: "<%= type %>", delimiter: " -> "},
       arguments_template: %{argument: "<%= name %>", delimiter: " "},
@@ -628,6 +643,7 @@ defmodule Runner.Languages do
       pub fn solution(<%= arguments %>) -> <%= expected %> {
 
       }
+      // <%= comment %>
       """,
       arguments_template: %{argument: "<%= name %>: <%= type %>", delimiter: ", "},
       expected_template: "<%= type %>",

services/app/apps/runner/lib/runner/solution_generator.ex

@@ -6,7 +6,13 @@ defmodule Runner.SolutionGenerator do
   @spec call(Runner.Task.t(), Runner.LanguageMeta.t()) :: String.t()
   def call(task, lang_meta) do
     binding =
-      %{arguments: [], expected_type: "", return_statement: "", typespec: "lal"}
+      %{
+        arguments: [],
+        expected_type: "",
+        return_statement: "",
+        typespec: "lal",
+        comment: task.comment || "use stdout to debug"
+      }
       |> add_arguments(lang_meta, task.input_signature)
       |> add_typespec(lang_meta, task.input_signature)
       |> add_expected(lang_meta, task.output_signature)

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

@@ -9,9 +9,10 @@ defmodule Runner.Task do
 
   @type t :: %__MODULE__{}
 
-  @fields [:input_signature, :output_signature, :asserts, :asserts_examples]
+  @fields [:comment, :input_signature, :output_signature, :asserts, :asserts_examples]
   @primary_key false
   embedded_schema do
+    field(:comment, :string, default: "use stdout to debug")
     field(:input_signature, {:array, AtomizedMap}, default: [])
     field(:output_signature, AtomizedMap, default: %{})
     field(:asserts, {:array, AtomizedMap}, default: [])