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

Merge pull request #2546 from Matt-Yorkley/pi/sku_validation

Browse Source 
Remove empty SKU values if empty
This commit is contained in:
Maikel
2018-08-24 14:32:00 +10:00
committed by GitHub
parent 871e423e12 28b1fc076a
commit bf55190136
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/product_import/spreadsheet_entry.rb
View File

@@ -14,6 +14,7 @@ module ProductImport
def initialize(attrs)
@validates_as = ''
remove_empty_skus attrs
assign_units attrs
end
@@ -57,6 +58,10 @@ module ProductImport
private
def remove_empty_skus(attrs)
attrs.delete('sku') if attrs.key?('sku') && attrs['sku'].blank?
end
def assign_units(attrs)
units = UnitConverter.new(attrs)

6
spec/models/product_importer_spec.rb
View File

@@ -254,9 +254,9 @@ describe ProductImport::ProductImporter do
describe "updating various fields" do
before do
csv_data = CSV.generate do |csv|
csv << ["name", "supplier", "category", "on_hand", "price", "units", "unit_type", "on_demand"]
csv << ["Beetroot", "And Another Enterprise", "Vegetables", "5", "3.50", "500", "g", "0"]
csv << ["Tomato", "And Another Enterprise", "Vegetables", "6", "5.50", "500", "g", "1"]
csv << ["name", "supplier", "category", "on_hand", "price", "units", "unit_type", "on_demand", "sku"]
csv << ["Beetroot", "And Another Enterprise", "Vegetables", "5", "3.50", "500", "g", "0", nil]
csv << ["Tomato", "And Another Enterprise", "Vegetables", "6", "5.50", "500", "g", "1", "TOMS"]
end
File.write('/tmp/test-m.csv', csv_data)
file = File.new('/tmp/test-m.csv')