ruby_event_store-active_record 2.7.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da1ae3857e3ed938eedebac46e1a2ca4e8fc89be6e424f9614e29300430e8278
-  data.tar.gz: 43f039fc3434fc542918682e788acbeb497a219f845da9d149ed041a06d021c0
+  metadata.gz: bdabc01585e316bdc346af6b70751ff948c9d47e0cc10e08eabb0541f387fc68
+  data.tar.gz: 52a70e45996c0bedf4b7472fafaa1e3b655e126ce7c926ac6f0b0dc5314e55f1
 SHA512:
-  metadata.gz: f1a893454a79f7fb541a96fb12b5fc7d41d9aaa2ac29a8d6d23a6e128dcd349a75c387135774eee641d0e879d5124c092217f6e0e8ff1bffbf4eaf9485ccb5a6
-  data.tar.gz: 5b3a9ad5d24bff351eb8b0ae651b3d68bfc9ab5dd15fe5da2be79ed8c4aabca165cc2807f1bf1b75a6253c17287c342c820ac6d95e94bcbec23add6d2c77fa7e
+  metadata.gz: 82a515a643f3f8bbad68d88e691dc687057e7f66ae7ab4a34567433c169208c47b3fcdf8fb37a8521808600d680386833e28357fa55d850667284d071e7e2a12
+  data.tar.gz: 67c3a32693f03ed905f40ee74b3d31a57b08f12c326cbd5ca9de28e4a062693b76b3d17cd4499093e5d0f3f3f7359a5a3226a95f53306af4945a2a2a6a3e6508

data/lib/ruby_event_store/active_record/event_repository_reader.rb

@@ -85,7 +85,8 @@ module RubyEventStore
           stream = @event_klass
           stream = stream.where(event_id: spec.with_ids) if spec.with_ids?
           stream = stream.where(event_type: spec.with_types) if spec.with_types?
-          stream = ordered(stream, spec)
+          stream = stream.order(as_at(spec)) if spec.time_sort_by_as_at?
+          stream = stream.order(as_of(spec)) if spec.time_sort_by_as_of?
           stream = stream.limit(spec.limit) if spec.limit?
           stream = stream.where(start_condition_in_global_stream(spec)) if spec.start
           stream = stream.where(stop_condition_in_global_stream(spec)) if spec.stop
@@ -97,29 +98,27 @@ module RubyEventStore
         else
           stream = @stream_klass.preload(:event).where(stream: spec.stream.name)
           stream = stream.where(event_id: spec.with_ids) if spec.with_ids?
-          stream = stream.where(@event_klass.table_name => { event_type: spec.with_types }) if spec.with_types?
-          stream = ordered(stream.joins(:event), spec)
+          stream = stream.joins(:event).where(@event_klass.table_name => { event_type: spec.with_types }) if spec.with_types?
+          stream = stream.joins(:event).order(as_at(spec)) if spec.time_sort_by_as_at?
+          stream = stream.joins(:event).order(as_of(spec)) if spec.time_sort_by_as_of?
           stream = stream.order(id: order(spec))
           stream = stream.limit(spec.limit) if spec.limit?
           stream = stream.where(start_condition(spec)) if spec.start
           stream = stream.where(stop_condition(spec)) if spec.stop
-          stream = stream.where(older_than_condition(spec)) if spec.older_than
-          stream = stream.where(older_than_or_equal_condition(spec)) if spec.older_than_or_equal
-          stream = stream.where(newer_than_condition(spec)) if spec.newer_than
-          stream = stream.where(newer_than_or_equal_condition(spec)) if spec.newer_than_or_equal
+          stream = stream.joins(:event).where(older_than_condition(spec)) if spec.older_than
+          stream = stream.joins(:event).where(older_than_or_equal_condition(spec)) if spec.older_than_or_equal
+          stream = stream.joins(:event).where(newer_than_condition(spec)) if spec.newer_than
+          stream = stream.joins(:event).where(newer_than_or_equal_condition(spec)) if spec.newer_than_or_equal
           stream
         end
       end
 
-      def ordered(stream, spec)
-        case spec.time_sort_by
-        when :as_at
-          stream.order("#{@event_klass.table_name}.created_at #{order(spec)}")
-        when :as_of
-          stream.order("#{@event_klass.table_name}.valid_at #{order(spec)}")
-        else
-          stream
-        end
+      def as_of(spec)
+        Arel.sql("COALESCE(#{@event_klass.table_name}.valid_at, #{@event_klass.table_name}.created_at) #{order(spec)}")
+      end
+
+      def as_at(spec)
+        "#{@event_klass.table_name}.created_at #{order(spec)}"
       end
 
       def start_offset_condition(specification, record_id, search_in)
@@ -164,20 +163,28 @@ module RubyEventStore
         )
       end
 
+      def time_comparison_field(specification)
+        if specification.time_sort_by_as_of?
+          "COALESCE(#{@event_klass.table_name}.valid_at, #{@event_klass.table_name}.created_at)"
+        else
+          "#{@event_klass.table_name}.created_at"
+        end
+      end
+
       def older_than_condition(specification)
-        ["#{@event_klass.table_name}.created_at < ?", specification.older_than]
+        ["#{time_comparison_field(specification)} < ?", specification.older_than]
       end
 
       def older_than_or_equal_condition(specification)
-        ["#{@event_klass.table_name}.created_at <= ?", specification.older_than_or_equal]
+        ["#{time_comparison_field(specification)} <= ?", specification.older_than_or_equal]
       end
 
       def newer_than_condition(specification)
-        ["#{@event_klass.table_name}.created_at > ?", specification.newer_than]
+        ["#{time_comparison_field(specification)} > ?", specification.newer_than]
       end
 
       def newer_than_or_equal_condition(specification)
-        ["#{@event_klass.table_name}.created_at >= ?", specification.newer_than_or_equal]
+        ["#{time_comparison_field(specification)} >= ?", specification.newer_than_or_equal]
       end
 
       def order(spec)

data/lib/ruby_event_store/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module ActiveRecord
-    VERSION = "2.7.0"
+    VERSION = "2.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-active_record
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement