From f58d9ec7908db2e730b8019b9cee9ea9aa642e0b Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 28 May 2019 16:10:40 +0100 Subject: [PATCH] Fix rubocop issues in exchange model --- app/models/exchange.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/models/exchange.rb b/app/models/exchange.rb index bfba731ef5..3493ebecde 100644 --- a/app/models/exchange.rb +++ b/app/models/exchange.rb @@ -31,16 +31,18 @@ class Exchange < ActiveRecord::Base scope :with_variant, lambda { |variant| joins(:exchange_variants).where('exchange_variants.variant_id = ?', variant) } scope :with_any_variant, lambda { |variants| joins(:exchange_variants).where('exchange_variants.variant_id IN (?)', variants).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)'). - order("CASE WHEN exchanges.incoming='t' THEN sender.name ELSE receiver.name END") } + 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)'). + order("CASE WHEN exchanges.incoming='t' THEN sender.name ELSE receiver.name END") + } # Exchanges on order cycles that are dated and are upcoming or open are cached scope :cachable, -> { outgoing. - joins(:order_cycle). - merge(OrderCycle.dated). - merge(OrderCycle.not_closed) + joins(:order_cycle). + merge(OrderCycle.dated). + merge(OrderCycle.not_closed) } scope :managed_by, lambda { |user|