Refactor: improve query scope composition with merge syntax (#2131)

* Refactor: improve query scope composition with merge syntax

Replace manual WHERE clause concatenation with Rails' merge method
for more elegant and maintainable scope composition across Card,
Comment, and Filter models. This approach better follows Rails
conventions and improves code readability.

* Extend scope composition improvements to Card::Closeable

Apply the same nested hash syntax pattern to closures table references
in order and where clauses.

* Remove unnecessary outer braces from where clause

---------

Co-authored-by: Jeremy Daer <jeremy@37signals.com>

app/models/card/closeable.rb

@@ -7,9 +7,9 @@ module Card::Closeable
     scope :closed, -> { joins(:closure) }
     scope :open, -> { where.missing(:closure) }
 
-    scope :recently_closed_first, -> { closed.order("closures.created_at": :desc) }
-    scope :closed_at_window, ->(window) { closed.where("closures.created_at": window) }
-    scope :closed_by, ->(users) { closed.where("closures.user_id": Array(users)) }
+    scope :recently_closed_first, -> { closed.order(closures: { created_at: :desc }) }
+    scope :closed_at_window, ->(window) { closed.where(closures: { created_at: window }) }
+    scope :closed_by, ->(users) { closed.where(closures: { user_id: Array(users) }) }
   end
 
   def closed?

app/models/card/stallable.rb

@@ -7,7 +7,7 @@ module Card::Stallable
     has_one :activity_spike, class_name: "Card::ActivitySpike", dependent: :destroy
 
     scope :with_activity_spikes, -> { joins(:activity_spike) }
-    scope :stalled, -> { open.active.with_activity_spikes.where("card_activity_spikes.updated_at": ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago, updated_at: ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago) }
+    scope :stalled, -> { open.active.with_activity_spikes.where(card_activity_spikes: { updated_at: ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago }, updated_at: ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago) }
 
     before_update :remember_to_detect_activity_spikes
     after_update_commit :detect_activity_spikes_later, if: :should_detect_activity_spikes?

app/models/comment.rb

@@ -10,8 +10,8 @@ class Comment < ApplicationRecord
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
   scope :preloaded, -> { with_rich_text_body.includes(reactions: :reacter) }
-  scope :by_system, -> { joins(:creator).where(creator: { role: "system" }) }
-  scope :by_user, -> { joins(:creator).where.not(creator: { role: "system" }) }
+  scope :by_system, -> { joins(:creator).where(creator: { role: :system }) }
+  scope :by_user, -> { joins(:creator).where.not(creator: { role: :system }) }
 
   after_create_commit :watch_card_by_creator
 

app/models/filter.rb

@@ -29,7 +29,7 @@ class Filter < ApplicationRecord
       result = result.where(creator_id: creators.ids) if creators.present?
       result = result.where(board: boards.ids) if boards.present?
       result = result.tagged_with(tags.ids) if tags.present?
-      result = result.where("cards.created_at": creation_window) if creation_window
+      result = result.where(cards: { created_at: creation_window }) if creation_window
       result = result.closed_at_window(closure_window) if closure_window
       result = result.closed_by(closers) if closers.present?
       result = terms.reduce(result) do |result, term|