Skip to content
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

Fix issues with bonus xp #1172

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+6 −9
Open

Fix issues with bonus xp #1172

Changes from all commits
Commits
Show all changes
7 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
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
15 changes: 6 additions & 9 deletions lib/cadet/assessments/assessments.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@
raw_answer,
force_submit
) do
with {:ok, team} <- find_team(question.assessment.id, cr_id),

Check warning on line 919 in lib/cadet/assessments/assessments.ex

View workflow job for this annotation

GitHub Actions / Run CI 

variable "team" is unused (if the variable is not meant to be used, prefix it with an underscore)
{: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
Expand Down Expand Up @@ -1034,7 +1034,7 @@

# 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 @@
|> 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,23 +1457,18 @@
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 =
ans_xp
|> subquery
|> select([a], %{
total_xp: sum(a.total_xp)
total_xp: coalesce(sum(a.total_xp), 0)
})
|> Repo.one()

xp = decimal_to_integer(total.total_xp)

cur_time =
if submission.submitted_at == nil do
Timex.now()
Expand All @@ -1480,7 +1477,7 @@
end

xp_bonus =
if xp <= 0 do
if total.total_xp <= 0 do
0
else
if Timex.before?(cur_time, Timex.shift(assessment.open_at, hours: early_hours)) do
Expand Down Expand Up @@ -2708,7 +2705,7 @@

def has_last_modified_answer?(
question = %Question{},
cr = %CourseRegistration{id: cr_id},

Check warning on line 2708 in lib/cadet/assessments/assessments.ex

View workflow job for this annotation

GitHub Actions / Run CI 

variable "cr_id" is unused (if the variable is not meant to be used, prefix it with an underscore)
last_modified_at,
force_submit
) do
Expand Down
Loading