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 type conversion problem in product import entry validator

Browse Source
This commit is contained in:
luisramos0
2019-01-29 15:45:22 +00:00
parent dce2524353
commit cc4825290b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/product_import/entry_validator.rb
View File

@@ -287,10 +287,18 @@ module ProductImport
end
def attributes_match?(attribute, existing_product, entry)
if existing_product.public_send(attribute).is_a?(Numeric) || entry.public_send(attribute).is_a?(Numeric)
return existing_product.public_send(attribute).to_i == entry.public_send(attribute).to_i
existing_product_value = existing_product.public_send(attribute)
entry_value = entry.public_send(attribute)
existing_product_value == convert_to_trusted_type(entry_value, existing_product_value)
end
def convert_to_trusted_type(untrusted_attribute, trusted_attribute)
if trusted_attribute.is_a? Integer
untrusted_attribute.to_i
elsif trusted_attribute.is_a? Float
untrusted_attribute.to_f
else
return existing_product.public_send(attribute).to_s == entry.public_send(attribute).to_s
untrusted_attribute.to_s
end
end