Re-arrange imperial units

Who would have guessed it was this complicated. Fingers crossed this doesn't break any other functionality...
openfoodfoundation · Feb 21, 2024 · e170c0a · e170c0a
1 parent a653e71
commit e170c0a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/app/services/weights_and_measures.rb b/app/services/weights_and_measures.rb
@@ -45,9 +45,16 @@ def self.available_units
 
   def self.available_units_sorted
     self::UNITS.transform_values do |measurement_info|
+      # Filter to only include available units
       measurement_info.filter do |_scale, unit_info|
-        available_units.include?(unit_info['name'])
-      end.sort.to_h # sort by unit (hash key)
+        self.available_units.include?(unit_info['name'])
+      end.
+      # Remove duplicates by name
+      uniq do |_scale, unit_info|
+        unit_info['name']
+      end.
+      # Sort by unit number
+      sort.to_h
     end
   end
 
@@ -60,10 +67,10 @@ def self.available_units_sorted
       1000.0 => { 'name' => 'kg', 'system' => 'metric' },
       1_000_000.0 => { 'name' => 'T', 'system' => 'metric' },
 
-      28.349523125 => { 'name' => 'oz', 'system' => 'imperial' },
       28.35 => { 'name' => 'oz', 'system' => 'imperial' },
-      453.59237 => { 'name' => 'lb', 'system' => 'imperial' },
+      28.349523125 => { 'name' => 'oz', 'system' => 'imperial' },
       453.6 => { 'name' => 'lb', 'system' => 'imperial' },
+      453.59237 => { 'name' => 'lb', 'system' => 'imperial' },
     },
     'volume' => {
       0.001 => { 'name' => 'mL', 'system' => 'metric' },

diff --git a/spec/services/weights_and_measures_spec.rb b/spec/services/weights_and_measures_spec.rb
@@ -30,6 +30,11 @@
         allow(product).to receive(:variant_unit_scale) { 28.35 }
         expect(subject.system).to eq("imperial")
       end
+
+      it "when precise scale is for an imperial unit" do
+        allow(product).to receive(:variant_unit_scale) { 28.349523125 }
+        expect(subject.system).to eq("imperial")
+      end
     end
 
     context "volume" do
@@ -79,7 +84,6 @@
         ["Volume (kL)", "volume_1000"],
         ["Items", "items"],
       ]
-      pending "imperial measurements are duplicated"
       expect(subject).to match_array expected_array # diff each element
       expect(subject).to eq expected_array # test ordering also
     end
@@ -97,7 +101,6 @@
           ["Volume (L)", "volume_1"],
           ["Items", "items"],
         ]
-        pending "imperial measurements are duplicated"
         expect(subject).to match_array expected_array # diff each element
         expect(subject).to eq expected_array # test ordering also
       end