entity_store_sequel 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3956cd44cc5c897c19cb96966e46e80e84f7e07
-  data.tar.gz: 9a6703b7c60cfba40ef47cd61a844431dfd8c94a
+  metadata.gz: 1899036c5a8d1dddb1db7d3983403d52457b2f0f
+  data.tar.gz: 351364c47638483e1f5e9720d5a51587100cba99
 SHA512:
-  metadata.gz: 698435ba4a53e4243fbae71ec7593fd279fe641ad1f703dc719bf17442e3cfdad333f12a10384f90b2af429ee3f2bdd79602584a19996baa3a5ce689fa160cb1
-  data.tar.gz: 00fbf106ab1bbf35c64d280d92fe6b1d292bdff255de8f76bae8e93c833550d120d2e9b377f14c075c07ba62956a8a3d46ece3ab5a8e5f8c8ce0b46989290cd8
+  metadata.gz: 2ecacf83b990024c8d66f42c2b54a225361d02e061c7445d977380cad6edca430c6937dbaa479b92eb46b2daad599cac654e3672fa344c203006ae85ad2b5d01
+  data.tar.gz: 4384bb30c9f78e3f041a2a2a4a95c9747247acf866c190b9234da0f25be64de1cf6b98fe9eb71dba927864f4c78442bfec0238e12ea50c6c66a7e264291bcfc8

data/lib/entity_store_sequel/postgres_entity_store.rb

@@ -121,7 +121,7 @@ module EntityStoreSequel
           :_entity_id => event.entity_id.to_s,
           :entity_version => event.entity_version,
           :at => event.attributes[:at],
-          :data => PigeonHole.generate(hash_without_keys(event.attributes, :entity_id, :at)),
+          :data => PigeonHole.generate(hash_without_keys(event.attributes, :entity_id, :at, :entity_version)),
         }
         events.insert(doc)
       end
@@ -195,18 +195,24 @@ module EntityStoreSequel
     def get_events(criteria)
       return {} if criteria.empty?
 
-      result = {}
-
-      criteria.each do |item|
-        raise ArgumentError.new(":id missing from criteria") unless item[:id]
-
-        query = events.where(:_entity_id => item[:id])
+      query = events
 
+      criteria.each_with_index do |item, i|
+        filter_method = filter_method_name(i)
         if item[:since_version]
-          query = query.where('entity_version > ?', item[:since_version])
+          query = query.send(filter_method, '_entity_id = ? AND entity_version > ?', item[:id], item[:since_version])
+        else
+          query = query.send(filter_method, '_entity_id = ?', item[:id])
         end
+      end
+
+      result = query.to_hash_groups(:_entity_id)
+
+      result.each do |id, events|
+        events.sort_by! { |attrs| [attrs[:entity_version], attrs[:id].to_s] }
 
-        result[item[:id]] = query.order(:entity_version, :id).map do |attrs|
+        # Convert the attributes into event objects
+        events.map! do |attrs|
           begin
             if self.class.native_json_hash
               hash = attrs[:data].to_h
@@ -221,9 +227,15 @@ module EntityStoreSequel
             EntityStore::Config.load_type(attrs[:_type]).new(hash)
           rescue => e
             log_error "Error loading type #{attrs[:_type]}", e
-            next
+            nil
           end
-        end.compact
+        end
+
+        events.compact!
+      end
+
+      criteria.each do |item|
+        result[item[:id].to_s] ||= []
       end
 
       result
@@ -231,6 +243,10 @@ module EntityStoreSequel
 
     private
 
+    def filter_method_name(index)
+      index == 0 ? :where : :or
+    end
+
     def hash_without_keys(hash, *keys)
       hash_dup = hash.dup
       keys.each { |key| hash_dup.delete(key) }

data/lib/entity_store_sequel/version.rb

@@ -1,3 +1,3 @@
 module EntityStoreSequel
-  VERSION = "0.0.8".freeze
+  VERSION = "0.0.9".freeze
 end

data/spec/entity_store_sequel/postgres_entity_store_spec.rb

@@ -66,6 +66,24 @@ describe PostgresEntityStore do
       store.add_events([ second_event, unrelated_event, first_event, third_event, fourth_event ])
     end
 
+    context "multiple entities" do
+      subject { store.get_events( [{ id: event_entity_id }, { id: unknown_id }]) }
+
+      context "all events" do
+        let(:event_entity_id) { entity_id }
+        let(:unknown_id) { random_object_id }
+        let(:since_version) { 0 }
+
+        it "should return the four events in order for known id" do
+          subject[event_entity_id].should == [first_event, second_event, third_event, fourth_event]
+        end
+
+        it "should return no events in order unknown id" do
+          subject[unknown_id].should be_empty
+        end
+      end
+    end
+
     subject { store.get_events( [{ id: event_entity_id, since_version: since_version }])[event_entity_id] }
 
     context "all events" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entity_store_sequel
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Stephen Binns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel