From 3382c1d0bbbd51a65721b84a065bdd56977caa42 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 25 Feb 2022 11:28:20 +1100 Subject: [PATCH] Relax some contested metrics rules Rubocop often complains while we think that the code is totally fine. I would like to achieve the default values one day but there are more important issues at the moment. --- .rubocop_styleguide.yml | 6 +- .rubocop_todo.yml | 291 +----------------- .../customer_totals_report.rb | 4 +- .../default_report.rb | 4 - .../supplier_totals_by_distributor_report.rb | 2 - .../supplier_totals_report.rb | 4 - 6 files changed, 8 insertions(+), 303 deletions(-) diff --git a/.rubocop_styleguide.yml b/.rubocop_styleguide.yml index 2cb5fb13d0..123e6272b6 100644 --- a/.rubocop_styleguide.yml +++ b/.rubocop_styleguide.yml @@ -78,7 +78,7 @@ Lint/UselessAssignment: Metrics/AbcSize: Enabled: true - Max: 15 + Max: 30 # default 17 Metrics/BlockLength: Enabled: true @@ -116,7 +116,7 @@ Metrics/CyclomaticComplexity: Metrics/MethodLength: Enabled: true - Max: 10 + Max: 25 # default 10 Metrics/ParameterLists: Enabled: true @@ -124,7 +124,7 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Enabled: true - Max: 7 + Max: 14 # default 8 Naming/PredicateName: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 49f7fe84e9..d0c9742a39 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400` -# on 2022-02-25 00:03:39 UTC using RuboCop version 1.22.2. +# on 2022-02-25 00:10:16 UTC using RuboCop version 1.22.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -403,178 +403,41 @@ Lint/UselessMethodDefinition: - 'app/controllers/spree/user_registrations_controller.rb' - 'app/models/spree/gateway.rb' -# Offense count: 263 +# Offense count: 39 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Max. Metrics/AbcSize: Exclude: - - 'app/controllers/admin/bulk_line_items_controller.rb' - - 'app/controllers/admin/customers_controller.rb' - - 'app/controllers/admin/enterprise_fees_controller.rb' - 'app/controllers/admin/enterprises_controller.rb' - - 'app/controllers/admin/order_cycles_controller.rb' - - 'app/controllers/admin/product_import_controller.rb' - - 'app/controllers/admin/resource_controller.rb' - - 'app/controllers/admin/schedules_controller.rb' - - 'app/controllers/admin/stripe_accounts_controller.rb' - - 'app/controllers/admin/subscription_line_items_controller.rb' - - 'app/controllers/admin/subscriptions_controller.rb' - - 'app/controllers/api/v0/enterprises_controller.rb' - - 'app/controllers/api/v0/product_images_controller.rb' - - 'app/controllers/api/v0/products_controller.rb' - - 'app/controllers/api/v0/shipments_controller.rb' - - 'app/controllers/api/v0/taxons_controller.rb' - - 'app/controllers/api/v0/variants_controller.rb' - - 'app/controllers/checkout_controller.rb' - - 'app/controllers/concerns/order_completion.rb' - - 'app/controllers/discourse_sso_controller.rb' - - 'app/controllers/enterprises_controller.rb' - 'app/controllers/payment_gateways/paypal_controller.rb' - - 'app/controllers/payment_gateways/stripe_controller.rb' - - 'app/controllers/split_checkout_controller.rb' - - 'app/controllers/spree/admin/adjustments_controller.rb' - - 'app/controllers/spree/admin/general_settings_controller.rb' - - 'app/controllers/spree/admin/images_controller.rb' - - 'app/controllers/spree/admin/mail_methods_controller.rb' - - 'app/controllers/spree/admin/orders/customer_details_controller.rb' - 'app/controllers/spree/admin/orders_controller.rb' - - 'app/controllers/spree/admin/overview_controller.rb' - - 'app/controllers/spree/admin/payment_methods_controller.rb' - 'app/controllers/spree/admin/payments_controller.rb' - - 'app/controllers/spree/admin/products_controller.rb' - - 'app/controllers/spree/admin/reports_controller.rb' - - 'app/controllers/spree/admin/search_controller.rb' - - 'app/controllers/spree/admin/shipping_methods_controller.rb' - 'app/controllers/spree/admin/taxons_controller.rb' - - 'app/controllers/spree/admin/users_controller.rb' - 'app/controllers/spree/admin/variants_controller.rb' - - 'app/controllers/spree/credit_cards_controller.rb' - 'app/controllers/spree/orders_controller.rb' - - 'app/controllers/spree/user_sessions_controller.rb' - - 'app/controllers/spree/users_controller.rb' - - 'app/controllers/stripe/callbacks_controller.rb' - - 'app/controllers/user_confirmations_controller.rb' - - 'app/controllers/user_passwords_controller.rb' - - 'app/controllers/user_registrations_controller.rb' - - 'app/helpers/application_helper.rb' - 'app/helpers/checkout_helper.rb' - - 'app/helpers/order_cycles_helper.rb' - - 'app/helpers/spree/admin/base_helper.rb' - 'app/helpers/spree/admin/navigation_helper.rb' - - 'app/helpers/spree/admin/zones_helper.rb' - - 'app/helpers/spree/base_helper.rb' - - 'app/helpers/spree/orders_helper.rb' - - 'app/helpers/tax_helper.rb' - - 'app/mailers/producer_mailer.rb' - - 'app/mailers/spree/order_mailer.rb' - - 'app/models/calculator/flat_percent_per_item.rb' - - 'app/models/column_preference.rb' - - 'app/models/enterprise.rb' - 'app/models/enterprise_group.rb' - 'app/models/enterprise_relationship.rb' - - 'app/models/order_cycle.rb' - 'app/models/product_import/entry_processor.rb' - - 'app/models/product_import/entry_validator.rb' - - 'app/models/product_import/product_importer.rb' - - 'app/models/product_import/unit_converter.rb' - - 'app/models/proxy_order.rb' - 'app/models/spree/ability.rb' - 'app/models/spree/address.rb' - - 'app/models/spree/adjustment.rb' - - 'app/models/spree/gateway/pay_pal_express.rb' - - 'app/models/spree/image.rb' - - 'app/models/spree/item_adjustments.rb' - - 'app/models/spree/line_item.rb' - - 'app/models/spree/order.rb' - 'app/models/spree/order/checkout.rb' - - 'app/models/spree/order_inventory.rb' - - 'app/models/spree/payment.rb' - - 'app/models/spree/payment/processing.rb' - - 'app/models/spree/preference.rb' - - 'app/models/spree/preferences/preferable.rb' - 'app/models/spree/preferences/preferable_class_methods.rb' - - 'app/models/spree/product.rb' - 'app/models/spree/return_authorization.rb' - - 'app/models/spree/shipment.rb' - - 'app/models/spree/tax_rate.rb' - - 'app/models/spree/taxon.rb' - - 'app/models/spree/variant.rb' - - 'app/models/spree/zone.rb' - - 'app/serializers/api/admin/enterprise_serializer.rb' - - 'app/serializers/api/variant_serializer.rb' - - 'app/services/cap_quantity.rb' - - 'app/services/cart_service.rb' - - 'app/services/create_order_cycle.rb' - - 'app/services/order_cycle_form.rb' - - 'app/services/order_factory.rb' - - 'app/services/order_syncer.rb' - - 'app/services/place_proxy_order.rb' - - 'app/services/process_payment_intent.rb' - - 'app/services/products_renderer.rb' - - 'app/services/search_orders.rb' - - 'app/services/sets/model_set.rb' - - 'app/services/variant_units/option_value_namer.rb' - - 'app/services/variant_units/variant_and_line_item_naming.rb' - - 'app/services/variants_stock_levels.rb' - - 'engines/order_management/app/services/order_management/order/updater.rb' - 'engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb' - - 'engines/order_management/app/services/order_management/stock/estimator.rb' - - 'engines/order_management/app/services/order_management/stock/package.rb' - - 'engines/order_management/app/services/order_management/stock/packer.rb' - - 'engines/order_management/app/services/order_management/subscriptions/form.rb' - - 'engines/order_management/app/services/order_management/subscriptions/validator.rb' - - 'lib/active_merchant/billing/gateways/stripe_payment_intents_decorator.rb' - 'lib/discourse/single_sign_on.rb' - 'lib/open_food_network/customers_report.rb' - - 'lib/open_food_network/enterprise_fee_calculator.rb' - - 'lib/open_food_network/enterprise_issue_validator.rb' - 'lib/open_food_network/group_buy_report.rb' - - 'lib/open_food_network/lettuce_share_report.rb' - 'lib/open_food_network/order_and_distributor_report.rb' - 'lib/open_food_network/order_cycle_form_applicator.rb' - - 'lib/open_food_network/order_cycle_management_report.rb' - 'lib/open_food_network/order_cycle_permissions.rb' - - 'lib/open_food_network/order_grouper.rb' - - 'lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb' - 'lib/open_food_network/payments_report.rb' - - 'lib/open_food_network/permissions.rb' - - 'lib/open_food_network/products_and_inventory_report.rb' - - 'lib/open_food_network/reports/line_items.rb' - 'lib/open_food_network/sales_tax_report.rb' - - 'lib/open_food_network/users_and_enterprises_report.rb' - - 'lib/open_food_network/xero_invoices_report.rb' - - 'lib/reporting/queries/query_builder.rb' - - 'lib/reporting/reports/packing/base.rb' - 'lib/reporting/reports/packing/customer.rb' - - 'lib/reporting/reports/packing/supplier.rb' - - 'lib/session_cookie_upgrader.rb' - - 'lib/spree/api/controller_setup.rb' - - 'lib/spree/core/controller_helpers/auth.rb' - - 'lib/spree/core/controller_helpers/common.rb' - 'lib/spree/core/controller_helpers/order.rb' - - 'lib/spree/core/controller_helpers/respond_with.rb' - - 'lib/spree/core/delegate_belongs_to.rb' - - 'lib/spree/core/permalinks.rb' - - 'lib/spree/core/product_duplicator.rb' - 'lib/spree/core/s3_support.rb' - - 'lib/spree/localized_number.rb' - - 'lib/stripe/account_connector.rb' - - 'lib/stripe/authorize_response_patcher.rb' - - 'lib/stripe/profile_storer.rb' - 'lib/tasks/enterprises.rake' - - 'lib/tasks/sample_data/order_factory.rb' - - 'lib/tasks/sample_data/product_factory.rb' - - 'spec/controllers/api/v0/reports/packing_report_spec.rb' - - 'spec/models/enterprise_spec.rb' - - 'spec/models/product_importer_spec.rb' - 'spec/services/order_checkout_restart_spec.rb' - - 'spec/support/i18n_translations_checker.rb' - - 'spec/support/performance_helper.rb' - - 'spec/support/request/web_helper.rb' - - 'spec/system/admin/product_import_spec.rb' - - 'spec/system/admin/reports_spec.rb' - - 'spec/system/admin/subscriptions_spec.rb' - - 'spec/system/consumer/shopping/shopping_spec.rb' - - 'spec/system/consumer/shopping/variant_overrides_spec.rb' # Offense count: 45 # Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods. @@ -732,146 +595,30 @@ Metrics/CyclomaticComplexity: - 'spec/models/product_importer_spec.rb' - 'spec/support/i18n_translations_checker.rb' -# Offense count: 260 +# Offense count: 31 # Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods. Metrics/MethodLength: Exclude: - - 'app/controllers/admin/bulk_line_items_controller.rb' - - 'app/controllers/admin/contents_controller.rb' - - 'app/controllers/admin/customers_controller.rb' - - 'app/controllers/admin/enterprise_fees_controller.rb' - 'app/controllers/admin/enterprises_controller.rb' - - 'app/controllers/admin/manager_invitations_controller.rb' - - 'app/controllers/admin/order_cycles_controller.rb' - - 'app/controllers/admin/resource_controller.rb' - - 'app/controllers/admin/stripe_accounts_controller.rb' - - 'app/controllers/admin/subscriptions_controller.rb' - - 'app/controllers/api/v0/exchange_products_controller.rb' - - 'app/controllers/api/v0/product_images_controller.rb' - - 'app/controllers/api/v0/products_controller.rb' - - 'app/controllers/api/v0/shipments_controller.rb' - - 'app/controllers/api/v0/taxons_controller.rb' - - 'app/controllers/api/v0/variants_controller.rb' - - 'app/controllers/checkout_controller.rb' - - 'app/controllers/concerns/order_completion.rb' - 'app/controllers/payment_gateways/paypal_controller.rb' - - 'app/controllers/shop_controller.rb' - - 'app/controllers/split_checkout_controller.rb' - - 'app/controllers/spree/admin/orders/customer_details_controller.rb' - - 'app/controllers/spree/admin/orders_controller.rb' - - 'app/controllers/spree/admin/payment_methods_controller.rb' - - 'app/controllers/spree/admin/payments_controller.rb' - - 'app/controllers/spree/admin/products_controller.rb' - - 'app/controllers/spree/admin/reports_controller.rb' - - 'app/controllers/spree/admin/tax_categories_controller.rb' - 'app/controllers/spree/admin/taxons_controller.rb' - - 'app/controllers/spree/admin/users_controller.rb' - - 'app/controllers/spree/admin/variants_controller.rb' - - 'app/controllers/spree/credit_cards_controller.rb' - 'app/controllers/spree/orders_controller.rb' - - 'app/controllers/spree/user_sessions_controller.rb' - - 'app/controllers/spree/users_controller.rb' - - 'app/controllers/stripe/callbacks_controller.rb' - - 'app/controllers/user_confirmations_controller.rb' - - 'app/controllers/user_passwords_controller.rb' - - 'app/controllers/user_registrations_controller.rb' - - 'app/helpers/application_helper.rb' - 'app/helpers/checkout_helper.rb' - - 'app/helpers/order_cycles_helper.rb' - - 'app/helpers/spree/admin/base_helper.rb' - 'app/helpers/spree/admin/navigation_helper.rb' - - 'app/mailers/producer_mailer.rb' - - 'app/models/calculator/default_tax.rb' - - 'app/models/column_preference.rb' - - 'app/models/concerns/calculated_adjustments.rb' - - 'app/models/enterprise.rb' - - 'app/models/enterprise_relationship.rb' - - 'app/models/preference_sections/footer_and_external_links_section.rb' - - 'app/models/preference_sections/main_links_section.rb' - - 'app/models/product_import/entry_processor.rb' - - 'app/models/product_import/entry_validator.rb' - - 'app/models/product_import/product_importer.rb' - 'app/models/spree/ability.rb' - - 'app/models/spree/address.rb' - - 'app/models/spree/adjustment.rb' - - 'app/models/spree/credit_card.rb' - 'app/models/spree/gateway/pay_pal_express.rb' - - 'app/models/spree/order.rb' - 'app/models/spree/order/checkout.rb' - - 'app/models/spree/order_contents.rb' - - 'app/models/spree/order_inventory.rb' - 'app/models/spree/payment/processing.rb' - - 'app/models/spree/preference.rb' - - 'app/models/spree/preferences/preferable.rb' - 'app/models/spree/preferences/preferable_class_methods.rb' - - 'app/models/spree/preferences/store.rb' - - 'app/models/spree/product.rb' - - 'app/models/spree/return_authorization.rb' - - 'app/models/spree/shipment.rb' - - 'app/models/spree/tax_rate.rb' - - 'app/models/spree/taxon.rb' - - 'app/models/spree/zone.rb' - - 'app/serializers/api/admin/order_cycle_serializer.rb' - - 'app/serializers/api/cached_enterprise_serializer.rb' - - 'app/services/cart_service.rb' - - 'app/services/mail_configuration.rb' - - 'app/services/order_cycle_form.rb' - - 'app/services/permitted_attributes/checkout.rb' - - 'app/services/permitted_attributes/enterprise.rb' - - 'app/services/place_proxy_order.rb' - - 'app/services/process_payment_intent.rb' - - 'app/services/products_renderer.rb' - - 'app/services/variant_units/option_value_namer.rb' - - 'engines/order_management/app/services/order_management/order/updater.rb' - - 'engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb' - 'engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb' - - 'engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb' - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb' - - 'engines/order_management/app/services/order_management/stock/estimator.rb' - - 'engines/order_management/app/services/order_management/stock/package.rb' - - 'lib/active_merchant/billing/gateways/stripe_payment_intents_decorator.rb' - 'lib/discourse/single_sign_on.rb' - - 'lib/open_food_network/column_preference_defaults.rb' - - 'lib/open_food_network/customers_report.rb' - - 'lib/open_food_network/enterprise_fee_calculator.rb' - - 'lib/open_food_network/enterprise_issue_validator.rb' - - 'lib/open_food_network/group_buy_report.rb' - - 'lib/open_food_network/lettuce_share_report.rb' - - 'lib/open_food_network/order_and_distributor_report.rb' - 'lib/open_food_network/order_cycle_form_applicator.rb' - 'lib/open_food_network/order_cycle_management_report.rb' - 'lib/open_food_network/order_cycle_permissions.rb' - - 'lib/open_food_network/order_grouper.rb' - 'lib/open_food_network/payments_report.rb' - - 'lib/open_food_network/permissions.rb' - - 'lib/open_food_network/products_and_inventory_report.rb' - - 'lib/open_food_network/reports/line_items.rb' - - 'lib/open_food_network/sales_tax_report.rb' - - 'lib/open_food_network/users_and_enterprises_report.rb' - 'lib/open_food_network/xero_invoices_report.rb' - - 'lib/reporting/reports/packing/base.rb' - - 'lib/reporting/reports/packing/customer.rb' - - 'lib/reporting/reports/packing/supplier.rb' - - 'lib/session_cookie_upgrader.rb' - - 'lib/spree/api/controller_setup.rb' - - 'lib/spree/core/controller_helpers/order.rb' - - 'lib/spree/core/controller_helpers/respond_with.rb' - - 'lib/spree/core/delegate_belongs_to.rb' - - 'lib/spree/core/permalinks.rb' - - 'lib/spree/core/s3_support.rb' - - 'lib/spree/localized_number.rb' - - 'lib/spree/responder.rb' - - 'lib/stripe/credit_card_clone_finder.rb' - - 'lib/stripe/profile_storer.rb' - - 'lib/tasks/sample_data/group_factory.rb' - - 'lib/tasks/sample_data/order_factory.rb' - 'lib/tasks/sample_data/product_factory.rb' - - 'spec/controllers/api/v0/reports/packing_report_spec.rb' - - 'spec/models/product_importer_spec.rb' - - 'spec/support/i18n_translations_checker.rb' - - 'spec/support/request/checkout_request_helper.rb' - - 'spec/system/admin/reports_spec.rb' - - 'spec/system/consumer/shopping/variant_overrides_spec.rb' # Offense count: 20 # Configuration parameters: CountComments, Max, CountAsOne. @@ -908,48 +655,18 @@ Metrics/ParameterLists: - 'spec/support/controller_requests_helper.rb' - 'spec/system/admin/reports_spec.rb' -# Offense count: 45 +# Offense count: 8 # Configuration parameters: IgnoredMethods, Max. Metrics/PerceivedComplexity: Exclude: - - 'app/controllers/admin/enterprises_controller.rb' - - 'app/controllers/api/v0/variants_controller.rb' - - 'app/controllers/spree/admin/orders_controller.rb' - - 'app/controllers/spree/admin/payments_controller.rb' - 'app/controllers/spree/admin/taxons_controller.rb' - - 'app/controllers/spree/admin/users_controller.rb' - - 'app/controllers/spree/orders_controller.rb' - 'app/helpers/checkout_helper.rb' - - 'app/helpers/order_cycles_helper.rb' - - 'app/helpers/spree/admin/navigation_helper.rb' - 'app/models/enterprise_relationship.rb' - - 'app/models/product_import/entry_validator.rb' - 'app/models/spree/ability.rb' - - 'app/models/spree/address.rb' - 'app/models/spree/order/checkout.rb' - - 'app/models/spree/order_inventory.rb' - - 'app/models/spree/preferences/preferable.rb' - - 'app/models/spree/preferences/preferable_class_methods.rb' - - 'app/models/spree/product.rb' - - 'app/models/spree/return_authorization.rb' - - 'app/models/spree/tax_rate.rb' - - 'app/models/spree/variant.rb' - - 'app/models/spree/zone.rb' - - 'app/services/products_renderer.rb' - - 'app/services/sets/model_set.rb' - 'engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb' - - 'lib/discourse/single_sign_on.rb' - - 'lib/open_food_network/customers_report.rb' - - 'lib/open_food_network/enterprise_issue_validator.rb' - 'lib/open_food_network/group_buy_report.rb' - - 'lib/open_food_network/order_cycle_form_applicator.rb' - - 'lib/open_food_network/order_cycle_permissions.rb' - 'lib/open_food_network/payments_report.rb' - - 'lib/open_food_network/xero_invoices_report.rb' - - 'lib/spree/core/controller_helpers/order.rb' - - 'lib/spree/core/controller_helpers/respond_with.rb' - - 'lib/spree/localized_number.rb' - - 'spec/models/product_importer_spec.rb' # Offense count: 9 Naming/AccessorMethodName: diff --git a/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb b/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb index f012c25cd9..f65ad3a16f 100644 --- a/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb +++ b/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb @@ -17,7 +17,6 @@ module OpenFoodNetwork end # rubocop:disable Metrics/AbcSize - # rubocop:disable Metrics/MethodLength def header [I18n.t(:report_header_hub), I18n.t(:report_header_customer), I18n.t(:report_header_email), I18n.t(:report_header_phone), I18n.t(:report_header_producer), @@ -42,9 +41,8 @@ module OpenFoodNetwork I18n.t(:report_header_order_number), I18n.t(:report_header_date)] end - # rubocop:enable Metrics/AbcSize - # rubocop:enable Metrics/MethodLength + # rubocop:enable Metrics/AbcSize # rubocop:disable Metrics/AbcSize # rubocop:disable Metrics/MethodLength def rules diff --git a/lib/open_food_network/orders_and_fulfillments_report/default_report.rb b/lib/open_food_network/orders_and_fulfillments_report/default_report.rb index 9fd0efa6a0..3d10c9d7c4 100644 --- a/lib/open_food_network/orders_and_fulfillments_report/default_report.rb +++ b/lib/open_food_network/orders_and_fulfillments_report/default_report.rb @@ -22,7 +22,6 @@ module OpenFoodNetwork ] end - # rubocop:disable Metrics/MethodLength def rules [ { @@ -39,9 +38,7 @@ module OpenFoodNetwork } ] end - # rubocop:enable Metrics/MethodLength - # rubocop:disable Metrics/AbcSize def columns [ supplier_name, @@ -54,7 +51,6 @@ module OpenFoodNetwork proc { |_line_items| I18n.t(:report_header_incoming_transport) } ] end - # rubocop:enable Metrics/AbcSize def line_item_includes [] diff --git a/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_by_distributor_report.rb b/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_by_distributor_report.rb index d294a514c6..404fd2eeb3 100644 --- a/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_by_distributor_report.rb +++ b/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_by_distributor_report.rb @@ -55,7 +55,6 @@ module OpenFoodNetwork # rubocop:enable Metrics/AbcSize # rubocop:enable Metrics/MethodLength - # rubocop:disable Metrics/AbcSize def columns [ supplier_name, @@ -68,7 +67,6 @@ module OpenFoodNetwork proc { |_line_items| I18n.t(:report_header_shipping_method) } ] end - # rubocop:enable Metrics/AbcSize def line_item_includes [{ order: :distributor, diff --git a/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb b/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb index 60c11d93e0..9fd5f7fcf9 100644 --- a/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb +++ b/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb @@ -21,7 +21,6 @@ module OpenFoodNetwork I18n.t(:report_header_incoming_transport)] end - # rubocop:disable Metrics/MethodLength def rules [ { @@ -38,9 +37,7 @@ module OpenFoodNetwork } ] end - # rubocop:enable Metrics/MethodLength - # rubocop:disable Metrics/MethodLength def columns [ supplier_name, @@ -54,7 +51,6 @@ module OpenFoodNetwork proc { |_line_items| I18n.t(:report_header_incoming_transport) } ] end - # rubocop:enable Metrics/MethodLength def line_item_includes [{ variant: [{ option_values: :option_type }, { product: :supplier }] }]