rails_event_store_active_record 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0bef98dccdd36a255c20ef3bd059921c483fe3e9e448bd53c48fa23c6032692
-  data.tar.gz: 02f25563e5d185d4d19fbe79e92d83d2c8abe14281797f2d365db970664f464e
+  metadata.gz: 47f9fb4041eeafab89312eabfbf9cada70da41480032fef06dcf3311f0e35d56
+  data.tar.gz: 79e021816506f4e49ff72e6f66f66820c9d588a30d1f3f8736d29cc478400340
 SHA512:
-  metadata.gz: 3949e5687ec1647b7257c25cf337f488f012df089226819e4b4198937b72eb8d3d1c1e8d09fbb4cf46711abf583743c49edfd76c00def3f1f5800b555db0fa1e
-  data.tar.gz: 5dd00bbb2a01217095c8e5ed4130582e0f8a23b6cb0fdaf6cb8c94f70afe371648197b3f5cbf8a98e0711e529b3ae87c02619a1372be3679f808ee2367e49f26
+  metadata.gz: cfc072dd9e99031459dcc037cece006477f08c8b5ec014b592f579b3de403e57b7224a68691548b6e2e1b1d0d735aba841cb7a969f0d22916b8165360f4d64df
+  data.tar.gz: 440e6a1a06e37a05ec12590de43be4445314c8244d480f8a8a2ad261e5adcce05e5aa2115a9001011fcb063779ab6a74ff4e518dc0a463812bebe0eea67c50ff

data/lib/rails_event_store_active_record/event.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'active_record'
+require "active_record"
 
 module RailsEventStoreActiveRecord
   class Event < ::ActiveRecord::Base
     self.primary_key = :id
-    self.table_name = 'event_store_events'
+    self.table_name = "event_store_events"
   end
 
   class EventInStream < ::ActiveRecord::Base
     self.primary_key = :id
-    self.table_name = 'event_store_events_in_streams'
+    self.table_name = "event_store_events_in_streams"
     belongs_to :event, primary_key: :event_id
   end
 end

data/lib/rails_event_store_active_record/event_repository.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/array'
-require 'activerecord-import'
+require "active_support/core_ext/array"
+require "activerecord-import"
 
 module RailsEventStoreActiveRecord
   class EventRepository
@@ -66,9 +66,15 @@ module RailsEventStoreActiveRecord
     end
 
     def streams_of(event_id)
-      @stream_klass.where(event_id: event_id)
-        .pluck(:stream)
-        .map { |name| RubyEventStore::Stream.new(name) }
+      @repo_reader.streams_of(event_id)
+    end
+
+    def position_in_stream(event_id, stream)
+      @repo_reader.position_in_stream(event_id, stream)
+    end
+
+    def global_position(event_id)
+      @repo_reader.global_position(event_id)
     end
 
     private

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -14,7 +14,7 @@ module RailsEventStoreActiveRecord
     end
 
     def last_stream_event(stream)
-      record_ = @stream_klass.where(stream: stream.name).order('position DESC, id DESC').first
+      record_ = @stream_klass.where(stream: stream.name).order("position DESC, id DESC").first
       record(record_) if record_
     end
 
@@ -37,6 +37,24 @@ module RailsEventStoreActiveRecord
       read_scope(spec).count
     end
 
+    def streams_of(event_id)
+      @stream_klass.where(event_id: event_id)
+        .pluck(:stream)
+        .map { |name| RubyEventStore::Stream.new(name) }
+    end
+
+    def position_in_stream(event_id, stream)
+      record = @stream_klass.select("position").where(stream: stream.name).find_by(event_id: event_id)
+      raise RubyEventStore::EventNotFoundInStream if record.nil?
+      record.position
+    end
+
+    def global_position(event_id)
+      record = @event_klass.select("id").find_by(event_id: event_id)
+      raise RubyEventStore::EventNotFound.new(event_id) if record.nil?
+      record.id - 1
+    end
+
     private
     attr_reader :serializer
 
@@ -78,7 +96,7 @@ module RailsEventStoreActiveRecord
         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.order(position: order(spec), id: order(spec))
+        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
@@ -152,7 +170,7 @@ module RailsEventStoreActiveRecord
     end
 
     def order(spec)
-      spec.forward? ? 'ASC' : 'DESC'
+      spec.forward? ? "ASC" : "DESC"
     end
 
     def record(record)

data/lib/rails_event_store_active_record/generators/migration_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 begin
-  require 'rails/generators'
+  require "rails/generators"
 rescue LoadError
 end
 
@@ -11,11 +11,11 @@ module RailsEventStoreActiveRecord
 
     DATA_TYPES = %w(binary json jsonb).freeze
 
-    source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
+    source_root File.expand_path(File.join(File.dirname(__FILE__), "../generators/templates"))
     class_option(
       :data_type,
       type: :string,
-      default: 'binary',
+      default: "binary",
       desc: "Configure the data type for `data` and `meta data` fields in Postgres migration (options: #{DATA_TYPES.join('/')})"
     )
 
@@ -34,7 +34,7 @@ module RailsEventStoreActiveRecord
     private
 
     def data_type
-      options.fetch('data_type')
+      options.fetch("data_type")
     end
 
     def migration_version

data/lib/rails_event_store_active_record/generators/templates/create_event_store_events_template.rb

@@ -2,37 +2,42 @@
 
 class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
   def change
