Remove bonus xp

lib/cadet/assessments/assessments.ex

@@ -916,7 +916,7 @@
  raw_answer,
  force_submit
  ) do
  with {:ok, team} <- find_team(question.assessment.id, cr_id),
  {:ok, submission} <- find_or_create_submission(cr, question.assessment),
  {:status, true} <- {:status, force_submit or submission.status != :submitted},
  {:ok, _answer} <- insert_or_update_answer(submission, question, raw_answer, cr_id) do
@@ -1019,8 +1019,8 @@
 
  def finalise_submission(submission = %Submission{}) do
  with {:status, :attempted} <- {:status, submission.status},
- {:ok, updated_submission} <- update_submission_status_and_xp_bonus(submission) do
- # Couple with update_submission_status_and_xp_bonus to ensure notification is sent
+ {:ok, updated_submission} <- update_submission_status(submission) do
+ # Couple with update_submission_status and update_xp_bonus to ensure notification is sent
  Notifications.write_notification_when_student_submits(submission)
  # Send email notification to avenger
  %{notification_type: "assessment_submission", submission_id: updated_submission.id}
@@ -1029,6 +1029,7 @@
 
  # Begin autograding job
  GradingJob.force_grade_individual_submission(updated_submission)
+ update_xp_bonus(submission)
 
  {:ok, nil}
  else
@@ -1413,30 +1414,75 @@
  end
  end
 
- @spec update_submission_status_and_xp_bonus(Submission.t()) ::
+ @spec update_submission_status(Submission.t()) ::
  {:ok, Submission.t()} | {:error, Ecto.Changeset.t()}
- defp update_submission_status_and_xp_bonus(submission = %Submission{}) do
- assessment = submission.assessment
- assessment_conifg = Repo.get_by(AssessmentConfig, id: assessment.config_id)
+ defp update_submission_status(submission = %Submission{}) do
+ submission
+ |> Submission.changeset(%{status: :submitted, submitted_at: Timex.now()})
+ |> Repo.update()
+ end
 
- max_bonus_xp = assessment_conifg.early_submission_xp
- early_hours = assessment_conifg.hours_before_early_xp_decay
+ @spec update_xp_bonus(Submission.t()) ::
+ {:ok, Submission.t()} | {:error, Ecto.Changeset.t()}
+ defp update_xp_bonus(submission = %Submission{id: submission_id}) do
+ # to ensure backwards compatibility
+ if submission.xp_bonus == 0 do
+ assessment = submission.assessment
+ assessment_conifg = Repo.get_by(AssessmentConfig, id: assessment.config_id)
 
- xp_bonus =
- if Timex.before?(Timex.now(), Timex.shift(assessment.open_at, hours: early_hours)) do
- max_bonus_xp
- else
- # This logic interpolates from max bonus at early hour to 0 bonus at close time
- decaying_hours = Timex.diff(assessment.close_at, assessment.open_at, :hours) - early_hours
- remaining_hours = Enum.max([0, Timex.diff(assessment.close_at, Timex.now(), :hours)])
- proportion = if(decaying_hours > 0, do: remaining_hours / decaying_hours, else: 1)
- bonus_xp = round(max_bonus_xp * proportion)
- Enum.max([0, bonus_xp])
- end
+ max_bonus_xp = assessment_conifg.early_submission_xp
+ early_hours = assessment_conifg.hours_before_early_xp_decay
 
- submission
- |> Submission.changeset(%{status: :submitted, xp_bonus: xp_bonus})
- |> Repo.update()
+ ans_xp =
+ Answer
+ |> where(submission_id: ^submission_id)
+ |> order_by(:question_id)
+ |> group_by([a], a.id)
+ |> select([a], %{
+ # grouping by submission, so s.xp_bonus will be the same, but we need an
+ # aggregate function
+ total_xp: sum(a.xp) + sum(a.xp_adjustment)
+ })
+
+ total =
+ ans_xp
+ |> subquery
+ |> select([a], %{
+ total_xp: sum(a.total_xp)
+ })
+ |> Repo.one()
+
+ xp = decimal_to_integer(total.total_xp)
+
+ cur_time =
+ if submission.submitted_at == nil do
+ Timex.now()
+ else
+ submission.submitted_at
+ end
+
+ xp_bonus =
+ if xp <= 0 do
+ 0
+ else
+ if Timex.before?(cur_time, Timex.shift(assessment.open_at, hours: early_hours)) do
+ max_bonus_xp
+ else
+ # This logic interpolates from max bonus at early hour to 0 bonus at close time
+ decaying_hours =
+ Timex.diff(assessment.close_at, assessment.open_at, :hours) - early_hours
+
+ remaining_hours = Enum.max([0, Timex.diff(assessment.close_at, cur_time, :hours)])
+ proportion = if(decaying_hours > 0, do: remaining_hours / decaying_hours, else: 1)
+ bonus_xp = round(max_bonus_xp * proportion)
+ Enum.max([0, bonus_xp])
+ end
+ end
+
+ submission
+ |> Submission.changeset(%{xp_bonus: xp_bonus})
+ |> Repo.update()
+ end
  end
 
  defp update_submission_status_router(submission = %Submission{}, question = %Question{}) do
