Skip to content

Fix issues with bonus xp #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 13, 2025
Merged

Fix issues with bonus xp #1172

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d72d0a6
removed unnecessary logic
thortol Aug 31, 2024
1aac094
change the submission passed into update_xp_bonus
thortol Aug 31, 2024
5c15c02
Update bonus xp when grading is published
thortol Aug 31, 2024
6865797
Add extra logic to check if xp is an integer
thortol Aug 31, 2024
1183b15
Remove outdated comment
thortol Sep 1, 2024
c2945fa
Use coalesce to check if total_xp = nil
thortol Sep 11, 2024
429aad4
Merge branch 'master' into fix-issues-with-bonus-xp
thortol Sep 12, 2024
1aa3eb8
Merge branch 'master' into fix-issues-with-bonus-xp
RichDom2185 Jun 13, 2025
545b042
Merge branch 'master' into fix-issues-with-bonus-xp
RichDom2185 Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/cadet/assessments/assessments.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ defmodule Cadet.Assessments do

# Begin autograding job
GradingJob.force_grade_individual_submission(updated_submission)
update_xp_bonus(submission)
update_xp_bonus(updated_submission)

{:ok, nil}
else
Expand Down Expand Up @@ -1257,6 +1257,8 @@ defmodule Cadet.Assessments do
|> Submission.changeset(%{is_grading_published: true})
|> Repo.update()

update_xp_bonus(submission)

Notifications.write_notification_when_published(
submission.id,
:published_grading
Expand Down Expand Up @@ -1455,11 +1457,10 @@ defmodule Cadet.Assessments do
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_xp: a.xp + a.xp_adjustment
})

total =
Expand All @@ -1470,15 +1471,20 @@ defmodule Cadet.Assessments do
})
|> 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 =
if is_integer(total.total_xp) do
total.total_xp
else
decimal_to_integer(total.total_xp)
end

xp_bonus =
if xp <= 0 do
0
Expand Down