Merge pull request #19 from doctolib/fix-find-array

test and solve cases of find with multiple ids

Author: CedricCouton

lib/couchbase-orm/base.rb

@@ -254,9 +254,10 @@ def find(*ids, quiet: false)
                 records = quiet ? collection.get_multi(ids, transcoder: transcoder) : collection.get_multi!(ids, transcoder: transcoder)
                 CouchbaseOrm.logger.debug { "Base.find found(#{records})" }
                 records = records.zip(ids).map { |record, id|
-                    self.new(record, id: id) if record
-                }
-                records.compact!
+                    next unless record
+                    next if record.error
+                    self.new(record, id: id)
+                }.compact
                 ids.length > 1 ? records : records[0]
             end
 

lib/couchbase-orm/proxies/collection_proxy.rb

@@ -21,8 +21,7 @@ def get_multi!(*ids, **options)
         end
 
         def get_multi(*ids, **options)
-            result = @proxyfied.get_multi(*ids, Couchbase::Options::GetMulti.new(**options))
-            result.reject(&:error)
+            @proxyfied.get_multi(*ids, Couchbase::Options::GetMulti.new(**options))
         end
 
         def remove!(id, **options)

spec/base_spec.rb

@@ -212,6 +212,27 @@ class BaseTestWithIgnoredProperties < CouchbaseOrm::Base
         expect(base.created_at).to be_a(Time)
     end
 
+    it "should find multiple ids at same time" do
+        base1 = BaseTest.create!(name: 'joe1')
+        base2 = BaseTest.create!(name: 'joe2')
+        base3 = BaseTest.create!(name: 'joe3')
+        expect(BaseTest.find([base1.id, base2.id, base3.id])).to eq([base1, base2, base3])
+    end
+
+    it "should find multiple ids at same time with a not found id with exception" do
+        base1 = BaseTest.create!(name: 'joe1')
+        base2 = BaseTest.create!(name: 'joe2')
+        base3 = BaseTest.create!(name: 'joe3')
+        expect { BaseTest.find([base1.id, 't', base3.id]) }.to raise_error(Couchbase::Error::DocumentNotFound)
+    end
+
+    it "should find multiple ids at same time with a not found id without exception" do
+        base1 = BaseTest.create!(name: 'joe1')
+        base2 = BaseTest.create!(name: 'joe2')
+        base3 = BaseTest.create!(name: 'joe3')
+        expect(BaseTest.find([base1.id, 't', 't', base2.id, base3.id], quiet: true)).to eq([base1, base2, base3])
+    end
+
     describe BaseTest do
         it_behaves_like "ActiveModel"
     end