@@ -2231,12 +2277,19 @@
 
  is_own_submission = grader_id == answer.submission.student_id
 
+ submission =
+ Submission
+ |> join(:inner, [s], a in assoc(s, :assessment))
+ |> preload([_, a], assessment: a)
+ |> Repo.get(submission_id)
+
  with {:answer_found?, true} <- {:answer_found?, is_map(answer)},
  {:status, true} <-
  {:status, answer.submission.status == :submitted or is_own_submission},
  {:valid, changeset = %Ecto.Changeset{valid?: true}} <-
  {:valid, Answer.grading_changeset(answer, attrs)},
  {:ok, _} <- Repo.update(changeset) do
+ update_xp_bonus(submission)
  {:ok, nil}
  else
  {:answer_found?, false} ->
@@ -2501,7 +2554,7 @@
 
  def has_last_modified_answer?(
  question = %Question{},
  cr = %CourseRegistration{id: cr_id},
  last_modified_at,
  force_submit
  ) do

lib/cadet/assessments/submission.ex

@@ -17,6 +17,7 @@ defmodule Cadet.Assessments.Submission do
  field(:graded_count, :integer, virtual: true, default: 0)
  field(:grading_status, :string, virtual: true)
  field(:unsubmitted_at, :utc_datetime_usec)
+ field(:submitted_at, :utc_datetime_usec)
  field(:is_grading_published, :boolean, default: false)
 
  belongs_to(:assessment, Assessment)
@@ -29,7 +30,7 @@ defmodule Cadet.Assessments.Submission do
  end
 
  @required_fields ~w(assessment_id status is_grading_published)a
- @optional_fields ~w(xp_bonus unsubmitted_by_id unsubmitted_at student_id team_id)a
+ @optional_fields ~w(xp_bonus unsubmitted_by_id unsubmitted_at submitted_at student_id team_id)a
 
  def changeset(submission, params) do
  submission

priv/repo/migrations/20240805214100_submissions_add_submitted_at_column.exs

@@ -0,0 +1,9 @@
+defmodule Cadet.Repo.Migrations.SubmissionsAddSubmittedAtColumn do
+ use Ecto.Migration
+
+ def change do
+ alter table(:submissions) do
+ add(:submitted_at, :timestamp, null: true)
+ end
+ end
+end

test/cadet_web/controllers/assessments_controller_test.exs

@@ -1069,7 +1069,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
  end
  end
 
