Merge pull request #12913 from mkllnk/dfc-import-items

Import product's invalid weight as 1 item

engines/dfc_provider/app/services/quantitative_value_builder.rb

@@ -31,12 +31,16 @@ class QuantitativeValueBuilder < DfcBuilder
     measure, unit_name, unit_scale = map_unit(quantity.unit)
     value = quantity.value.to_f * unit_scale
 
+    # Import invalid value as one item.
     if measure.in?(%w(weight volume)) && value <= 0
       measure = "items"
       unit_name = "items"
       value = 1
     end
 
+    # Items don't have a scale, only a value on the variant.
+    unit_scale = nil if measure == "items"
+
     variant.variant_unit = measure
     variant.variant_unit_name = unit_name if measure == "items"
     variant.variant_unit_scale = unit_scale

engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe QuantitativeValueBuilder do
 
       expect(variant.variant_unit).to eq "items"
       expect(variant.variant_unit_name).to eq "Jar"
-      expect(variant.variant_unit_scale).to eq 1
+      expect(variant.variant_unit_scale).to eq nil
       expect(variant.unit_value).to eq 3
     end
 
@@ -141,7 +141,7 @@ RSpec.describe QuantitativeValueBuilder do
 
       expect(variant.variant_unit).to eq "items"
       expect(variant.variant_unit_name).to eq "dozen"
-      expect(variant.variant_unit_scale).to eq 12
+      expect(variant.variant_unit_scale).to eq nil
       expect(variant.unit_value).to eq 24
     end
   end

engines/dfc_provider/spec/services/supplied_product_builder_spec.rb

@@ -107,6 +107,8 @@ RSpec.describe SuppliedProductBuilder do
       expect(subject).to be_persisted
       expect(subject.name).to eq("Fillet Steak - 201g x 1 Steak")
       expect(subject.variant_unit).to eq("items")
+      expect(subject.variant_unit_scale).to eq(nil)
+      expect(subject.variant_unit_with_scale).to eq("items")
       expect(subject.unit_value).to eq(1)
     end
   end