From bdb3dd5aaf14c3f3d0d7ead24a8d503b4d0f4492 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Thu, 19 Sep 2019 16:23:01 +0100 Subject: [PATCH] Fix long lines in app/serializers --- .rubocop_manual_todo.yml | 12 ------------ .../api/admin/basic_enterprise_serializer.rb | 4 ++-- .../api/admin/enterprise_fee_serializer.rb | 8 +++++--- .../api/admin/enterprise_serializer.rb | 18 ++++++++++++------ .../api/admin/exchange_serializer.rb | 3 ++- .../for_order_cycle/enterprise_serializer.rb | 9 +++++++-- .../api/admin/index_enterprise_serializer.rb | 4 ++-- .../api/admin/index_order_cycle_serializer.rb | 5 ++++- .../api/admin/line_item_serializer.rb | 6 ++++-- .../api/admin/order_cycle_serializer.rb | 18 ++++++++++++++---- .../api/admin/subscription_serializer.rb | 3 ++- .../api/admin/tag_rule_serializer.rb | 6 ++++-- .../api/admin/variant_override_serializer.rb | 4 ++-- 13 files changed, 60 insertions(+), 40 deletions(-) diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 0804602b70..b4cf580789 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -110,18 +110,6 @@ Metrics/LineLength: - app/models/variant_override.rb - app/models/variant_override_set.rb - app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb - - app/serializers/api/admin/basic_enterprise_serializer.rb - - app/serializers/api/admin/enterprise_fee_serializer.rb - - app/serializers/api/admin/enterprise_serializer.rb - - app/serializers/api/admin/exchange_serializer.rb - - app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb - - app/serializers/api/admin/index_enterprise_serializer.rb - - app/serializers/api/admin/index_order_cycle_serializer.rb - - app/serializers/api/admin/line_item_serializer.rb - - app/serializers/api/admin/order_cycle_serializer.rb - - app/serializers/api/admin/subscription_serializer.rb - - app/serializers/api/admin/tag_rule_serializer.rb - - app/serializers/api/admin/variant_override_serializer.rb - app/services/cart_service.rb - app/services/default_stock_location.rb - app/services/embedded_page_service.rb diff --git a/app/serializers/api/admin/basic_enterprise_serializer.rb b/app/serializers/api/admin/basic_enterprise_serializer.rb index c82eb8994d..880147e296 100644 --- a/app/serializers/api/admin/basic_enterprise_serializer.rb +++ b/app/serializers/api/admin/basic_enterprise_serializer.rb @@ -1,4 +1,4 @@ class Api::Admin::BasicEnterpriseSerializer < ActiveModel::Serializer - attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :payment_method_ids, :shipping_method_ids, - :producer_profile_only, :permalink + attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, + :payment_method_ids, :shipping_method_ids, :producer_profile_only, :permalink end diff --git a/app/serializers/api/admin/enterprise_fee_serializer.rb b/app/serializers/api/admin/enterprise_fee_serializer.rb index 6c59a3d482..dec43261d4 100644 --- a/app/serializers/api/admin/enterprise_fee_serializer.rb +++ b/app/serializers/api/admin/enterprise_fee_serializer.rb @@ -1,6 +1,6 @@ class Api::Admin::EnterpriseFeeSerializer < ActiveModel::Serializer - attributes :id, :enterprise_id, :fee_type, :name, :tax_category_id, :inherits_tax_category, :calculator_type, - :enterprise_name, :calculator_description, :calculator_settings + attributes :id, :enterprise_id, :fee_type, :name, :tax_category_id, :inherits_tax_category, + :calculator_type, :enterprise_name, :calculator_description, :calculator_settings def enterprise_name object.enterprise.andand.name @@ -16,7 +16,9 @@ class Api::Admin::EnterpriseFeeSerializer < ActiveModel::Serializer result = nil options[:controller].__send__(:with_format, :html) do - result = options[:controller].render_to_string partial: 'admin/enterprise_fees/calculator_settings', locals: { enterprise_fee: object } + result = options[:controller]. + render_to_string(partial: 'admin/enterprise_fees/calculator_settings', + locals: { enterprise_fee: object }) end result.gsub('[0]', '[{{ $index }}]').gsub('_0_', '_{{ $index }}_') diff --git a/app/serializers/api/admin/enterprise_serializer.rb b/app/serializers/api/admin/enterprise_serializer.rb index 702f39aa29..1d1e45e4e8 100644 --- a/app/serializers/api/admin/enterprise_serializer.rb +++ b/app/serializers/api/admin/enterprise_serializer.rb @@ -1,7 +1,8 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer - attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :payment_method_ids, :shipping_method_ids, - :producer_profile_only, :long_description, :permalink, - :preferred_shopfront_message, :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order, + attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :permalink, + :payment_method_ids, :shipping_method_ids, :producer_profile_only, :long_description, + :preferred_shopfront_message, :preferred_shopfront_closed_message, + :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order, :preferred_product_selection_from_inventory_only, :owner, :contact, :users, :tag_groups, :default_tag_group, :require_login, :allow_guest_orders, :allow_order_changes, @@ -21,7 +22,9 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer def tag_groups object.tag_rules.prioritised.reject(&:is_default).each_with_object([]) do |tag_rule, tag_groups| - tag_group = find_match(tag_groups, tag_rule.preferred_customer_tags.split(",").map{ |t| { text: t } }) + tag_group = find_match(tag_groups, tag_rule.preferred_customer_tags. + split(","). + map{ |t| { text: t } }) if tag_group[:rules].empty? tag_groups << tag_group tag_group[:position] = tag_groups.count @@ -32,13 +35,16 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer def default_tag_group default_rules = object.tag_rules.select(&:is_default) - serialized_rules = ActiveModel::ArraySerializer.new(default_rules, each_serializer: Api::Admin::TagRuleSerializer) + serialized_rules = + ActiveModel::ArraySerializer.new(default_rules, + each_serializer: Api::Admin::TagRuleSerializer) { tags: [], rules: serialized_rules } end def find_match(tag_groups, tags) tag_groups.each do |tag_group| - return tag_group if tag_group[:tags].length == tags.length && (tag_group[:tags] & tags) == tag_group[:tags] + return tag_group if tag_group[:tags].length == tags.length && + (tag_group[:tags] & tags) == tag_group[:tags] end { tags: tags, rules: [] } end diff --git a/app/serializers/api/admin/exchange_serializer.rb b/app/serializers/api/admin/exchange_serializer.rb index 483f490f47..ad81cfa9f1 100644 --- a/app/serializers/api/admin/exchange_serializer.rb +++ b/app/serializers/api/admin/exchange_serializer.rb @@ -1,5 +1,6 @@ class Api::Admin::ExchangeSerializer < ActiveModel::Serializer - attributes :id, :sender_id, :receiver_id, :incoming, :variants, :receival_instructions, :pickup_time, :pickup_instructions, + attributes :id, :sender_id, :receiver_id, :incoming, :variants, + :receival_instructions, :pickup_time, :pickup_instructions, :tags, :tag_list has_many :enterprise_fees, serializer: Api::Admin::BasicEnterpriseFeeSerializer diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb index 0724778ba7..0d15bbb80b 100644 --- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb +++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb @@ -6,7 +6,11 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer :is_primary_producer, :is_distributor, :sells def issues_summary_supplier - issues = OpenFoodNetwork::EnterpriseIssueValidator.new(object).issues_summary confirmation_only: true + issues = + OpenFoodNetwork::EnterpriseIssueValidator. + new(object). + issues_summary(confirmation_only: true) + if issues.nil? && products.empty? issues = "no products in inventory" end @@ -23,7 +27,8 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer def supplied_products serializer = Api::Admin::ForOrderCycle::SuppliedProductSerializer - ActiveModel::ArraySerializer.new(products, each_serializer: serializer, order_cycle: order_cycle) + ActiveModel::ArraySerializer.new(products, each_serializer: serializer, + order_cycle: order_cycle) end private diff --git a/app/serializers/api/admin/index_enterprise_serializer.rb b/app/serializers/api/admin/index_enterprise_serializer.rb index 6cf877aa45..8946686c5f 100644 --- a/app/serializers/api/admin/index_enterprise_serializer.rb +++ b/app/serializers/api/admin/index_enterprise_serializer.rb @@ -1,8 +1,8 @@ require 'open_food_network/enterprise_issue_validator' class Api::Admin::IndexEnterpriseSerializer < ActiveModel::Serializer - attributes :name, :id, :permalink, :is_primary_producer, :sells, :producer_profile_only, :owned, :edit_path, - :issues, :warnings + attributes :name, :id, :permalink, :is_primary_producer, :sells, :producer_profile_only, :owned, + :edit_path, :issues, :warnings def owned return true if options[:spree_current_user].admin? diff --git a/app/serializers/api/admin/index_order_cycle_serializer.rb b/app/serializers/api/admin/index_order_cycle_serializer.rb index 97ff415f24..f621f32dc0 100644 --- a/app/serializers/api/admin/index_order_cycle_serializer.rb +++ b/app/serializers/api/admin/index_order_cycle_serializer.rb @@ -68,7 +68,10 @@ module Api private def visible_enterprises - @visible_enterprises ||= OpenFoodNetwork::OrderCyclePermissions.new(options[:current_user], object).visible_enterprises + @visible_enterprises ||= + OpenFoodNetwork::OrderCyclePermissions. + new(options[:current_user], object). + visible_enterprises end end end diff --git a/app/serializers/api/admin/line_item_serializer.rb b/app/serializers/api/admin/line_item_serializer.rb index 5feeddc43a..63ae22a6fb 100644 --- a/app/serializers/api/admin/line_item_serializer.rb +++ b/app/serializers/api/admin/line_item_serializer.rb @@ -1,5 +1,6 @@ class Api::Admin::LineItemSerializer < ActiveModel::Serializer - attributes :id, :quantity, :max_quantity, :price, :supplier, :final_weight_volume, :units_product, :units_variant + attributes :id, :quantity, :max_quantity, :price, :supplier, :final_weight_volume, + :units_product, :units_variant has_one :order, serializer: Api::Admin::IdSerializer @@ -20,7 +21,8 @@ class Api::Admin::LineItemSerializer < ActiveModel::Serializer end def max_quantity - return object.quantity unless object.max_quantity.present? && object.max_quantity > object.quantity + return object.quantity unless object.max_quantity.present? && + object.max_quantity > object.quantity object.max_quantity end end diff --git a/app/serializers/api/admin/order_cycle_serializer.rb b/app/serializers/api/admin/order_cycle_serializer.rb index 1001908ded..52e6f52711 100644 --- a/app/serializers/api/admin/order_cycle_serializer.rb +++ b/app/serializers/api/admin/order_cycle_serializer.rb @@ -25,8 +25,14 @@ class Api::Admin::OrderCycleSerializer < ActiveModel::Serializer end def exchanges - scoped_exchanges = OpenFoodNetwork::OrderCyclePermissions.new(options[:current_user], object).visible_exchanges.by_enterprise_name - ActiveModel::ArraySerializer.new(scoped_exchanges, each_serializer: Api::Admin::ExchangeSerializer, current_user: options[:current_user]) + scoped_exchanges = + OpenFoodNetwork::OrderCyclePermissions. + new(options[:current_user], object). + visible_exchanges.by_enterprise_name + + ActiveModel::ArraySerializer. + new(scoped_exchanges, each_serializer: Api::Admin::ExchangeSerializer, + current_user: options[:current_user]) end def editable_variants_for_incoming_exchanges @@ -66,9 +72,13 @@ class Api::Admin::OrderCycleSerializer < ActiveModel::Serializer # for shops. We need this here to allow hubs to restrict visible variants to only those in # their inventory if they so choose variants = if enterprise.prefers_product_selection_from_inventory_only? - permissions.visible_variants_for_outgoing_exchanges_to(enterprise).visible_for(enterprise) + permissions. + visible_variants_for_outgoing_exchanges_to(enterprise). + visible_for(enterprise) else - permissions.visible_variants_for_outgoing_exchanges_to(enterprise).not_hidden_for(enterprise) + permissions. + visible_variants_for_outgoing_exchanges_to(enterprise). + not_hidden_for(enterprise) end.pluck(:id) visible[enterprise.id] = variants if variants.any? end diff --git a/app/serializers/api/admin/subscription_serializer.rb b/app/serializers/api/admin/subscription_serializer.rb index 1ffd4d3eed..10b2634772 100644 --- a/app/serializers/api/admin/subscription_serializer.rb +++ b/app/serializers/api/admin/subscription_serializer.rb @@ -1,7 +1,8 @@ module Api module Admin class SubscriptionSerializer < ActiveModel::Serializer - attributes :id, :shop_id, :customer_id, :schedule_id, :payment_method_id, :shipping_method_id, :begins_at, :ends_at, + attributes :id, :shop_id, :customer_id, :schedule_id, :payment_method_id, :shipping_method_id, + :begins_at, :ends_at, :customer_email, :schedule_name, :edit_path, :canceled_at, :paused_at, :state, :shipping_fee_estimate, :payment_fee_estimate diff --git a/app/serializers/api/admin/tag_rule_serializer.rb b/app/serializers/api/admin/tag_rule_serializer.rb index 61cbb7ad5f..7e07fa117c 100644 --- a/app/serializers/api/admin/tag_rule_serializer.rb +++ b/app/serializers/api/admin/tag_rule_serializer.rb @@ -16,7 +16,8 @@ module Api::Admin::TagRule end class FilterShippingMethodsSerializer < BaseSerializer - attributes :preferred_matched_shipping_methods_visibility, :preferred_shipping_method_tags, :shipping_method_tags + attributes :preferred_matched_shipping_methods_visibility, :preferred_shipping_method_tags, + :shipping_method_tags def shipping_method_tags object.preferred_shipping_method_tags.split(",") @@ -24,7 +25,8 @@ module Api::Admin::TagRule end class FilterPaymentMethodsSerializer < BaseSerializer - attributes :preferred_matched_payment_methods_visibility, :preferred_payment_method_tags, :payment_method_tags + attributes :preferred_matched_payment_methods_visibility, :preferred_payment_method_tags, + :payment_method_tags def payment_method_tags object.preferred_payment_method_tags.split(",") diff --git a/app/serializers/api/admin/variant_override_serializer.rb b/app/serializers/api/admin/variant_override_serializer.rb index 683ad0101e..f21f751911 100644 --- a/app/serializers/api/admin/variant_override_serializer.rb +++ b/app/serializers/api/admin/variant_override_serializer.rb @@ -1,6 +1,6 @@ class Api::Admin::VariantOverrideSerializer < ActiveModel::Serializer - attributes :id, :hub_id, :variant_id, :sku, :price, :count_on_hand, :on_demand, :default_stock, :resettable, - :tag_list, :tags, :import_date + attributes :id, :hub_id, :variant_id, :sku, :price, :count_on_hand, :on_demand, :default_stock, + :resettable, :tag_list, :tags, :import_date def tag_list object.tag_list.join(",")