Remove references to Follower.user_id. #14115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
FYI @davidwufer. |
ashercodeorg
force-pushed
the
removeFollowerUserIdReferences
branch
6 times, most recently
from
323e83d
to
d191972
Compare
ashercodeorg
force-pushed
the
removeFollowerUserIdReferences
branch
from
d191972
to
fed77ba
Compare
ashercodeorg
commented
Apr 4, 2017
| @@ -1207,7 +1207,7 @@ def can_edit_password? | |||
| end | |||
|
|
|||
| def section_for_script(script) | |||
| followeds.collect(&:section).find {|section| section.script_id == script.id} | |||
| sections_as_student.find {|section| section.script_id == script.id} | |||
There was a problem hiding this comment.
Tangentially related, this line change could be part of a separate PR.
ashercodeorg
commented
Apr 4, 2017
dashboard/app/models/user.rb
Outdated
| collect {|followed| followed.user.try(:terms_of_service_version)}. | ||
| compact. | ||
| max | ||
| teachers.map {|teacher| teacher.try(:terms_of_service_version)}.try(:compact).try(:max) |
There was a problem hiding this comment.
Tangentially related, this line change could be part of a separate PR.
There was a problem hiding this comment.
Can teacher be nil here? I don't think you need the first .try
There was a problem hiding this comment.
Done. Good catch.
aoby
approved these changes
Apr 4, 2017
dashboard/app/models/user.rb
Outdated
| collect {|followed| followed.user.try(:terms_of_service_version)}. | ||
| compact. | ||
| max | ||
| teachers.map {|teacher| teacher.try(:terms_of_service_version)}.try(:compact).try(:max) |
There was a problem hiding this comment.
Can teacher be nil here? I don't think you need the first .try
| return if Dashboard.db[:sections]. | ||
| join(:followers, section_id: :sections__id). | ||
| where(followers__student_user_id: params[:id], sections__user_id: dashboard_user_id). | ||
| where(followers__deleted_at: nil). |
There was a problem hiding this comment.
nit: any reason why the first 2 conditions are in one where, and the 3rd condition is in a 2nd where? I'd prefer consistency, either all comma-separated args in a single where or all separate.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR finishes making
Followers.user_idtruly optional: at the DB level (#13878), at the Rails validation level (#13945), at the controller level (this PR), and at the Pegasus level (this PR).After this PR reaches production (safely), further PRs will remove the column from the DB.