Merge branch 'master' into enhancement/answers-and-assessment

Author: sayomaki

lib/cadet/courses/assessment_config.ex

@@ -12,7 +12,8 @@ defmodule Cadet.Courses.AssessmentConfig do
     field(:type, :string)
     field(:show_grading_summary, :boolean, default: true)
     field(:is_manually_graded, :boolean, default: true)
-    # used by fronend to determine display styles
+    field(:has_token_counter, :boolean, default: false)
+    # used by frontend to determine display styles
     field(:early_submission_xp, :integer, default: 0)
     field(:hours_before_early_xp_decay, :integer, default: 0)
 
@@ -23,7 +24,7 @@ defmodule Cadet.Courses.AssessmentConfig do
 
   @required_fields ~w(course_id)a
   @optional_fields ~w(order type early_submission_xp
-    hours_before_early_xp_decay show_grading_summary is_manually_graded)a
+    hours_before_early_xp_decay show_grading_summary is_manually_graded has_token_counter)a
 
   def changeset(assessment_config, params) do
     assessment_config

lib/cadet_web/admin_views/admin_courses_view.ex

@@ -12,6 +12,7 @@ defmodule CadetWeb.AdminCoursesView do
       displayInDashboard: :show_grading_summary,
       isManuallyGraded: :is_manually_graded,
       earlySubmissionXp: :early_submission_xp,
+      hasTokenCounter: :has_token_counter,
       hoursBeforeEarlyXpDecay: :hours_before_early_xp_decay
     })
   end

lib/cadet_web/helpers/assessments_helpers.ex

@@ -180,7 +180,7 @@ defmodule CadetWeb.AssessmentsHelpers do
           solutionTemplate: "template",
           contestEntries:
             &Enum.map(&1[:contest_entries], fn entry -> build_contest_entry(entry) end),
-          contestLeaderboard:
+          scoreLeaderboard:
             &Enum.map(&1[:contest_leaderboard], fn entry ->
               build_contest_leaderboard_entry(entry)
             end)

lib/cadet_web/views/user_view.ex

@@ -125,6 +125,7 @@ defmodule CadetWeb.UserView do
             type: :type,
             displayInDashboard: :show_grading_summary,
             isManuallyGraded: :is_manually_graded,
+            hasTokenCounter: :has_token_counter,
             earlySubmissionXp: :early_submission_xp,
             hoursBeforeEarlyXpDecay: :hours_before_early_xp_decay
           })

mix.lock

@@ -64,7 +64,7 @@
   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
-  "oban": {:hex, :oban, "2.17.3", "ddfd5710aadcd550d2e174c8d73ce5f1865601418cf54a91775f20443fb832b7", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "452eada8bfe0d0fefd0740ab5fa8cf3ef6c375df0b4a3c3805d179022a04738a"},
+  "oban": {:hex, :oban, "2.17.4", "3ebe79dc0cad16f23e5feea418f9bc5b07d453b8fb7caf376d812be96157a5c5", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "71a804abea3bb7e104782a5b5337cbab76c1a56b9689a6d5159a3873c93898b6"},
   "openid_connect": {:hex, :openid_connect, "0.2.2", "c05055363330deab39ffd89e609db6b37752f255a93802006d83b45596189c0b", [:mix], [{:httpoison, "~> 1.2", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "735769b6d592124b58edd0582554ce638524c0214cd783d8903d33357d74cc13"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},

priv/repo/migrations/20240206045330_add_has_token_counter_toggle_to_assessment_config.exs

@@ -0,0 +1,15 @@
+defmodule Cadet.Repo.Migrations.AddHasTokenCounterToggleToAssessmentConfig do
+  use Ecto.Migration
+
+  def up do
+    alter table(:assessment_configs) do
+      add(:has_token_counter, :boolean, null: false, default: false)
+    end
+  end
+
+  def down do
+    alter table(:assessment_configs) do
+      remove(:has_token_counter)
+    end
+  end
+end

test/cadet_web/admin_controllers/admin_courses_controller_test.exs

@@ -157,7 +157,8 @@ defmodule CadetWeb.AdminCoursesControllerTest do
           is_manually_graded: false,
           order: 2,
           type: "Mission2",
-          course: course
+          course: course,
+          has_token_counter: true
         })
 
       resp =
