ruby_event_store-rom 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af23fb98d5ccf4b0730bfd4da1dfea36b511d5b7d00e82158daaa7ed3ba6979
-  data.tar.gz: 741f05db9dc98c607888e5a3a07a8289a3d02094e8deecfcf48da150d6388954
+  metadata.gz: 0346bda57c2f37b5dd9f545f51d980fef10af52630613aa4741f48aa57d3e8eb
+  data.tar.gz: 2e451dd750e028ee9f8a3182e65721c7e3c569a1ac283f9e25cb66e92ac89fac
 SHA512:
-  metadata.gz: f6846ccb455e16a59fe7a3e655f912f77998af55527d7e0c49278f52454d3d283e9113b70d7fff4289268dc13018d3b0ab4e0dcb774767a313078c8081e7d7fa
-  data.tar.gz: b02ae36dbe6641fda9bb4005821f220954f1ff09672736f2f895963ba0fa366442b1aa21100fee0b20663d9b718d5f66f2a28461419caf1b45c6589cefd92bc3
+  metadata.gz: b4f057692be3234140fdc0102cc66af4280e1a9b83ecaff362d6a18c644fd7df5ed089dd85e3f62d10ee871d5c41fc1a1660cc96aff08d81f728554c65563070
+  data.tar.gz: 3eda5e842ca678da3039b04458f910021ba5639c286c8d5c0eee9c4ccfa2a10d4da3f2c4d534e7e6e65f3dd94d5e26385353b63eba36953b4bcf507e18af9785

data/lib/ruby_event_store/rom/relations/events.rb

@@ -34,20 +34,36 @@ module RubyEventStore
           where(event_type: types)
         end
 
-        def newer_than(time)
-          where { |r| r.events[:created_at] > time.localtime }
+        def newer_than(time, time_sort_by)
+          if time_sort_by == :as_of
+            where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) > time.localtime }
+          else
+            where { |r| r.events[:created_at] > time.localtime }
+          end
         end
 
-        def newer_than_or_equal(time)
-          where { |r| r.events[:created_at] >= time.localtime }
+        def newer_than_or_equal(time, time_sort_by)
+          if time_sort_by == :as_of
+            where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) >= time.localtime }
+          else
+            where { |r| r.events[:created_at] >= time.localtime }
+          end
         end
 
-        def older_than(time)
-          where { |r| r.events[:created_at] < time.localtime }
+        def older_than(time, time_sort_by)
+          if time_sort_by == :as_of
+            where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) < time.localtime }
+          else
+            where { |r| r.events[:created_at] < time.localtime }
+          end
         end
 
-        def older_than_or_equal(time)
-          where { |r| r.events[:created_at] <= time.localtime }
+        def older_than_or_equal(time, time_sort_by)
+          if time_sort_by == :as_of
+            where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) <= time.localtime }
+          else
+            where { |r| r.events[:created_at] <= time.localtime }
+          end
         end
 
         DIRECTION_MAP = { forward: %i[asc > <], backward: %i[desc < >] }.freeze

data/lib/ruby_event_store/rom/relations/stream_entries.rb

@@ -23,7 +23,7 @@ module RubyEventStore
         end
 
         def by_event_type(types)
-          join(:events).where(event_type: types)
+          join_events.where(event_type: types)
         end
 
         def by_stream_and_event_id(stream, event_id)
@@ -34,20 +34,36 @@ module RubyEventStore
           by_stream(stream).select(:position).order(Sequel.desc(:position)).first
         end
 
-        def newer_than(time)
-          join(:events).where { |r| r.events[:created_at] > time.localtime }
+        def newer_than(time, time_sort_by)
+          if time_sort_by == :as_of
+            join_events.where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) > time.localtime }
+          else
+            join_events.where { |r| r.events[:created_at] > time.localtime }
+          end
         end
 
-        def newer_than_or_equal(time)
-          join(:events).where { |r| r.events[:created_at] >= time.localtime }
+        def newer_than_or_equal(time, time_sort_by)
+          if time_sort_by == :as_of
+            join_events.where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) >= time.localtime }
+          else
+            join_events.where { |r| r.events[:created_at] >= time.localtime }
+          end
         end
 
-        def older_than(time)
-          join(:events).where { |r| r.events[:created_at] < time.localtime }
+        def older_than(time, time_sort_by)
+          if time_sort_by == :as_of
+            join_events.where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) < time.localtime }
+          else
+            join_events.where { |r| r.events[:created_at] < time.localtime }
+          end
         end
 
