diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index b09ce01a2..e16691abf 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -158,7 +158,7 @@ class ProposalsController < ApplicationController .sort_by_confidence_score.limit(Setting["featured_proposals_number"]) if @featured_proposals.present? set_featured_proposal_votes(@featured_proposals) - @resources = @resources.where("proposals.id NOT IN (?)", @featured_proposals.map(&:id)) + @resources = @resources.where.not(id: @featured_proposals) end end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fdec3f4bb..a50d55cf6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -96,7 +96,7 @@ class UsersController < ApplicationController disabled_commentables << "Debate" unless Setting["process.debates"] disabled_commentables << "Budget::Investment" unless Setting["process.budgets"] if disabled_commentables.present? - all_user_comments.where("commentable_type NOT IN (?)", disabled_commentables) + all_user_comments.where.not(commentable_type: disabled_commentables) else all_user_comments end diff --git a/db/dev_seeds/votes.rb b/db/dev_seeds/votes.rb index 357d2de59..749df9be8 100644 --- a/db/dev_seeds/votes.rb +++ b/db/dev_seeds/votes.rb @@ -1,5 +1,5 @@ section "Voting Debates, Proposals & Comments" do - not_org_users = User.where(["users.id NOT IN(?)", User.organizations.pluck(:id)]) + not_org_users = User.where.not(id: User.organizations) 100.times do voter = not_org_users.level_two_or_three_verified.all.sample vote = [true, false].sample diff --git a/lib/user_segments.rb b/lib/user_segments.rb index 7927b8bfd..efa0d51a4 100644 --- a/lib/user_segments.rb +++ b/lib/user_segments.rb @@ -45,10 +45,9 @@ class UserSegments def self.not_supported_on_current_budget author_ids( - User.where( - "id NOT IN (?)", - Vote.select(:voter_id).where(votable: current_budget_investments).distinct - ) + User.where.not( + id: Vote.select(:voter_id).where(votable: current_budget_investments).distinct + ) ) end