- test "submission of answer within early hours(seeded 48) of opening grants full XP bonus", %{
+ test "submission of answer with no effort grants 0 XP bonus", %{
  conn: conn,
  courses: %{course1: course1},
  role_crs: role_crs
@@ -1117,6 +1117,194 @@ defmodule CadetWeb.AssessmentsControllerTest do
 
  submission_db = Repo.get(Submission, submission.id)
 
+ assert submission_db.status == :submitted
+ assert submission_db.xp_bonus == 0
+ end
+ end
+
+ test "submission of answer grants XP bonus only after being marked by an avenger", %{
+ conn: conn,
+ courses: %{course1: course1},
+ role_crs: role_crs
+ } do
+ with_mock GradingJob, force_grade_individual_submission: fn _ -> nil end do
+ assessment_config =
+ insert(
+ :assessment_config,
+ early_submission_xp: 100,
+ hours_before_early_xp_decay: 48,
+ course: course1
+ )
+
+ assessment =
+ insert(
+ :assessment,
+ open_at: Timex.shift(Timex.now(), hours: -40),
+ close_at: Timex.shift(Timex.now(), days: 7),
+ is_published: true,
+ config: assessment_config,
+ course: course1
+ )
+
+ question = insert(:programming_question, assessment: assessment)
+
+ group = insert(:group, leader: role_crs.staff)
+
+ course_reg =
+ insert(:course_registration, %{role: :student, group: group, course: course1})
+
+ submission =
+ insert(:submission, assessment: assessment, student: course_reg, status: :attempted)
+
+ insert(
+ :answer,
+ submission: submission,
+ question: question,
+ answer: %{code: "f => f(f);"},
+ xp_adjustment: 0
+ )
+
+ conn
+ |> sign_in(course_reg.user)
+ |> post(build_url_submit(course1.id, assessment.id))
+ |> response(200)
+
+ submission_db = Repo.get(Submission, submission.id)
+
+ assert submission_db.status == :submitted
+ assert submission_db.xp_bonus == 0
+
+ grade_question = fn question ->
+ Assessments.update_grading_info(
+ %{submission_id: submission.id, question_id: question.id},
+ %{"xp_adjustment" => 10},
+ role_crs.staff
+ )
+ end
+
+ grade_question.(question)
+
+ submission_db = Repo.get(Submission, submission.id)
+ assert submission_db.xp_bonus == 100
+ end
+ end
+
+ test "submission of answer grants 0 XP bonus if an avenger gives 0 as well", %{
+ conn: conn,
+ courses: %{course1: course1},
+ role_crs: role_crs
+ } do
+ with_mock GradingJob, force_grade_individual_submission: fn _ -> nil end do
+ assessment_config =
+ insert(
+ :assessment_config,
+ early_submission_xp: 100,
+ hours_before_early_xp_decay: 48,
+ course: course1
+ )
+
+ assessment =
+ insert(
+ :assessment,
+ open_at: Timex.shift(Timex.now(), hours: -40),
+ close_at: Timex.shift(Timex.now(), days: 7),
+ is_published: true,
+ config: assessment_config,
+ course: course1
+ )
+
+ question = insert(:programming_question, assessment: assessment)
+
+ group = insert(:group, leader: role_crs.staff)
+
+ course_reg =
+ insert(:course_registration, %{role: :student, group: group, course: course1})
+
+ submission =
+ insert(:submission, assessment: assessment, student: course_reg, status: :attempted)
+
+ insert(
+ :answer,
+ submission: submission,
+ question: question,
+ answer: %{code: "f => f(f);"},
+ xp_adjustment: 0
+ )
+
+ conn
+ |> sign_in(course_reg.user)
+ |> post(build_url_submit(course1.id, assessment.id))
+ |> response(200)
+
+ submission_db = Repo.get(Submission, submission.id)
+
+ assert submission_db.status == :submitted
+ assert submission_db.xp_bonus == 0
+
+ grade_question = fn question ->
+ Assessments.update_grading_info(
+ %{submission_id: submission.id, question_id: question.id},
+ %{"xp_adjustment" => 0},
+ role_crs.staff
+ )
+ end
+
+ grade_question.(question)
+
+ submission_db = Repo.get(Submission, submission.id)
+ assert submission_db.xp_bonus == 0
+ end
+ end
+
+ test "submission of answer within early hours(seeded 48) of opening grants full XP bonus", %{
+ conn: conn,
+ courses: %{course1: course1},
+ role_crs: role_crs
+ } do
+ with_mock GradingJob, force_grade_individual_submission: fn _ -> nil end do
+ assessment_config =
+ insert(
+ :assessment_config,
+ early_submission_xp: 100,
+ hours_before_early_xp_decay: 48,
+ course: course1
+ )
+
+ assessment =
+ insert(
+ :assessment,
+ open_at: Timex.shift(Timex.now(), hours: -40),
+ close_at: Timex.shift(Timex.now(), days: 7),
+ is_published: true,
+ config: assessment_config,
+ course: course1
+ )
+
+ question = insert(:programming_question, assessment: assessment)
+
+ group = insert(:group, leader: role_crs.staff)
+
+ course_reg =
+ insert(:course_registration, %{role: :student, group: group, course: course1})
+
+ submission =
+ insert(:submission, assessment: assessment, student: course_reg, status: :attempted)
+
+ insert(
+ :answer,
+ submission: submission,
+ question: question,
+ answer: %{code: "f => f(f);"},
+ xp: 10
+ )
+
+ conn
+ |> sign_in(course_reg.user)
+ |> post(build_url_submit(course1.id, assessment.id))
+ |> response(200)
+
+ submission_db = Repo.get(Submission, submission.id)
+
  assert submission_db.status == :submitted
  assert submission_db.xp_bonus == 100
  end
@@ -1161,7 +1349,8 @@ defmodule CadetWeb.AssessmentsControllerTest do
  :answer,
  submission: submission,
  question: question,
- answer: %{code: "f => f(f);"}
+ answer: %{code: "f => f(f);"},
+ xp: 10
  )
 
  conn
@@ -1219,7 +1408,8 @@ defmodule CadetWeb.AssessmentsControllerTest do
  :answer,
  submission: submission,
  question: question,
- answer: %{code: "f => f(f);"}
+ answer: %{code: "f => f(f);"},
+ xp: 10
  )
 
  conn