From 52839ea51d189ec493a76095f458dbf47d0516f7 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Tue, 15 Oct 2024 11:32:14 +1100
Subject: [PATCH] Import product's invalid weight as 1 item

We previously stored a scale which made the product screen believe that
we are dealing with weight.
---
 .../dfc_provider/app/services/quantitative_value_builder.rb   | 4 ++++
 .../spec/services/quantitative_value_builder_spec.rb          | 4 ++--
 .../spec/services/supplied_product_builder_spec.rb            | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/dfc_provider/app/services/quantitative_value_builder.rb b/engines/dfc_provider/app/services/quantitative_value_builder.rb
index 31401a3369..cbc9287633 100644
--- a/engines/dfc_provider/app/services/quantitative_value_builder.rb
+++ b/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"
+
     product.variant_unit = measure
     product.variant_unit_name = unit_name if measure == "items"
     product.variant_unit_scale = unit_scale
diff --git a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
index f18a58b561..c711422474 100644
--- a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe QuantitativeValueBuilder do
 
       expect(product.variant_unit).to eq "items"
       expect(product.variant_unit_name).to eq "Jar"
-      expect(product.variant_unit_scale).to eq 1
+      expect(product.variant_unit_scale).to eq nil
       expect(product.unit_value).to eq 3
     end
 
@@ -142,7 +142,7 @@ RSpec.describe QuantitativeValueBuilder do
 
       expect(product.variant_unit).to eq "items"
       expect(product.variant_unit_name).to eq "dozen"
-      expect(product.variant_unit_scale).to eq 12
+      expect(product.variant_unit_scale).to eq nil
       expect(product.unit_value).to eq 24
     end
   end
diff --git a/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb b/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb
index 89b628150e..fe78e492e6 100644
--- a/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb
+++ b/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.product.variant_unit_scale).to eq(nil)
+      expect(subject.product.variant_unit_with_scale).to eq("items")
       expect(subject.unit_value).to eq(1)
     end
   end