-    postgres = ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-    sqlite   = ActiveRecord::Base.connection.adapter_name == "SQLite"
-
-    create_table(:event_store_events_in_streams, force: false) do |t|
-      t.string      :stream,      null: false
-      t.integer     :position,    null: true
-      if postgres
-        t.references :event, null: false, type: :uuid
-      else
-        t.references :event, null: false, type: :string, limit: 36
-      end
-      if postgres
+    postgres =
+      ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+    if postgres
+      create_table(:event_store_events_in_streams, id: :bigserial, force: false) do |t|
+        t.string      :stream,      null: false
+        t.integer     :position,    null: true
+        t.references  :event,       null: false, type: :uuid
         t.datetime    :created_at,  null: false
-      else
-        t.datetime    :created_at,  null: false, precision: 6
       end
-    end
-    add_index :event_store_events_in_streams, [:stream, :position], unique: true
-    add_index :event_store_events_in_streams, [:created_at]
-    add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
+      add_index :event_store_events_in_streams, [:stream, :position], unique: true
+      add_index :event_store_events_in_streams, [:created_at]
+      add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
 
-    if postgres
-      create_table(:event_store_events, force: false) do |t|
+      create_table(:event_store_events, id: :bigserial, force: false) do |t|
         t.references  :event,       null: false, type: :uuid
         t.string      :event_type,  null: false
         t.<%= data_type %>      :metadata
-        t.<%= data_type %>      :data,        null: false
+        t.<%= data_type %>      :data, null: false
         t.datetime    :created_at,  null: false
         t.datetime    :valid_at,    null: true
       end
+      add_index :event_store_events, :event_id, unique: true
+      add_index :event_store_events, :created_at
+      add_index :event_store_events, :valid_at
+      add_index :event_store_events, :event_type
     else
+      create_table(:event_store_events_in_streams, force: false) do |t|
+        t.string      :stream,      null: false
+        t.integer     :position,    null: true
+        t.references  :event,       null: false, type: :string, limit: 36
+        t.datetime    :created_at,  null: false, precision: 6
+      end
+      add_index :event_store_events_in_streams, [:stream, :position], unique: true
+      add_index :event_store_events_in_streams, [:created_at]
+      add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
+
       create_table(:event_store_events, force: false) do |t|
         t.references  :event,       null: false, type: :string, limit: 36
         t.string      :event_type,  null: false
@@ -41,10 +46,10 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
         t.datetime    :created_at,  null: false, precision: 6
         t.datetime    :valid_at,    null: true,  precision: 6
       end
+      add_index :event_store_events, :event_id, unique: true
+      add_index :event_store_events, :created_at
+      add_index :event_store_events, :valid_at
+      add_index :event_store_events, :event_type
     end
-    add_index :event_store_events, :event_id, unique: true
-    add_index :event_store_events, :created_at
-    add_index :event_store_events, :valid_at
-    add_index :event_store_events, :event_type
   end
 end

data/lib/rails_event_store_active_record/pg_linearized_event_repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'activerecord-import'
+require "activerecord-import"
 
 module RailsEventStoreActiveRecord
   class PgLinearizedEventRepository < EventRepository

data/lib/rails_event_store_active_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsEventStoreActiveRecord
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/rails_event_store_active_record/with_abstract_base_class.rb

@@ -21,7 +21,7 @@ module RailsEventStoreActiveRecord
       Object.const_set("Event_#{instance_id}",
         Class.new(@base_klass) do
           self.primary_key = :id
-          self.table_name  = 'event_store_events'
+          self.table_name  = "event_store_events"
         end
       )
     end
@@ -30,7 +30,7 @@ module RailsEventStoreActiveRecord
       Object.const_set("EventInStream_#{instance_id}",
         Class.new(@base_klass) do
           self.primary_key = :id
-          self.table_name = 'event_store_events_in_streams'
+          self.table_name = "event_store_events_in_streams"
           belongs_to :event, primary_key: :event_id, class_name: "Event_#{instance_id}"
         end
       )

data/lib/rails_event_store_active_record.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'rails_event_store_active_record/generators/migration_generator'
-require_relative 'rails_event_store_active_record/event'
-require_relative 'rails_event_store_active_record/with_default_models'
-require_relative 'rails_event_store_active_record/with_abstract_base_class'
-require_relative 'rails_event_store_active_record/event_repository'
-require_relative 'rails_event_store_active_record/batch_enumerator'
-require_relative 'rails_event_store_active_record/event_repository_reader'
-require_relative 'rails_event_store_active_record/index_violation_detector'
-require_relative 'rails_event_store_active_record/pg_linearized_event_repository'
-require_relative 'rails_event_store_active_record/version'
+require_relative "rails_event_store_active_record/generators/migration_generator"
+require_relative "rails_event_store_active_record/event"
+require_relative "rails_event_store_active_record/with_default_models"
+require_relative "rails_event_store_active_record/with_abstract_base_class"
+require_relative "rails_event_store_active_record/event_repository"
+require_relative "rails_event_store_active_record/batch_enumerator"
+require_relative "rails_event_store_active_record/event_repository_reader"
+require_relative "rails_event_store_active_record/index_violation_detector"
+require_relative "rails_event_store_active_record/pg_linearized_event_repository"
+require_relative "rails_event_store_active_record/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-09-09 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.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement