From 2abe9f27b50353bc4d99aa22e0bb92ed1117224e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 2 Jul 2024 17:23:34 +0200 Subject: [PATCH] Use ranges instead of comparisons in SQL queries These cases aren't covered by the `Rails/WhereRange` rubocop rule, but IMHO using ranges makes them more consistent. Besides, they generate SQL which is more consistent with what Rails usually generates. For example, `Poll.where("starts_at <= :time and ends_at >= :time", time: Time.current)` generates: ``` SELECT \"polls\".\"id\", (...) WHERE \"polls\".\"hidden_at\" IS NULL AND (starts_at <= '2024-07-(...)' and ends_at >= '2024-07-(...)') ``` And `Poll.where(starts_at: ..Time.current, ends_at: Time.current..)` generates: ``` SELECT \"polls\".\"id\", (...) WHERE \"polls\".\"hidden_at\" IS NULL AND \"polls\".\"starts_at\" <= '2024-07-(...)' AND \"polls\".\"ends_at\" >= '2024-07-(...)'" ``` Note that the `not_archived` scope in proposals slightly changes, since we were using `>` and now we use the equivalent of `>=`. However, since the `created_at` field is a time, this will only mean that a proposal will be archived about one microsecond later. For consistency, we're also changing the `archived` scope, so a proposal is never archived and not archived at the same time (not even for a microsecond). --- app/models/banner.rb | 2 +- app/models/budget/investment.rb | 6 +++--- app/models/budget/stats.rb | 2 +- app/models/concerns/flaggable.rb | 2 +- app/models/concerns/verification.rb | 2 +- app/models/legislation/process.rb | 2 +- app/models/poll.rb | 2 +- app/models/proposal.rb | 4 ++-- app/models/user.rb | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/models/banner.rb b/app/models/banner.rb index 9a8a1ebe4..ea3a9b513 100644 --- a/app/models/banner.rb +++ b/app/models/banner.rb @@ -19,7 +19,7 @@ class Banner < ApplicationRecord has_many :sections has_many :web_sections, through: :sections - scope :with_active, -> { where("post_started_at <= :date and post_ended_at >= :date", date: Date.current) } + scope :with_active, -> { where(post_started_at: ..Date.current, post_ended_at: Date.current..) } scope :with_inactive, -> { where.not(id: with_active) } scope :in_section, ->(section_name) do joins(:web_sections, :sections).where("web_sections.name ilike ?", section_name) diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index d059d1b37..53b8c196c 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -78,8 +78,8 @@ class Budget scope :without_valuator, -> { without_valuator_group.where(valuator_assignments_count: 0) } scope :under_valuation, -> { valuation_open.valuating.with_admin } scope :managed, -> { valuation_open.where(valuator_assignments_count: 0).with_admin } - scope :with_valuator_assignments, -> { where("valuator_assignments_count > 0") } - scope :with_group_assignments, -> { where("valuator_group_assignments_count > 0") } + scope :with_valuator_assignments, -> { where(valuator_assignments_count: 1..) } + scope :with_group_assignments, -> { where(valuator_group_assignments_count: 1..) } scope :with_valuation_assignments, -> { with_valuator_assignments.or(with_group_assignments) } scope :valuating, -> { valuation_open.with_valuation_assignments } scope :visible_to_valuators, -> { where(visible_to_valuators: true) } @@ -90,7 +90,7 @@ class Budget scope :not_unfeasible, -> { where.not(feasibility: "unfeasible") } scope :undecided, -> { where(feasibility: "undecided") } - scope :with_supports, -> { where("cached_votes_up > 0") } + scope :with_supports, -> { where(cached_votes_up: 1..) } scope :selected, -> { feasible.where(selected: true) } scope :compatible, -> { where(incompatible: false) } scope :incompatible, -> { where(incompatible: true) } diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index d03e4edd3..33e45b211 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -131,7 +131,7 @@ class Budget::Stats end def balloters - @balloters ||= budget.ballots.where("ballot_lines_count > ?", 0).distinct.pluck(:user_id).compact + @balloters ||= budget.ballots.where(ballot_lines_count: 1..).distinct.pluck(:user_id).compact end def poll_ballot_voters diff --git a/app/models/concerns/flaggable.rb b/app/models/concerns/flaggable.rb index 650f679a0..8ca668dc7 100644 --- a/app/models/concerns/flaggable.rb +++ b/app/models/concerns/flaggable.rb @@ -3,7 +3,7 @@ module Flaggable included do has_many :flags, as: :flaggable, inverse_of: :flaggable - scope :flagged, -> { where("flags_count > 0") } + scope :flagged, -> { where(flags_count: 1..) } scope :pending_flag_review, -> { flagged.where(ignored_flag_at: nil, hidden_at: nil) } scope :with_ignored_flag, -> { flagged.where.not(ignored_flag_at: nil).where(hidden_at: nil) } end diff --git a/app/models/concerns/verification.rb b/app/models/concerns/verification.rb index 563f2b6bb..298c44b4d 100644 --- a/app/models/concerns/verification.rb +++ b/app/models/concerns/verification.rb @@ -17,7 +17,7 @@ module Verification residence_or_phone_unverified.where(verified_at: nil, level_two_verified_at: nil) end scope :incomplete_verification, -> do - residence_unverified.where("failed_census_calls_count > ?", 0) + residence_unverified.where(failed_census_calls_count: 1..) .or(residence_verified.phone_not_fully_confirmed) end end diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index 85fc943d8..a57f53564 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -59,8 +59,8 @@ class Legislation::Process < ApplicationRecord validates :font_color, format: { allow_blank: true, with: ->(*) { CSS_HEX_COLOR }} class << self; undef :open; end - scope :open, -> { where("start_date <= ? and end_date >= ?", Date.current, Date.current) } scope :active, -> { where(end_date: Date.current..) } + scope :open, -> { active.where(start_date: ..Date.current) } scope :past, -> { where(end_date: ...Date.current) } scope :published, -> { where(published: true) } diff --git a/app/models/poll.rb b/app/models/poll.rb index a1b294592..18c78a77d 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -43,7 +43,7 @@ class Poll < ApplicationRecord accepts_nested_attributes_for :questions, reject_if: :all_blank, allow_destroy: true scope :for, ->(element) { where(related: element) } - scope :current, -> { where("starts_at <= :time and ends_at >= :time", time: Time.current) } + scope :current, -> { where(starts_at: ..Time.current, ends_at: Time.current..) } scope :expired, -> { where(ends_at: ...Time.current) } scope :recounting, -> { where(ends_at: (RECOUNT_DURATION.ago)...Time.current) } scope :published, -> { where(published: true) } diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 3a4849d44..634077fe0 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -75,8 +75,8 @@ class Proposal < ApplicationRecord scope :sort_by_archival_date, -> { archived.sort_by_confidence_score } scope :sort_by_recommendations, -> { order(cached_votes_up: :desc) } - scope :archived, -> { where(created_at: ..Setting.archived_proposals_date_limit) } - scope :not_archived, -> { where("proposals.created_at > ?", Setting.archived_proposals_date_limit) } + scope :archived, -> { where(created_at: ...Setting.archived_proposals_date_limit) } + scope :not_archived, -> { where(created_at: Setting.archived_proposals_date_limit..) } scope :last_week, -> { where(created_at: 7.days.ago..) } scope :retired, -> { where.not(retired_at: nil) } scope :not_retired, -> { where(retired_at: nil) } diff --git a/app/models/user.rb b/app/models/user.rb index 2c1104e39..07c05dd05 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -95,7 +95,7 @@ class User < ApplicationRecord scope :moderators, -> { joins(:moderator) } scope :organizations, -> { joins(:organization) } scope :sdg_managers, -> { joins(:sdg_manager) } - scope :officials, -> { where("official_level > 0") } + scope :officials, -> { where(official_level: 1..) } scope :male, -> { where(gender: "male") } scope :female, -> { where(gender: "female") } scope :newsletter, -> { where(newsletter: true) }