-        def older_than_or_equal(time)
-          join(:events).where { |r| r.events[:created_at] <= time.localtime }
+        def older_than_or_equal(time, time_sort_by)
+          if time_sort_by == :as_of
+            join_events.where { |r| string::coalesce(r.events[:valid_at], r.events[:created_at]) <= time.localtime }
+          else
+            join_events.where { |r| r.events[:created_at] <= time.localtime }
+          end
         end
 
         DIRECTION_MAP = { forward: %i[asc > <], backward: %i[desc < >] }.freeze
@@ -74,7 +90,15 @@ module RubyEventStore
           if event_order_columns.empty?
             query.order { |r| stream_order_columns.map { |c| r[:stream_entries][c].public_send(order) } }
           else
-            query.join(:events).order { |r| event_order_columns.map { |c| r.events[c].public_send(order) } }
+            query.join_events.order { |r| event_order_columns.map { |c| r.events[c].public_send(order) } }
+          end
+        end
+
+        def join_events
+          if dataset.opts[:join]&.map(&:table)&.include?(events.dataset.first_source_table)
+            self
+          else
+            join(:events)
           end
         end
       end

data/lib/ruby_event_store/rom/repositories/events.rb

@@ -65,6 +65,20 @@ module RubyEventStore
 
         protected
 
+        def find_event_id_in_stream(specification_event_id, specification_stream_name)
+          stream_entries
+            .by_stream_and_event_id(specification_stream_name, specification_event_id)
+            .fetch(:id)
+        rescue ::ROM::TupleCountMismatchError
+          raise EventNotFound.new(specification_event_id)
+        end
+
+        def find_event_id_globally(specification_event_id)
+          events.by_event_id(specification_event_id).one!.fetch(:id)
+        rescue ::ROM::TupleCountMismatchError
+          raise EventNotFound.new(specification_event_id)
+        end
+
         def read_scope(specification)
           direction = specification.forward? ? :forward : :backward
 
@@ -73,20 +87,14 @@ module RubyEventStore
           end
 
           if specification.stream.global?
-            offset_entry_id = events.by_event_id(specification.start).one!.fetch(:id) if specification.start
-            stop_entry_id = events.by_event_id(specification.stop).one!.fetch(:id) if specification.stop
+            offset_entry_id = find_event_id_globally(specification.start) if specification.start
+            stop_entry_id = find_event_id_globally(specification.stop) if specification.stop
 
             query = events.ordered(direction, offset_entry_id, stop_entry_id, specification.time_sort_by)
             query = query.map_with(:event_to_serialized_record, auto_struct: false)
           else
-            offset_entry_id =
-              stream_entries
-                .by_stream_and_event_id(specification.stream, specification.start)
-                .fetch(:id) if specification.start
-            stop_entry_id =
-              stream_entries
-                .by_stream_and_event_id(specification.stream, specification.stop)
-                .fetch(:id) if specification.stop
+            offset_entry_id = find_event_id_in_stream(specification.start, specification.stream) if specification.start
+            stop_entry_id = find_event_id_in_stream(specification.stop, specification.stream) if specification.stop
 
             query =
               stream_entries.ordered(
@@ -102,10 +110,10 @@ module RubyEventStore
 
           query = query.by_event_id(specification.with_ids) if specification.with_ids
           query = query.by_event_type(specification.with_types) if specification.with_types?
-          query = query.older_than(specification.older_than) if specification.older_than
-          query = query.older_than_or_equal(specification.older_than_or_equal) if specification.older_than_or_equal
-          query = query.newer_than(specification.newer_than) if specification.newer_than
-          query = query.newer_than_or_equal(specification.newer_than_or_equal) if specification.newer_than_or_equal
+          query = query.older_than(specification.older_than, specification.time_sort_by) if specification.older_than
+          query = query.older_than_or_equal(specification.older_than_or_equal, specification.time_sort_by) if specification.older_than_or_equal
+          query = query.newer_than(specification.newer_than, specification.time_sort_by) if specification.newer_than
+          query = query.newer_than_or_equal(specification.newer_than_or_equal, specification.time_sort_by) if specification.newer_than_or_equal
           query
         end
 

data/lib/ruby_event_store/rom/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module ROM
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-rom
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -171,14 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: ROM events repository for Ruby Event Store