entity_store_sequel 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42131de7211c31322b1b2756dffc2d4618bc4f7acdedea190613e6838b42eef
-  data.tar.gz: 389dcf4874fb1469e58533dbbee84839b628c91409611342e17f93177305ed96
+  metadata.gz: 1fbaafda3599b05b00d50669608de59f140546e61066def1dbb355d2eea59ccf
+  data.tar.gz: 565ac6d7d44085cb366f2250147c20c63f4a1b05143cb8f30286f485172c184b
 SHA512:
-  metadata.gz: c3a3b060c3098f60d88991fb7282506a1aa54a82e3ddb967388bfcbcd0530f5c10305d2c13cc72848fc7553f8c91fc671a818db771c8512a75dbfbb5cec6e56b
-  data.tar.gz: 9eb6147831a2e4ff174d6b0b30ab52d5231e9642b7bb4f900cc3f0964134598bdaa2727ad446a3c46892f45fe31ab23bf8dfe237a6535188b0fc233c97b1e116
+  metadata.gz: a5ab29eb7d354b40cd35411226e8e96d65ca7df0fda329378a849033fc96a13864558eae931966756fef5ae18733806075dcd69cf723c1f28bcebcca2c606c10
+  data.tar.gz: c8ffb267c8103f4bf4cd03e56099f55e3d6ecec1b93357176de0e1a24018d1c8191763b7ac5578944eeefd9795fce6dfaa024c88c881a6ebbef5f38449dcec04

data/lib/entity_store_sequel/postgres_entity_store.rb

@@ -70,10 +70,13 @@ module EntityStoreSequel
     end
 
     def clear_entity_events(id, excluded_types)
-      events.where(_entity_id: id).each do |event|
-        next if excluded_types.include?(event[:_type])
-
-        events.where(id: event[:id]).delete
+      if excluded_types.empty?
+        events.where(_entity_id: id).delete
+      else
+        events.where(_entity_id: id).select(:id, :_type).each do |event|
+          next if excluded_types.include?(event[:_type])
+          events.where(id: event[:id]).delete
+        end
       end
     end
 
@@ -129,20 +132,42 @@ module EntityStoreSequel
       add_events_with_ids(events_with_id)
     end
 
+    def upsert_events(items)
+      events_with_id = items.map do |e|
+        [ e._id, e ]
+      end
+
+      filtered_events = []
+      events_with_id.each do |id, event|
+        next if events.where(id: id.to_s).count > 0
+
+        filtered_events << event
+
+        doc = event_doc(id, event)
+        events.insert(doc)
+      end
+
+      filtered_events
+    end
+
     def add_events_with_ids(event_id_map)
       event_id_map.each do |id, event|
-        doc = {
-          :id => id.to_s,
-          :_type => event.class.name,
-          :_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, :entity_version)),
-        }
+        doc = event_doc(id, event)
         events.insert(doc)
       end
     end
 
+    def event_doc(id, event)
+      {
+        :id => id.to_s,
+        :_type => event.class.name,
+        :_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, :entity_version, :_id)),
+      }
+    end
+
     # Public: loads the entity from the store, including any available snapshots
     # then loads the events to complete the state
     #
@@ -259,6 +284,25 @@ module EntityStoreSequel
 
     private
 
+    def get_raw_events(entity_id)
+      rows = events.where(:_entity_id => entity_id).order_by(:entity_version, :id)
+      rows.map do |attrs|
+        if self.class.native_json_hash
+          hash = attrs[:data].to_h
+        else
+          hash = PigeonHole.parse(attrs[:data])
+        end
+
+        hash[:_id] = attrs[:id]
+        hash[:_type] = attrs[:_type]
+        hash[:entity_version] = attrs[:entity_version]
+        hash[:entity_id] = attrs[:_entity_id]
+        hash[:at] = attrs[:at]
+
+        hash
+      end
+    end
+
     def filter_method_name(index)
       index == 0 ? :where : :or
     end

data/lib/entity_store_sequel/version.rb

@@ -1,3 +1,3 @@
 module EntityStoreSequel
-  VERSION = "0.2.2".freeze
+  VERSION = "0.4.0".freeze
 end

data/spec/entity_store_sequel/postgres_entity_store_spec.rb

@@ -47,6 +47,21 @@ describe PostgresEntityStore do
     end
   end
 
+  class DummyEntityExcludedEvent
+    include EntityStore::Event
+
+    attr_accessor :marker
+
+    def apply(entity)
+      # No-op
+    end
+
+    def ==(other)
+      # Crude check relying on inspect, ok for tests
+      self.inspect == other.inspect
+    end
+  end
+
   let(:store) do
     described_class.connection_string = ENV['SQL_CONNECTION'] || 'postgres://localhost/cronofy_test'
     described_class.init
@@ -123,23 +138,42 @@ describe PostgresEntityStore do
     let(:third_event)     { DummyEntityNameSet.new(:entity_id => entity_id, :entity_version => 2, :name => random_string) }
     let(:unrelated_event) { DummyEntityNameSet.new(:entity_id => second_entity_id, :entity_version => 4, :name => random_string) }
     let(:fourth_event)    { DummyEntityNameSet.new(:entity_id => entity_id, :entity_version => 3, :name => random_string) }
+    let(:excluded_event)  { DummyEntityExcludedEvent.new(:entity_id => entity_id, :entity_version => 5, :marker => random_string) }
 
     before do
-      store.add_events([ second_event, unrelated_event, first_event, third_event, fourth_event ])
+      store.add_events([ second_event, unrelated_event, first_event, third_event, fourth_event, excluded_event ])
     end
 
-    subject { store.clear_entity_events(entity_id, []) }
+    context "clearing everything" do
+      subject { store.clear_entity_events(entity_id, []) }
 
-    it "clears the events from the entity" do
-      subject
-      events = store.get_events( [ id: entity_id ])[entity_id]
-      expect(events).to be_empty
+      it "clears the events from the entity" do
+        subject
+        events = store.get_events( [ id: entity_id ])[entity_id]
+        expect(events).to be_empty
+      end
+
+      it "does not delete unrelated the events" do
+        subject
+        events = store.get_events( [ id: second_entity_id ])[second_entity_id]
+        expect(events).to eq [unrelated_event]
+      end
     end
 
-    it "does not delete unrelated the events" do
-      subject
-      events = store.get_events( [ id: second_entity_id ])[second_entity_id]
-      expect(events.count).to eq(1)
+    context "excluding an event type from deletion" do
+      subject { store.clear_entity_events(entity_id, [DummyEntityExcludedEvent.to_s]) }
+
+      it "clears all other events from the entity" do
+        subject
+        events = store.get_events( [ id: entity_id ])[entity_id]
+        expect(events).to eq [excluded_event]
+      end
+
+      it "does not delete unrelated the events" do
+        subject
+        events = store.get_events( [ id: second_entity_id ])[second_entity_id]
+        expect(events).to eq [unrelated_event]
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entity_store_sequel
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Stephen Binns
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -101,7 +101,7 @@ homepage: http://github.com/cronofy/entity_store_sequel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,12 +116,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.4.21
+signing_key:
 specification_version: 4
 summary: Sequel body for Entity Store
 test_files:
-- spec/spec_helper.rb
-- spec/entity_store_spec.rb
 - spec/entity_store_sequel/postgres_entity_store_spec.rb
+- spec/entity_store_spec.rb
+- spec/spec_helper.rb