Fix import problem when using only one barcode

Author: emrojo

lib/importers/concerns/changes.rb

@@ -5,10 +5,12 @@ module Concerns
     module Changes
 
       def refresh_assets(assets, opts={})
+        assets = [assets].flatten
         FactChanges.new.tap do |updates|
           if assets.length > 0
             remote_assets = SequencescapeClient::find_by_uuid(assets.map(&:uuid))
             remote_assets = [] if remote_assets.nil?
+            remote_assets = [remote_assets].flatten
             assets.zip(remote_assets).each do |asset, remote_asset|
               annotator = Importers::Concerns::Annotator.new(asset, remote_asset)
               annotator.validate!
@@ -22,10 +24,12 @@ def refresh_assets(assets, opts={})
       end
 
       def import_barcodes(barcodes)
+        barcodes = [barcodes].flatten
         FactChanges.new.tap do |updates|
           if barcodes.length > 0
             remote_assets = SequencescapeClient::get_remote_asset(barcodes)
             remote_assets = [] if remote_assets.nil?
+            remote_assets = [remote_assets].flatten
             barcodes.zip(remote_assets).each do |barcode, remote_asset|
               if remote_asset
                 # Needed in order to identify the imported elements

spec/lib/importers/concerns/changes_spec.rb

@@ -11,24 +11,47 @@
     let(:assets) { [ create(:plate), create(:tube), create(:plate), create(:well)]}
     let(:remote_assets) {[build_remote_plate, build_remote_tube, build_remote_plate, build_remote_well('B1')]}
 
-    before do
-      assets.zip(remote_assets) do |a, remote|
-        allow(remote).to receive(:uuid).and_return(a.uuid)
+    context 'when refreshing a list of assets' do
+      before do
+        assets.zip(remote_assets) do |a, remote|
+          allow(remote).to receive(:uuid).and_return(a.uuid)
+        end
+        allow(SequencescapeClient).to receive(:find_by_uuid).with(assets.map(&:uuid)).and_return(remote_assets)
+      end
+
+      it 'refreshes the contents of the assets' do
+        updates = instance.refresh_assets(assets)
+        expect(updates.to_h[:add_facts].detect{|t|t[1]=='sample_uuid'}).not_to be_nil
+        expect(updates.to_h[:add_facts].map{|t| t[0]}.uniq).to include(*uuids)
       end
-      allow(SequencescapeClient).to receive(:find_by_uuid).with(assets.map(&:uuid)).and_return(remote_assets)
-    end
 
-    it 'refreshes the contents of the assets' do
-      updates = instance.refresh_assets(assets)
-      expect(updates.to_h[:add_facts].detect{|t|t[1]=='sample_uuid'}).not_to be_nil
-      expect(updates.to_h[:add_facts].map{|t| t[0]}.uniq).to include(*uuids)
+      context 'when receiving an empty list' do
+        it 'does nothing' do
+          updates = instance.refresh_assets([])
+          expect(updates.to_h).to eq({})
+        end
+      end
     end
 
-    context 'when receiving an empty list' do
-      it 'does nothing' do
-        updates = instance.refresh_assets([])
-        expect(updates.to_h).to eq({})
+    context 'when refreshing a single asset' do
+      before do
+        assets.zip(remote_assets) do |a, remote|
+          allow(remote).to receive(:uuid).and_return(a.uuid)
+        end
+        allow(SequencescapeClient).to receive(:find_by_uuid).with([assets.map(&:uuid).first]).and_return(remote_assets.first)
       end
+
+      it 'refreshes the contents of the asset' do
+        updates = instance.refresh_assets([assets.first])
+        expect(updates.to_h[:add_facts].detect{|t|t[1]=='sample_uuid'}).not_to be_nil
+
+        # It includes the asset
+        expect(updates.to_h[:add_facts].map{|t| t[0]}.uniq).to include(uuids.first)
+
+        # It does not refreshes other remote assets not passed as argument
+        expect(updates.to_h[:add_facts].map{|t| t[0]}.uniq).not_to include(uuids.last)
+      end
+
     end
   end
 
@@ -51,22 +74,35 @@
       remote_assets.map{|a| a.labware_barcode['human_barcode']}
     }
 
-    before do
-      allow(SequencescapeClient).to receive(:get_remote_asset).with(barcodes).and_return(remote_assets)
-    end
+    context 'when scanning a list of barcodes' do
+      before do
+        allow(SequencescapeClient).to receive(:get_remote_asset).with(barcodes).and_return(remote_assets)
+      end
 
-    it 'imports the assets' do
-      updates = instance.import_barcodes(barcodes)
-      expect(updates.to_h[:add_facts].detect{|t|t[1]=='sample_uuid'}).not_to be_nil
-      expect(updates.to_h[:create_assets]).to include(*uuids)
-    end
+      it 'imports the assets' do
+        updates = instance.import_barcodes(barcodes)
+        expect(updates.to_h[:add_facts].detect{|t|t[1]=='sample_uuid'}).not_to be_nil
+        expect(updates.to_h[:create_assets]).to include(*uuids)
+      end
 
-    context 'when receiving an empty list' do
-      it 'does nothing' do
-        updates = instance.import_barcodes([])
-        expect(updates.to_h).to eq({})
+      context 'when receiving an empty list' do
+        it 'does nothing' do
+          updates = instance.import_barcodes([])
+          expect(updates.to_h).to eq({})
+        end
       end
     end
 
+    context 'when scanning a single barcode' do
+      before do
+        allow(SequencescapeClient).to receive(:get_remote_asset).with([barcodes.first]).and_return(remote_assets.first)
+      end
+
+      it 'imports the asset' do
+        updates = instance.import_barcodes([barcodes.first])
+        expect(updates.to_h[:add_facts].detect{|t|t[1]=='sample_uuid'}).not_to be_nil
+        expect(updates.to_h[:create_assets]).to eq([uuids.first])
+      end
+    end
   end
 end