consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract inline query to an OfficerAssignment scope

Browse Source
This commit is contained in:
Bertocq
2018-02-19 00:08:47 +01:00
parent 118deb9fc4
commit 4fb9f6829c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/poll/officer_assignments_controller.rb
View File

@@ -19,7 +19,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController
@officer_assignments = ::Poll::OfficerAssignment. @officer_assignments = ::Poll::OfficerAssignment.
joins(:booth_assignment). joins(:booth_assignment).
includes(:recounts, booth_assignment: :booth). includes(:recounts, booth_assignment: :booth).
where("officer_id = ? AND poll_booth_assignments.poll_id = ?", @officer.id, @poll.id). by_officer_and_poll(@officer.id, @poll.id).
order(:date) order(:date)
end end

3
app/models/poll/officer_assignment.rb
View File

@@ -14,6 +14,9 @@ class Poll
scope :voting_days, -> { where(final: false) } scope :voting_days, -> { where(final: false) }
scope :final, -> { where(final: true) } scope :final, -> { where(final: true) }
scope :by_officer_and_poll, ->(officer_id, poll_id) do
where("officer_id = ? AND poll_booth_assignments.poll_id = ?", officer_id, poll_id)
end
before_create :log_user_data before_create :log_user_data