From 6c19baeab39da96855f17b121c400759e903403c Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 4 Mar 2021 13:16:15 +0000 Subject: [PATCH 1/4] Remove transactional callback config --- config/application.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/application.rb b/config/application.rb index 73d9e78184..33638102f5 100644 --- a/config/application.rb +++ b/config/application.rb @@ -200,7 +200,5 @@ module Openfoodnetwork config.active_support.escape_html_entities_in_json = true config.active_job.queue_adapter = :delayed_job - - config.active_record.raise_in_transactional_callbacks = true end end From 237075dd471476b6f03d6b00110069398cd7eccf Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 4 Mar 2021 13:19:40 +0000 Subject: [PATCH 2/4] Replace deprecated before_filter syntax --- .../order_management/reports/bulk_coop_controller.rb | 4 ++-- .../reports/enterprise_fee_summaries_controller.rb | 4 ++-- lib/spree/core/controller_helpers/auth.rb | 2 +- lib/spree/core/controller_helpers/common.rb | 2 +- lib/spree/core/controller_helpers/order.rb | 2 +- lib/spree/core/controller_helpers/ssl.rb | 2 +- spec/controllers/spree/admin/base_controller_spec.rb | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/engines/order_management/app/controllers/order_management/reports/bulk_coop_controller.rb b/engines/order_management/app/controllers/order_management/reports/bulk_coop_controller.rb index c1810a92b6..3de16eaf61 100644 --- a/engines/order_management/app/controllers/order_management/reports/bulk_coop_controller.rb +++ b/engines/order_management/app/controllers/order_management/reports/bulk_coop_controller.rb @@ -3,8 +3,8 @@ module OrderManagement module Reports class BulkCoopController < Spree::Admin::BaseController - before_filter :load_report_parameters - before_filter :load_permissions + before_action :load_report_parameters + before_action :load_permissions def new; end diff --git a/engines/order_management/app/controllers/order_management/reports/enterprise_fee_summaries_controller.rb b/engines/order_management/app/controllers/order_management/reports/enterprise_fee_summaries_controller.rb index 7cc1376034..9f52ab3e9b 100644 --- a/engines/order_management/app/controllers/order_management/reports/enterprise_fee_summaries_controller.rb +++ b/engines/order_management/app/controllers/order_management/reports/enterprise_fee_summaries_controller.rb @@ -3,8 +3,8 @@ module OrderManagement module Reports class EnterpriseFeeSummariesController < Spree::Admin::BaseController - before_filter :load_report_parameters - before_filter :load_permissions + before_action :load_report_parameters + before_action :load_permissions def new; end diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb index c6d05deaeb..fc2c1201e3 100644 --- a/lib/spree/core/controller_helpers/auth.rb +++ b/lib/spree/core/controller_helpers/auth.rb @@ -7,7 +7,7 @@ module Spree extend ActiveSupport::Concern included do - before_filter :ensure_api_key + before_action :ensure_api_key rescue_from CanCan::AccessDenied do unauthorized diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb index c6978382e7..2655aea13b 100644 --- a/lib/spree/core/controller_helpers/common.rb +++ b/lib/spree/core/controller_helpers/common.rb @@ -12,7 +12,7 @@ module Spree layout :get_layout - before_filter :set_user_language + before_action :set_user_language protected diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb index 460bd8e15f..d3f093cfd2 100644 --- a/lib/spree/core/controller_helpers/order.rb +++ b/lib/spree/core/controller_helpers/order.rb @@ -10,7 +10,7 @@ module Spree base.class_eval do helper_method :current_order helper_method :current_currency - before_filter :set_current_order + before_action :set_current_order end end diff --git a/lib/spree/core/controller_helpers/ssl.rb b/lib/spree/core/controller_helpers/ssl.rb index 6c923e4977..07a9ad5ccd 100644 --- a/lib/spree/core/controller_helpers/ssl.rb +++ b/lib/spree/core/controller_helpers/ssl.rb @@ -7,7 +7,7 @@ module Spree extend ActiveSupport::Concern included do - before_filter :force_non_ssl_redirect, if: proc { Spree::Config[:redirect_https_to_http] } + before_action :force_non_ssl_redirect, if: proc { Spree::Config[:redirect_https_to_http] } def self.ssl_allowed(*actions) class_attribute :ssl_allowed_actions diff --git a/spec/controllers/spree/admin/base_controller_spec.rb b/spec/controllers/spree/admin/base_controller_spec.rb index 5cbcfbfc58..2947bbf698 100644 --- a/spec/controllers/spree/admin/base_controller_spec.rb +++ b/spec/controllers/spree/admin/base_controller_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe Spree::Admin::BaseController, type: :controller do controller(Spree::Admin::BaseController) do def index - before_filter :unauthorized + before_action :unauthorized render text: "" end end From 55b0751c1a0a0fbe79124750a48d79060ff540f5 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 4 Mar 2021 13:20:58 +0000 Subject: [PATCH 3/4] Use strings for class names on associations --- app/models/customer.rb | 8 ++++---- app/models/distributor_shipping_method.rb | 4 ++-- app/models/enterprise_role.rb | 2 +- app/models/subscription.rb | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 256fc1b61c..b1ba0f2651 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,15 +2,15 @@ class Customer < ActiveRecord::Base acts_as_taggable belongs_to :enterprise - belongs_to :user, class_name: Spree.user_class - has_many :orders, class_name: Spree::Order + belongs_to :user, class_name: Spree.user_class.to_s + has_many :orders, class_name: "Spree::Order" before_destroy :check_for_orders - belongs_to :bill_address, foreign_key: :bill_address_id, class_name: Spree::Address + belongs_to :bill_address, foreign_key: :bill_address_id, class_name: "Spree::Address" alias_attribute :billing_address, :bill_address accepts_nested_attributes_for :bill_address - belongs_to :ship_address, foreign_key: :ship_address_id, class_name: Spree::Address + belongs_to :ship_address, foreign_key: :ship_address_id, class_name: "Spree::Address" alias_attribute :shipping_address, :ship_address accepts_nested_attributes_for :ship_address diff --git a/app/models/distributor_shipping_method.rb b/app/models/distributor_shipping_method.rb index a2c81506dd..5c69cefbc0 100644 --- a/app/models/distributor_shipping_method.rb +++ b/app/models/distributor_shipping_method.rb @@ -1,5 +1,5 @@ class DistributorShippingMethod < ActiveRecord::Base self.table_name = "distributors_shipping_methods" - belongs_to :shipping_method, class_name: Spree::ShippingMethod, touch: true - belongs_to :distributor, class_name: Enterprise, touch: true + belongs_to :shipping_method, class_name: "Spree::ShippingMethod", touch: true + belongs_to :distributor, class_name: "Enterprise", touch: true end diff --git a/app/models/enterprise_role.rb b/app/models/enterprise_role.rb index 3709f7e004..0b686e2e6e 100644 --- a/app/models/enterprise_role.rb +++ b/app/models/enterprise_role.rb @@ -1,5 +1,5 @@ class EnterpriseRole < ActiveRecord::Base - belongs_to :user, class_name: Spree.user_class + belongs_to :user, class_name: Spree.user_class.to_s belongs_to :enterprise validates :user_id, :enterprise_id, presence: true diff --git a/app/models/subscription.rb b/app/models/subscription.rb index ca1fd676e8..dbb5a8bf23 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -8,8 +8,8 @@ class Subscription < ActiveRecord::Base belongs_to :schedule belongs_to :shipping_method, class_name: 'Spree::ShippingMethod' belongs_to :payment_method, class_name: 'Spree::PaymentMethod' - belongs_to :bill_address, foreign_key: :bill_address_id, class_name: Spree::Address - belongs_to :ship_address, foreign_key: :ship_address_id, class_name: Spree::Address + belongs_to :bill_address, foreign_key: :bill_address_id, class_name: "Spree::Address" + belongs_to :ship_address, foreign_key: :ship_address_id, class_name: "Spree::Address" has_many :subscription_line_items, inverse_of: :subscription has_many :order_cycles, through: :schedule has_many :proxy_orders From 826515874b480b7768d07809d76566402fb59ccf Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 11 Mar 2021 14:36:30 +0000 Subject: [PATCH 4/4] Replace some uses of #alias_method_chain --- app/controllers/admin/enterprise_groups_controller.rb | 5 ++--- app/controllers/admin/enterprises_controller.rb | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/enterprise_groups_controller.rb b/app/controllers/admin/enterprise_groups_controller.rb index ad1489e654..0691d9eeaa 100644 --- a/app/controllers/admin/enterprise_groups_controller.rb +++ b/app/controllers/admin/enterprise_groups_controller.rb @@ -25,15 +25,14 @@ module Admin protected - def build_resource_with_address - enterprise_group = build_resource_without_address + def build_resource + enterprise_group = super enterprise_group.address = Spree::Address.new enterprise_group.address.country = Spree::Country.find_by( id: Spree::Config[:default_country_id] ) enterprise_group end - alias_method_chain :build_resource, :address # Overriding method on Spree's resource controller, # so that resources are found using permalink. diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index 87a3dff224..9b42b39174 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -114,13 +114,12 @@ module Admin protected - def build_resource_with_address - enterprise = build_resource_without_address + def build_resource + enterprise = super enterprise.address ||= Spree::Address.new enterprise.address.country ||= Spree::Country.find_by(id: Spree::Config[:default_country_id]) enterprise end - alias_method_chain :build_resource, :address # Overriding method on Spree's resource controller, # so that resources are found using permalink