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

Jump to bottom

Reverting only portion of changes that affected backend lock and subm… #38691

Merged
merged 1 commit into from
Jan 22, 2021
Merged

Reverting only portion of changes that affected backend lock and subm… #38691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions dashboard/app/models/user_level.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class UserLevel < ApplicationRecord
after_save :after_submit, if: :submitted_or_resubmitted?
before_save :before_unsubmit, if: ->(ul) {ul.submitted_changed? from: true, to: false}

validate :readonly_requires_submitted

# TODO(asher): Consider making these scopes and the methods below more consistent, in tense and in
# word choice.
scope :attempted, -> {where.not(best_result: nil)}
Expand All @@ -47,6 +49,12 @@ def self.by_stage(stage)
where(script: stage.script, level: levels)
end

def readonly_requires_submitted
if readonly_answers? && !submitted?
errors.add(:readonly_answers, 'readonly_answers only valid on submitted UserLevel')
end
end

def attempted?
!best_result.nil?
end
Expand Down Expand Up @@ -159,6 +167,7 @@ def self.update_lockable_state(user_id, level_id, script_id, locked, readonly_an
return if !user_level.persisted? && locked

user_level.assign_attributes(
submitted: locked || readonly_answers,
readonly_answers: !locked && readonly_answers,
unlocked_at: locked ? nil : Time.now,
# level_group, which is the only levels that we lock, always sets best_result to 100 when complete
Expand Down
8 changes: 4 additions & 4 deletions dashboard/test/controllers/api_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class ApiControllerTest < ActionController::TestCase

post :update_lockable_state, params: {updates: updates}
user_level = UserLevel.find_by(user_level_data)
assert_equal false, user_level.submitted?
assert_equal true, user_level.submitted?
assert_equal true, user_level.readonly_answers?
assert_not_nil user_level.unlocked_at

Expand Down Expand Up @@ -436,7 +436,7 @@ class ApiControllerTest < ActionController::TestCase

post :update_lockable_state, params: {updates: updates}
user_level = UserLevel.find_by(user_level_data)
assert_equal false, user_level.submitted?
assert_equal true, user_level.submitted?
assert_equal false, user_level.readonly_answers?
assert_nil user_level.unlocked_at
# update_lockable_state does not modify updated_at
Expand All @@ -456,7 +456,7 @@ class ApiControllerTest < ActionController::TestCase

post :update_lockable_state, params: {updates: updates}
user_level = UserLevel.find_by(user_level_data)
assert_equal false, user_level.submitted?
assert_equal true, user_level.submitted?
assert_equal true, user_level.readonly_answers?
assert_not_nil user_level.unlocked_at
assert_equal expected_updated_at, user_level.updated_at
Expand Down Expand Up @@ -494,7 +494,7 @@ class ApiControllerTest < ActionController::TestCase

post :update_lockable_state, params: {updates: updates}
user_level = UserLevel.find_by(user_level_data)
assert_equal true, user_level.submitted?
assert_equal false, user_level.submitted?
assert_equal false, user_level.readonly_answers?
assert_not_nil user_level.unlocked_at
assert_equal expected_updated_at, user_level.updated_at
Expand Down