raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix long lines in exchange model

Browse Source
This commit is contained in:
luisramos0
2019-05-29 10:35:03 +01:00
parent 0cdb49818d
commit c15c5435ff
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_manual_todo.yml
View File

@@ -81,7 +81,6 @@ Metrics/LineLength:
- app/models/enterprise_fee.rb
- app/models/enterprise_group.rb
- app/models/enterprise_role.rb
- app/models/exchange.rb
- app/models/inventory_item.rb
- app/models/order_cycle.rb
- app/models/product_import/entry_processor.rb

38
app/models/exchange.rb
View File

@@ -26,11 +26,25 @@ class Exchange < ActiveRecord::Base
scope :to_enterprise, lambda { |enterprise| where(receiver_id: enterprise) }
scope :from_enterprises, lambda { |enterprises| where('exchanges.sender_id IN (?)', enterprises) }
scope :to_enterprises, lambda { |enterprises| where('exchanges.receiver_id IN (?)', enterprises) }
scope :involving, lambda { |enterprises| where('exchanges.receiver_id IN (?) OR exchanges.sender_id IN (?)', enterprises, enterprises).select('DISTINCT exchanges.*') }
scope :supplying_to, lambda { |distributor| where('exchanges.incoming OR exchanges.receiver_id = ?', distributor) }
scope :with_variant, lambda { |variant| joins(:exchange_variants).where('exchange_variants.variant_id = ?', variant) }
scope :with_any_variant, lambda { |variant_ids| joins(:exchange_variants).where('exchange_variants.variant_id IN (?)', variant_ids).select('DISTINCT exchanges.*') }
scope :with_product, lambda { |product| joins(:exchange_variants).where('exchange_variants.variant_id IN (?)', product.variants_including_master) }
scope :involving, lambda { |enterprises|
where('exchanges.receiver_id IN (?) OR exchanges.sender_id IN (?)', enterprises, enterprises).
select('DISTINCT exchanges.*')
}
scope :supplying_to, lambda { |distributor|
where('exchanges.incoming OR exchanges.receiver_id = ?', distributor)
}
scope :with_variant, lambda { |variant|
joins(:exchange_variants).where('exchange_variants.variant_id = ?', variant)
}
scope :with_any_variant, lambda { |variant_ids|
joins(:exchange_variants).
where('exchange_variants.variant_id IN (?)', variant_ids).
select('DISTINCT exchanges.*')
}
scope :with_product, lambda { |product|
joins(:exchange_variants).
where('exchange_variants.variant_id IN (?)', product.variants_including_master)
}
scope :by_enterprise_name, -> {
joins('INNER JOIN enterprises AS sender ON (sender.id = exchanges.sender_id)').
joins('INNER JOIN enterprises AS receiver ON (receiver.id = exchanges.receiver_id)').
@@ -49,11 +63,12 @@ class Exchange < ActiveRecord::Base
if user.has_spree_role?('admin')
scoped
else
joins('LEFT JOIN enterprises senders ON senders.id = exchanges.sender_id').
joins('LEFT JOIN enterprises receivers ON receivers.id = exchanges.receiver_id').
joins('LEFT JOIN enterprise_roles sender_roles ON sender_roles.enterprise_id = senders.id').
joins('LEFT JOIN enterprise_roles receiver_roles ON receiver_roles.enterprise_id = receivers.id').
where('sender_roles.user_id = ? AND receiver_roles.user_id = ?', user.id, user.id)
joins("LEFT JOIN enterprises senders ON senders.id = exchanges.sender_id").
joins("LEFT JOIN enterprises receivers ON receivers.id = exchanges.receiver_id").
joins("LEFT JOIN enterprise_roles sender_roles ON sender_roles.enterprise_id = senders.id").
joins("LEFT JOIN enterprise_roles receiver_roles
ON receiver_roles.enterprise_id = receivers.id").
where("sender_roles.user_id = ? AND receiver_roles.user_id = ?", user.id, user.id)
end
}
@@ -76,7 +91,8 @@ class Exchange < ActiveRecord::Base
end
def to_h(core_only = false)
h = attributes.merge('variant_ids' => variant_ids.sort, 'enterprise_fee_ids' => enterprise_fee_ids.sort)
h = attributes.merge('variant_ids' => variant_ids.sort,
'enterprise_fee_ids' => enterprise_fee_ids.sort)
h.reject! { |k| %w(id order_cycle_id created_at updated_at).include? k } if core_only
h
end