fix: refactor import & export chemical spec tests and fix robocup warnings

Author: adambasha0

lib/export/export_chemicals.rb

@@ -4,8 +4,8 @@ module Export
   class ExportChemicals
     CHEMICAL_FIELDS = %w[
       chemical_sample_id cas status vendor order_number amount volume price person required_date
-      ordered_date storage_temperature expiration_date required_by pictograms h_statements p_statements safety_sheet_link_merck
-      safety_sheet_link_thermofischer product_link_merck product_link_thermofischer
+      ordered_date storage_temperature expiration_date required_by pictograms h_statements p_statements
+      safety_sheet_link_merck safety_sheet_link_thermofischer product_link_merck product_link_thermofischer
       host_building host_room host_cabinet host_group owner borrowed_by current_building
       current_room current_cabinet current_group disposal_info important_notes
     ].freeze
@@ -70,8 +70,9 @@ def self.format_chemical_results(result)
     end
 
     def self.construct_column_name(column_name, index, columns_index)
-      format_chemical_column = ['p statements', 'h statements', 'amount', 'volume', 'storage temperature', 'safety sheet link thermofischer',
-                                'safety sheet link merck', 'product link thermofischer', 'product link merck'].freeze
+      format_chemical_column = ['p statements', 'h statements', 'amount', 'volume', 'storage temperature',
+                                'safety sheet link thermofischer', 'safety sheet link merck', 'product link thermofischer',
+                                'product link merck'].freeze
       if column_name.is_a?(String) && CHEMICAL_FIELDS.include?(column_name)
         column_name = column_name.tr('_', ' ')
         construct_column_name_hash(columns_index, column_name, index) if format_chemical_column.include?(column_name)
@@ -116,7 +117,7 @@ def self.format_row(row, columns_index, indexes_to_delete)
         when columns_index['p_statements'], columns_index['h_statements']
           value = format_p_and_h_statements(value)
         when columns_index['amount'], columns_index['volume'], columns_index['storage_temperature']
-          value = format_chemical_amount_or_volume(value)
+          value = format_chemical_fields(value)
         when columns_index['safety_sheet_link'][0]
           value = format_link(value, row, columns_index['safety_sheet_link'][1], indexes_to_delete)
         when columns_index['product_link'][0]
@@ -131,7 +132,7 @@ def self.format_p_and_h_statements(value)
       keys.join('-')
     end
 
-    def self.format_chemical_amount_or_volume(value)
+    def self.format_chemical_fields(value)
       value_unit = JSON.parse(value).values
       sorted = value_unit.sort_by { |element| [element.is_a?(Integer) || element.is_a?(Float) ? 0 : 1, element] }
       sorted.join(' ')

spec/lib/export/export_chemicals_spec.rb

@@ -5,17 +5,17 @@
 # rubocop: disable Style/OpenStructUse
 
 describe Export::ExportChemicals do
-  describe '.format_chemical_amount_or_volume' do
+  describe '.format_chemical_fields' do
     it 'formats chemical amount correctly' do
       input_value = '{"value": 50, "unit": "mg"}'
-      formatted_amount = described_class.format_chemical_amount_or_volume(input_value)
+      formatted_amount = described_class.format_chemical_fields(input_value)
       expect(formatted_amount).to eq('50 mg')
     end
 
     it 'formats chemical storage temperature correctly' do
       input_value = '{"value": 30, "unit": "°C"}'
-      formatted_amount = described_class.format_chemical_fields_with_unit(input_value)
-      expect(formatted_amount).to eq('30°C')
+      formatted_amount = described_class.format_chemical_fields(input_value)
+      expect(formatted_amount).to eq('30 °C')
     end
   end
 

spec/lib/import/import_chemicals_spec.rb

@@ -47,13 +47,13 @@
     let(:chemical) { { 'chemical_data' => [{}] } }
 
     it 'add amount value and unit' do
-      described_class.set_chemical_amount_or_volume(chemical, 'amount', '10 mg')
+      described_class.set_amount_or_volume(chemical, 'amount', '10 mg')
       expect(chemical['chemical_data'][0]['amount']['value']).to eq(10.0)
       expect(chemical['chemical_data'][0]['amount']['unit']).to eq('mg')
     end
 
     it 'add volume value and unit' do
-      described_class.set_chemical_amount_or_volume(chemical, 'volume', '6.4 ml')
+      described_class.set_amount_or_volume(chemical, 'volume', '6.4 ml')
       expect(chemical['chemical_data'][0]['volume']['value']).to eq(6.4)
       expect(chemical['chemical_data'][0]['volume']['unit']).to eq('ml')
     end