From d239beb226c0a49a94632757c9fcdd97bedbb1e6 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Fri, 22 Dec 2023 11:30:28 +0100 Subject: [PATCH 1/3] remove unnecessary require instructions --- app/controllers/admin/schedules_controller.rb | 1 - app/controllers/api/v0/enterprise_attachment_controller.rb | 2 -- app/jobs/subscription_confirm_job.rb | 2 -- app/jobs/subscription_placement_job.rb | 2 -- app/models/spree/adjustment.rb | 1 - app/models/spree/gateway.rb | 2 -- app/models/spree/line_item.rb | 1 - app/models/spree/order.rb | 5 ----- app/models/spree/payment_method.rb | 2 -- app/models/spree/product.rb | 1 - app/models/spree/variant.rb | 2 -- app/services/order_cycle_clone.rb | 2 -- app/services/order_cycle_form.rb | 1 - app/services/variant_units/variant_and_line_item_naming.rb | 2 -- .../app/services/order_management/subscriptions/form.rb | 2 -- spec/lib/reports/enterprise_fee_summary/parameters_spec.rb | 2 -- spec/models/spree/variant_spec.rb | 1 - spec/services/invoice_renderer_spec.rb | 1 - spec/services/order_cycle_form_spec.rb | 1 - 19 files changed, 33 deletions(-) diff --git a/app/controllers/admin/schedules_controller.rb b/app/controllers/admin/schedules_controller.rb index 3165667312..46854d254d 100644 --- a/app/controllers/admin/schedules_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'open_food_network/permissions' -require 'order_management/subscriptions/proxy_order_syncer' module Admin class SchedulesController < Admin::ResourceController diff --git a/app/controllers/api/v0/enterprise_attachment_controller.rb b/app/controllers/api/v0/enterprise_attachment_controller.rb index b46f29b355..cf467aad98 100644 --- a/app/controllers/api/v0/enterprise_attachment_controller.rb +++ b/app/controllers/api/v0/enterprise_attachment_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'api/admin/enterprise_serializer' - module Api module V0 class EnterpriseAttachmentController < Api::V0::BaseController diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb index f26fbcaf61..8f67005c74 100644 --- a/app/jobs/subscription_confirm_job.rb +++ b/app/jobs/subscription_confirm_job.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'order_management/subscriptions/summarizer' - # Confirms orders of unconfirmed proxy orders in recently closed Order Cycles class SubscriptionConfirmJob < ApplicationJob def perform diff --git a/app/jobs/subscription_placement_job.rb b/app/jobs/subscription_placement_job.rb index fe15e99113..cb3609a5b2 100644 --- a/app/jobs/subscription_placement_job.rb +++ b/app/jobs/subscription_placement_job.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'order_management/subscriptions/summarizer' - class SubscriptionPlacementJob < ApplicationJob def perform proxy_orders.each do |proxy_order| diff --git a/app/models/spree/adjustment.rb b/app/models/spree/adjustment.rb index 7625b34962..90d2cca514 100644 --- a/app/models/spree/adjustment.rb +++ b/app/models/spree/adjustment.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'spree/localized_number' -require 'concerns/adjustment_scopes' # Adjustments represent a change to the +item_total+ of an Order. Each adjustment # has an +amount+ that can be either positive or negative. diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb index 05d3e8abaf..42fc9b6eec 100644 --- a/app/models/spree/gateway.rb +++ b/app/models/spree/gateway.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'concerns/payment_method_distributors' - module Spree class Gateway < PaymentMethod acts_as_taggable diff --git a/app/models/spree/line_item.rb b/app/models/spree/line_item.rb index 6de3fe9601..3797a777d5 100644 --- a/app/models/spree/line_item.rb +++ b/app/models/spree/line_item.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'open_food_network/scope_variant_to_hub' -require 'variant_units/variant_and_line_item_naming' module Spree class LineItem < ApplicationRecord diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 3dced4e802..238e935e5d 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require 'spree/order/checkout' -require 'open_food_network/enterprise_fee_calculator' -require 'open_food_network/feature_toggle' -require 'open_food_network/tag_rule_applicator' - module Spree class Order < ApplicationRecord include OrderShipment diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb index f3011b222c..5b60aded62 100644 --- a/app/models/spree/payment_method.rb +++ b/app/models/spree/payment_method.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'concerns/payment_method_distributors' - module Spree class PaymentMethod < ApplicationRecord include CalculatedAdjustments diff --git a/app/models/spree/product.rb b/app/models/spree/product.rb index 41b8c8f610..a2f70d4f77 100755 --- a/app/models/spree/product.rb +++ b/app/models/spree/product.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'open_food_network/property_merge' -require 'concerns/product_stock' # PRODUCTS # Products represent an entity for sale in a store. diff --git a/app/models/spree/variant.rb b/app/models/spree/variant.rb index f470f4bb51..adfa2b479d 100644 --- a/app/models/spree/variant.rb +++ b/app/models/spree/variant.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'open_food_network/enterprise_fee_calculator' -require 'variant_units/variant_and_line_item_naming' -require 'concerns/variant_stock' require 'spree/localized_number' module Spree diff --git a/app/services/order_cycle_clone.rb b/app/services/order_cycle_clone.rb index fffe6a1277..2d349a4f29 100644 --- a/app/services/order_cycle_clone.rb +++ b/app/services/order_cycle_clone.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'order_management/subscriptions/proxy_order_syncer' - class OrderCycleClone def initialize(order_cycle) @original_order_cycle = order_cycle diff --git a/app/services/order_cycle_form.rb b/app/services/order_cycle_form.rb index c25c589ce5..fbcfdf401d 100644 --- a/app/services/order_cycle_form.rb +++ b/app/services/order_cycle_form.rb @@ -2,7 +2,6 @@ require 'open_food_network/permissions' require 'open_food_network/order_cycle_form_applicator' -require 'order_management/subscriptions/proxy_order_syncer' class OrderCycleForm def initialize(order_cycle, order_cycle_params, user) diff --git a/app/services/variant_units/variant_and_line_item_naming.rb b/app/services/variant_units/variant_and_line_item_naming.rb index d0c72d4486..9b07413155 100644 --- a/app/services/variant_units/variant_and_line_item_naming.rb +++ b/app/services/variant_units/variant_and_line_item_naming.rb @@ -4,8 +4,6 @@ # It contains all of our logic for creating and naming option values (which are associated # with both models) and methods for printing human readable "names" for instances of these models. -require 'variant_units/option_value_namer' - module VariantUnits module VariantAndLineItemNaming def options_text diff --git a/engines/order_management/app/services/order_management/subscriptions/form.rb b/engines/order_management/app/services/order_management/subscriptions/form.rb index 8ea469d8b3..53c0e615cd 100644 --- a/engines/order_management/app/services/order_management/subscriptions/form.rb +++ b/engines/order_management/app/services/order_management/subscriptions/form.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'order_management/subscriptions/proxy_order_syncer' - module OrderManagement module Subscriptions class Form diff --git a/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb b/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb index d04d140283..25b684d5a0 100644 --- a/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb +++ b/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb @@ -2,8 +2,6 @@ require "spec_helper" -require "date_time_string_validator" - module Reporting module Reports module EnterpriseFeeSummary diff --git a/spec/models/spree/variant_spec.rb b/spec/models/spree/variant_spec.rb index 6897a220e0..d729f08bd5 100644 --- a/spec/models/spree/variant_spec.rb +++ b/spec/models/spree/variant_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: false require 'spec_helper' -require 'variant_units/option_value_namer' require 'spree/localized_number' describe Spree::Variant do diff --git a/spec/services/invoice_renderer_spec.rb b/spec/services/invoice_renderer_spec.rb index 2818ee8926..cbad391a0f 100644 --- a/spec/services/invoice_renderer_spec.rb +++ b/spec/services/invoice_renderer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'spec_helper' -require 'spree/payment_methods_helper' describe InvoiceRenderer do include Spree::PaymentMethodsHelper diff --git a/spec/services/order_cycle_form_spec.rb b/spec/services/order_cycle_form_spec.rb index 8e3c8012fd..6e0d95ca23 100644 --- a/spec/services/order_cycle_form_spec.rb +++ b/spec/services/order_cycle_form_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'spec_helper' -require 'order_management/subscriptions/proxy_order_syncer' describe OrderCycleForm do describe "save" do From 3fab2c350e4a2cd8059cef74f61842af6c3bfa45 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 3 Jan 2024 11:59:21 +0100 Subject: [PATCH 2/3] require tag_rule_applicator on Shop::OrderCyclesList --- app/services/shop/order_cycles_list.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/shop/order_cycles_list.rb b/app/services/shop/order_cycles_list.rb index 7f3ab665a3..5b0a6930cd 100644 --- a/app/services/shop/order_cycles_list.rb +++ b/app/services/shop/order_cycles_list.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'open_food_network/tag_rule_applicator' + # Lists available order cycles for a given customer in a given distributor module Shop class OrderCyclesList From 1ffdca3fc2d36211b9957e70197b99be0300bb8b Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Tue, 26 Dec 2023 15:09:28 +0100 Subject: [PATCH 3/3] require tag_rule_applicator as it's not loaded automatically on OrderAvailableShippingMethods & OrderAvailablePaymentMethods --- app/services/order_available_payment_methods.rb | 2 ++ app/services/order_available_shipping_methods.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/services/order_available_payment_methods.rb b/app/services/order_available_payment_methods.rb index dc0784d909..84ea0f870f 100644 --- a/app/services/order_available_payment_methods.rb +++ b/app/services/order_available_payment_methods.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'open_food_network/tag_rule_applicator' + class OrderAvailablePaymentMethods attr_reader :order, :customer diff --git a/app/services/order_available_shipping_methods.rb b/app/services/order_available_shipping_methods.rb index 9b4bcf76ba..8cd30fd804 100644 --- a/app/services/order_available_shipping_methods.rb +++ b/app/services/order_available_shipping_methods.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'open_food_network/tag_rule_applicator' + class OrderAvailableShippingMethods attr_reader :order, :customer