From 456905e69faafa0d4de7a25e2c4a57e9b4071ab1 Mon Sep 17 00:00:00 2001 From: cyrillefr Date: Wed, 17 Apr 2024 10:37:18 +0200 Subject: [PATCH] Fix Rails/WhereExists rubocop offenses - after discussion, dev team decided not to follow - this particular rule, but rather to enforce the where().exists? rule instead. - cf. https://github.com/openfoodfoundation/openfoodnetwork/pull/12363 --- .rubocop_styleguide.yml | 3 +++ .rubocop_todo.yml | 15 --------------- app/models/spree/credit_card.rb | 2 +- app/models/spree/order.rb | 2 +- app/models/spree/payment.rb | 2 +- .../enterprise_fees_with_tax_report_by_order.rb | 4 ++-- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.rubocop_styleguide.yml b/.rubocop_styleguide.yml index a6c7d70984..81d1018a6b 100644 --- a/.rubocop_styleguide.yml +++ b/.rubocop_styleguide.yml @@ -124,6 +124,9 @@ Rails/SkipsModelValidations: - update_column - update_columns +Rails/WhereExists: + EnforcedStyle: where # Cf. conversion https://github.com/openfoodfoundation/openfoodnetwork/pull/12363 + Style/Documentation: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d52dd7928b..8ed82cc4a7 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -773,21 +773,6 @@ Rails/UnusedRenderContent: - 'app/controllers/api/v0/taxons_controller.rb' - 'app/controllers/api/v0/variants_controller.rb' -# Offense count: 8 -# This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: exists, where -Rails/WhereExists: - Exclude: - - 'app/controllers/spree/admin/overview_controller.rb' - - 'app/controllers/spree/admin/tax_rates_controller.rb' - - 'app/controllers/spree/user_sessions_controller.rb' - - 'app/models/spree/preferences/store.rb' - - 'lib/tasks/sample_data/customer_factory.rb' - - 'lib/tasks/sample_data/group_factory.rb' - - 'lib/tasks/sample_data/order_cycle_factory.rb' - - 'lib/tasks/sample_data/taxon_factory.rb' - # Offense count: 1 Security/Open: Exclude: diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb index 5949023cb5..35a43ee828 100644 --- a/app/models/spree/credit_card.rb +++ b/app/models/spree/credit_card.rb @@ -152,7 +152,7 @@ module Spree end def default_missing? - !user.credit_cards.exists?(is_default: true) + !user.credit_cards.where(is_default: true).exists? end def default_card_needs_updating? diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 561aabacac..03fdf5208c 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -694,7 +694,7 @@ module Spree end def registered_email? - Spree::User.exists?(email:) + Spree::User.where(email:).exists? end def adjustments_fetcher diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb index 4c209d10d7..6479694df9 100644 --- a/app/models/spree/payment.rb +++ b/app/models/spree/payment.rb @@ -246,7 +246,7 @@ module Spree # and this is it. Related to #1998. # See https://github.com/spree/spree/issues/1998#issuecomment-12869105 def set_unique_identifier - self.identifier = generate_identifier while self.class.exists?(identifier:) + self.identifier = generate_identifier while self.class.where(identifier:).exists? end def generate_identifier diff --git a/lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb b/lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb index e035a2d469..2ea4a4db14 100644 --- a/lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb +++ b/lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb @@ -66,8 +66,8 @@ module Reporting enterprise_fee_id = arg.first - EnterpriseFee.exists?(id: enterprise_fee_id, - enterprise_id: ransack_params[:enterprise_fee_owner_id_in] ) + EnterpriseFee.where(id: enterprise_fee_id, + enterprise_id: ransack_params[:enterprise_fee_owner_id_in] ).exists? end def filter_enterprise_fee_by_id_active?