Fix scope overriding join relation query

[henriquetatagiba]

Adding scopes after the join relation removes the join query from the generated SQL.

Rearrange code to match rails 7.0 method

Example:

class User < ApplicationRecord
  has_many :features, -> { enabled }
end

class Feature < ApplicationRecord
  scope :enabled, -> { where.not(user_id: nil).where(enabled: true) }
end

# User.joins(:features).to_sql
# INNER JOIN query won't include `users.id = features.user_id` but only `features.user_id IS NOT NULL`
# when the expected is both

[cfis]

Sorry for not responding to this earlier. Thanks for the fix!