From a44a251d960026600fed8ecae18a1ed4446d916d Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Thu, 19 Sep 2019 10:37:40 +0100 Subject: [PATCH] Remove duplicated attributes tag from all serializers to create consistency --- app/serializers/api/adjustment_serializer.rb | 8 ++++---- .../api/admin/basic_enterprise_serializer.rb | 4 ++-- app/serializers/api/admin/customer_serializer.rb | 4 ++-- .../api/admin/enterprise_fee_serializer.rb | 4 ++-- app/serializers/api/admin/enterprise_serializer.rb | 14 +++++++------- app/serializers/api/admin/exchange_serializer.rb | 4 ++-- .../admin/for_order_cycle/enterprise_serializer.rb | 6 +++--- .../api/admin/index_enterprise_serializer.rb | 5 ++--- .../api/admin/index_order_cycle_serializer.rb | 6 +++--- .../api/admin/order_cycle_serializer.rb | 8 ++++---- app/serializers/api/admin/order_serializer.rb | 10 +++++----- .../api/admin/subscription_serializer.rb | 6 +++--- .../api/admin/variant_override_serializer.rb | 4 ++-- app/serializers/api/admin/variant_serializer.rb | 8 ++++---- app/serializers/api/order_serializer.rb | 8 ++++---- app/serializers/api/variant_serializer.rb | 10 +++++----- 16 files changed, 54 insertions(+), 55 deletions(-) diff --git a/app/serializers/api/adjustment_serializer.rb b/app/serializers/api/adjustment_serializer.rb index 5f0938cbcb..254b173777 100644 --- a/app/serializers/api/adjustment_serializer.rb +++ b/app/serializers/api/adjustment_serializer.rb @@ -1,8 +1,8 @@ module Api class AdjustmentSerializer < ActiveModel::Serializer - attributes :id, :amount, :label, :eligible - attributes :source_type, :source_id - attributes :adjustable_type, :adjustable_id - attributes :originator_type, :originator_id + attributes :id, :amount, :label, :eligible, + :source_type, :source_id, + :adjustable_type, :adjustable_id, + :originator_type, :originator_id end end diff --git a/app/serializers/api/admin/basic_enterprise_serializer.rb b/app/serializers/api/admin/basic_enterprise_serializer.rb index 854b9b4019..c82eb8994d 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 - attributes :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/customer_serializer.rb b/app/serializers/api/admin/customer_serializer.rb index f5fb4405be..2bc9f5a7db 100644 --- a/app/serializers/api/admin/customer_serializer.rb +++ b/app/serializers/api/admin/customer_serializer.rb @@ -1,6 +1,6 @@ class Api::Admin::CustomerSerializer < ActiveModel::Serializer - attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :name - attributes :allow_charges, :default_card_present? + attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :name, + :allow_charges, :default_card_present? has_one :ship_address, serializer: Api::AddressSerializer has_one :bill_address, serializer: Api::AddressSerializer diff --git a/app/serializers/api/admin/enterprise_fee_serializer.rb b/app/serializers/api/admin/enterprise_fee_serializer.rb index 2f7f7ca10e..6c59a3d482 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 - attributes :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 diff --git a/app/serializers/api/admin/enterprise_serializer.rb b/app/serializers/api/admin/enterprise_serializer.rb index a4bba2b3d2..702f39aa29 100644 --- a/app/serializers/api/admin/enterprise_serializer.rb +++ b/app/serializers/api/admin/enterprise_serializer.rb @@ -1,11 +1,11 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer - attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :payment_method_ids, :shipping_method_ids - attributes :producer_profile_only, :long_description, :permalink - attributes :preferred_shopfront_message, :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order - attributes :preferred_product_selection_from_inventory_only - attributes :owner, :contact, :users, :tag_groups, :default_tag_group - attributes :require_login, :allow_guest_orders, :allow_order_changes - attributes :logo, :promo_image + 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, + :preferred_product_selection_from_inventory_only, + :owner, :contact, :users, :tag_groups, :default_tag_group, + :require_login, :allow_guest_orders, :allow_order_changes, + :logo, :promo_image has_one :owner, serializer: Api::Admin::UserSerializer has_many :users, serializer: Api::Admin::UserSerializer diff --git a/app/serializers/api/admin/exchange_serializer.rb b/app/serializers/api/admin/exchange_serializer.rb index 43d7a08ac8..483f490f47 100644 --- a/app/serializers/api/admin/exchange_serializer.rb +++ b/app/serializers/api/admin/exchange_serializer.rb @@ -1,6 +1,6 @@ class Api::Admin::ExchangeSerializer < ActiveModel::Serializer - attributes :id, :sender_id, :receiver_id, :incoming, :variants, :receival_instructions, :pickup_time, :pickup_instructions - attributes :tags, :tag_list + 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 4d2afc9ed5..0724778ba7 100644 --- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb +++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb @@ -1,9 +1,9 @@ require 'open_food_network/enterprise_issue_validator' class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer - attributes :id, :name, :managed, :supplied_products - attributes :issues_summary_supplier, :issues_summary_distributor - attributes :is_primary_producer, :is_distributor, :sells + attributes :id, :name, :managed, :supplied_products, + :issues_summary_supplier, :issues_summary_distributor, + :is_primary_producer, :is_distributor, :sells def issues_summary_supplier issues = OpenFoodNetwork::EnterpriseIssueValidator.new(object).issues_summary confirmation_only: true diff --git a/app/serializers/api/admin/index_enterprise_serializer.rb b/app/serializers/api/admin/index_enterprise_serializer.rb index d1d315d63d..6cf877aa45 100644 --- a/app/serializers/api/admin/index_enterprise_serializer.rb +++ b/app/serializers/api/admin/index_enterprise_serializer.rb @@ -1,9 +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 - - attributes :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 144bc38a7c..97ff415f24 100644 --- a/app/serializers/api/admin/index_order_cycle_serializer.rb +++ b/app/serializers/api/admin/index_order_cycle_serializer.rb @@ -5,9 +5,9 @@ module Api class IndexOrderCycleSerializer < ActiveModel::Serializer include OrderCyclesHelper - attributes :id, :name, :orders_open_at, :orders_close_at, :status, :variant_count, :deletable - attributes :coordinator, :producers, :shops, :viewing_as_coordinator - attributes :edit_path, :clone_path, :delete_path, :subscriptions_count + attributes :id, :name, :orders_open_at, :orders_close_at, :status, :variant_count, :deletable, + :coordinator, :producers, :shops, :viewing_as_coordinator, + :edit_path, :clone_path, :delete_path, :subscriptions_count has_many :schedules, serializer: Api::Admin::IdNameSerializer diff --git a/app/serializers/api/admin/order_cycle_serializer.rb b/app/serializers/api/admin/order_cycle_serializer.rb index 4989530e37..1001908ded 100644 --- a/app/serializers/api/admin/order_cycle_serializer.rb +++ b/app/serializers/api/admin/order_cycle_serializer.rb @@ -1,10 +1,10 @@ require 'open_food_network/order_cycle_permissions' class Api::Admin::OrderCycleSerializer < ActiveModel::Serializer - attributes :id, :name, :orders_open_at, :orders_close_at, :coordinator_id, :exchanges - attributes :editable_variants_for_incoming_exchanges, :editable_variants_for_outgoing_exchanges - attributes :visible_variants_for_outgoing_exchanges - attributes :viewing_as_coordinator, :schedule_ids, :subscriptions_count + attributes :id, :name, :orders_open_at, :orders_close_at, :coordinator_id, :exchanges, + :editable_variants_for_incoming_exchanges, :editable_variants_for_outgoing_exchanges, + :visible_variants_for_outgoing_exchanges, + :viewing_as_coordinator, :schedule_ids, :subscriptions_count has_many :coordinator_fees, serializer: Api::IdSerializer diff --git a/app/serializers/api/admin/order_serializer.rb b/app/serializers/api/admin/order_serializer.rb index 18661a0923..83707e8af5 100644 --- a/app/serializers/api/admin/order_serializer.rb +++ b/app/serializers/api/admin/order_serializer.rb @@ -1,9 +1,9 @@ class Api::Admin::OrderSerializer < ActiveModel::Serializer - attributes :id, :number, :user_id, :full_name, :email, :phone, :completed_at, :display_total - attributes :edit_path, :state, :payment_state, :shipment_state - attributes :payments_path, :ship_path, :ready_to_ship, :created_at - attributes :distributor_name, :special_instructions, :payment_capture_path - attributes :item_total, :adjustment_total, :payment_total, :total + attributes :id, :number, :user_id, :full_name, :email, :phone, :completed_at, :display_total, + :edit_path, :state, :payment_state, :shipment_state, + :payments_path, :ship_path, :ready_to_ship, :created_at, + :distributor_name, :special_instructions, :payment_capture_path, + :item_total, :adjustment_total, :payment_total, :total has_one :distributor, serializer: Api::Admin::IdSerializer has_one :order_cycle, serializer: Api::Admin::IdSerializer diff --git a/app/serializers/api/admin/subscription_serializer.rb b/app/serializers/api/admin/subscription_serializer.rb index 91b30e4e8c..1ffd4d3eed 100644 --- a/app/serializers/api/admin/subscription_serializer.rb +++ b/app/serializers/api/admin/subscription_serializer.rb @@ -1,9 +1,9 @@ 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 :customer_email, :schedule_name, :edit_path, :canceled_at, :paused_at, :state - attributes :shipping_fee_estimate, :payment_fee_estimate + 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 has_many :subscription_line_items, serializer: Api::Admin::SubscriptionLineItemSerializer has_many :closed_proxy_orders, serializer: Api::Admin::ProxyOrderSerializer diff --git a/app/serializers/api/admin/variant_override_serializer.rb b/app/serializers/api/admin/variant_override_serializer.rb index c63e77c068..683ad0101e 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 - attributes :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(",") diff --git a/app/serializers/api/admin/variant_serializer.rb b/app/serializers/api/admin/variant_serializer.rb index 479780064f..4ab886b270 100644 --- a/app/serializers/api/admin/variant_serializer.rb +++ b/app/serializers/api/admin/variant_serializer.rb @@ -1,8 +1,8 @@ class Api::Admin::VariantSerializer < ActiveModel::Serializer - attributes :id, :name, :producer_name, :image, :sku, :import_date - attributes :options_text, :unit_value, :unit_description, :unit_to_display - attributes :display_as, :display_name, :name_to_display - attributes :price, :on_demand, :on_hand, :in_stock, :stock_location_id, :stock_location_name + attributes :id, :name, :producer_name, :image, :sku, :import_date, + :options_text, :unit_value, :unit_description, :unit_to_display, + :display_as, :display_name, :name_to_display, + :price, :on_demand, :on_hand, :in_stock, :stock_location_id, :stock_location_name has_many :variant_overrides diff --git a/app/serializers/api/order_serializer.rb b/app/serializers/api/order_serializer.rb index 68c8f6a549..017f32bbf5 100644 --- a/app/serializers/api/order_serializer.rb +++ b/app/serializers/api/order_serializer.rb @@ -1,9 +1,9 @@ module Api class OrderSerializer < ActiveModel::Serializer - attributes :number, :completed_at, :total, :state, :shipment_state, :payment_state - attributes :outstanding_balance, :payments, :path, :cancel_path - attributes :changes_allowed, :changes_allowed_until, :item_count - attributes :shop_id + attributes :number, :completed_at, :total, :state, :shipment_state, :payment_state, + :outstanding_balance, :payments, :path, :cancel_path, + :changes_allowed, :changes_allowed_until, :item_count, + :shop_id has_many :payments, serializer: Api::PaymentSerializer diff --git a/app/serializers/api/variant_serializer.rb b/app/serializers/api/variant_serializer.rb index 518dd60d7c..54eae7aed5 100644 --- a/app/serializers/api/variant_serializer.rb +++ b/app/serializers/api/variant_serializer.rb @@ -1,9 +1,9 @@ class Api::VariantSerializer < ActiveModel::Serializer - attributes :id, :is_master, :product_name, :sku - attributes :options_text, :unit_value, :unit_description, :unit_to_display - attributes :display_as, :display_name, :name_to_display - attributes :price, :on_demand, :on_hand, :fees, :price_with_fees - attributes :tag_list + attributes :id, :is_master, :product_name, :sku, + :options_text, :unit_value, :unit_description, :unit_to_display, + :display_as, :display_name, :name_to_display, + :price, :on_demand, :on_hand, :fees, :price_with_fees, + :tag_list delegate :price, to: :object