raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ExchangeVariantDeleter.new.delete out of update_product_only_attributes into correct place update_product

Browse Source 
Also extracted find_product from update_attributes and find_variant out of create_or_update_variant to make code simpler
This commit is contained in:
luisramos0
2019-10-27 19:10:55 +00:00
parent f57c9d4a25
commit 07fcc8f361
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/models/spree/product_set.rb
View File

@@ -33,14 +33,11 @@ class Spree::ProductSet < ModelSet
def update_attributes(attributes)
split_taxon_ids!(attributes)
found_model = @collection.find do |model|
model.id.to_s == attributes[:id].to_s && model.persisted?
end
if found_model.nil?
product = find_product(attributes[:id])
if product.nil?
@klass.new(attributes).save unless @reject_if.andand.call(attributes)
else
update_product(found_model, attributes)
update_product(product, attributes)
end
end
@@ -48,10 +45,19 @@ class Spree::ProductSet < ModelSet
attributes[:taxon_ids] = attributes[:taxon_ids].split(',') if attributes[:taxon_ids].present?
end
def update_product(found_model, attributes)
update_product_only_attributes(found_model, attributes) &&
update_product_variants(found_model, attributes) &&
update_product_master(found_model, attributes)
def find_product(product_id)
@collection.find do |model|
model.id.to_s == product_id.to_s && model.persisted?
end
end
def update_product(product, attributes)
original_supplier = product.supplier_id
return false unless update_product_only_attributes(product, attributes)
ExchangeVariantDeleter.new.delete(product) if original_supplier != product.supplier_id
update_product_variants(product, attributes) &&
update_product_master(product, attributes)
end
def update_product_only_attributes(product, attributes)
@@ -59,15 +65,11 @@ class Spree::ProductSet < ModelSet
product_related_attrs = attributes.except(*variant_related_attrs)
return true if product_related_attrs.blank?
original_supplier = product.supplier_id
product.assign_attributes(product_related_attrs)
validate_presence_of_unit_value_in_product(product)
return false unless product.errors.empty? && product.save
ExchangeVariantDeleter.new.delete(product) if original_supplier != product.supplier_id
true
product.errors.empty? && product.save
end
def validate_presence_of_unit_value_in_product(product)
@@ -100,17 +102,20 @@ class Spree::ProductSet < ModelSet
end
def create_or_update_variant(product, variant_attributes)
found_variant = product.variants_including_master.find do |variant|
variant.id.to_s == variant_attributes[:id].to_s && variant.persisted?
end
if found_variant.present?
found_variant.update_attributes(variant_attributes.except(:id))
variant = find_variant(product, variant_attributes[:id])
if variant.present?
variant.update_attributes(variant_attributes.except(:id))
else
create_variant(product, variant_attributes)
end
end
def find_variant(product, variant_id)
product.variants_including_master.find do |variant|
variant.id.to_s == variant_id.to_s && variant.persisted?
end
end
def create_variant(product, variant_attributes)
on_hand = variant_attributes.delete(:on_hand)
on_demand = variant_attributes.delete(:on_demand)