@@ -172,23 +173,26 @@ defmodule CadetWeb.AdminCoursesControllerTest do
           "displayInDashboard" => true,
           "isManuallyGraded" => true,
           "type" => "Mission1",
-          "assessmentConfigId" => config1.id
+          "assessmentConfigId" => config1.id,
+          "hasTokenCounter" => false
         },
         %{
           "earlySubmissionXp" => 200,
           "hoursBeforeEarlyXpDecay" => 48,
           "displayInDashboard" => false,
           "isManuallyGraded" => false,
           "type" => "Mission2",
-          "assessmentConfigId" => config2.id
+          "assessmentConfigId" => config2.id,
+          "hasTokenCounter" => true
         },
         %{
           "earlySubmissionXp" => 200,
           "hoursBeforeEarlyXpDecay" => 48,
           "displayInDashboard" => true,
           "isManuallyGraded" => true,
           "type" => "Mission3",
-          "assessmentConfigId" => config3.id
+          "assessmentConfigId" => config3.id,
+          "hasTokenCounter" => false
         }
       ]
 

test/cadet_web/controllers/assessments_controller_test.exs

@@ -445,7 +445,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
             |> Enum.zip(contests_entries)
             |> Enum.map(fn {question, contest_entries} ->
               question = Map.put(question, "contestEntries", contest_entries)
-              Map.put(question, "contestLeaderboard", [])
+              Map.put(question, "scoreLeaderboard", [])
             end)
 
           expected_questions =
@@ -540,7 +540,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
           |> json_response(200)
           |> Map.get("questions", [])
           |> Enum.find(&(&1["id"] == voting_question.id))
-          |> Map.get("contestLeaderboard")
+          |> Map.get("scoreLeaderboard")
 
         assert resp_leaderboard == expected_leaderboard
       end
@@ -612,7 +612,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
           |> json_response(200)
           |> Map.get("questions", [])
           |> Enum.find(&(&1["id"] == voting_question.id))
-          |> Map.get("contestLeaderboard")
+          |> Map.get("scoreLeaderboard")
 
         assert resp_leaderboard == expected_leaderboard
       end
@@ -672,7 +672,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
         |> json_response(200)
         |> Map.get("questions", [])
         |> Enum.find(&(&1["id"] == voting_question.id))
-        |> Map.get("contestLeaderboard")
+        |> Map.get("scoreLeaderboard")
 
       assert resp_leaderboard == expected_leaderboard
     end

test/cadet_web/controllers/user_controller_test.exs

@@ -122,23 +122,26 @@ defmodule CadetWeb.UserControllerTest do
             "isManuallyGraded" => true,
             "assessmentConfigId" => config1.id,
             "earlySubmissionXp" => 200,
-            "hoursBeforeEarlyXpDecay" => 48
+            "hoursBeforeEarlyXpDecay" => 48,
+            "hasTokenCounter" => false
           },
           %{
             "type" => "test type 2",
             "displayInDashboard" => true,
             "isManuallyGraded" => true,
             "assessmentConfigId" => config2.id,
             "earlySubmissionXp" => 200,
-            "hoursBeforeEarlyXpDecay" => 48
+            "hoursBeforeEarlyXpDecay" => 48,
+            "hasTokenCounter" => false
           },
           %{
             "type" => "test type 3",
             "displayInDashboard" => true,
             "isManuallyGraded" => true,
             "assessmentConfigId" => config3.id,
             "earlySubmissionXp" => 200,
-            "hoursBeforeEarlyXpDecay" => 48
+            "hoursBeforeEarlyXpDecay" => 48,
+            "hasTokenCounter" => false
           }
         ]
       }