sequent 6.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e420a9289f17d8552364afd49977cdb8cdbc0b37f39445a0a7ce310f9c1a180f
-  data.tar.gz: 116144ee36558de52bc381b8e99e13d44aad3bedda6d531b380d93b3d7b96445
+  metadata.gz: 31a7eb29122b5706014155cacea33cc9064991eca03762d6c9eb0a300e4d3fe5
+  data.tar.gz: 4724c03d49b69fd01d111a53961936c3b1a6adba91bacb9af0abd97c4337d49a
 SHA512:
-  metadata.gz: 434eb99e05dda79479a8c8a6529a0d2b3bfa2fc3e02c7143ad314f27a2140d33c6a01f1d3d1a147892b1dafefcd899bed8bde9cbe3b0c76520f3561b5dfa2b05
-  data.tar.gz: 6fd8a9df8cac32aaad084fd2b472caab478c13840da563b8d3a8e8c9e1d86c32bfc3d43a7e8d7031386a36a127c9be6648d3baaa241dcfb45d92f3d7721a9d4d
+  metadata.gz: 6c13866f01dde089ae6cd95ca17fbbfd594209751300f429b0ef4f3680d19f1a468bf2675b24536b6e09150f80471afdab5a663be79fd45692fe758c47dd8f26
+  data.tar.gz: 96d19ae22452eb86ed09fda426e6cb56aad6b47be5589004a8ba0e24623bd8316297d8b29829210fafb57e75b251797007bb9b610d27850809ce4b1c661adcde

data/db/sequent_schema.rb

@@ -8,8 +8,12 @@ ActiveRecord::Schema.define do
     t.text "event_json", :null => false
     t.integer "command_record_id", :null => false
     t.integer "stream_record_id", :null => false
+    t.bigint "xact_id"
   end
 
+  execute %Q{
+ALTER TABLE event_records ALTER COLUMN xact_id SET DEFAULT pg_current_xact_id()::text::bigint
+}
   execute %Q{
 CREATE UNIQUE INDEX unique_event_per_aggregate ON event_records (
   aggregate_id,
@@ -24,6 +28,7 @@ CREATE INDEX snapshot_events ON event_records (aggregate_id, sequence_number DES
   add_index "event_records", ["command_record_id"], :name => "index_event_records_on_command_record_id"
   add_index "event_records", ["event_type"], :name => "index_event_records_on_event_type"
   add_index "event_records", ["created_at"], :name => "index_event_records_on_created_at"
+  add_index "event_records", ["xact_id"], :name => "index_event_records_on_xact_id"
 
   create_table "command_records", :force => true do |t|
     t.string "user_id"

data/lib/sequent/configuration.rb

@@ -10,7 +10,6 @@ require 'logger'
 module Sequent
   class Configuration
     DEFAULT_VERSIONS_TABLE_NAME = 'sequent_versions'
-    DEFAULT_REPLAYED_IDS_TABLE_NAME = 'sequent_replayed_ids'
 
     DEFAULT_MIGRATION_SQL_FILES_DIRECTORY = 'db/tables'
     DEFAULT_DATABASE_CONFIG_DIRECTORY = 'db'
@@ -36,6 +35,7 @@ module Sequent
 
     attr_accessor :aggregate_repository,
                   :event_store,
+                  :event_store_cache_event_types,
                   :command_service,
                   :event_record_class,
                   :stream_record_class,
@@ -63,20 +63,23 @@ module Sequent
                   :enable_multiple_database_support,
                   :primary_database_role,
                   :primary_database_key,
-                  :time_precision
+                  :time_precision,
+                  :enable_autoregistration
 
     attr_reader :migrations_class_name,
-                :versions_table_name,
-                :replayed_ids_table_name
+                :versions_table_name
 
     def self.instance
       @instance ||= new
     end
 
+    # Create a new instance of Configuration
     def self.reset
       @instance = new
     end
 
+    # Restore the given Configuration
+    # @param configuration [Sequent::Configuration]
     def self.restore(configuration)
       @instance = configuration
     end
@@ -88,6 +91,7 @@ module Sequent
       self.command_middleware = Sequent::Core::Middleware::Chain.new
 
       self.aggregate_repository = Sequent::Core::AggregateRepository.new
+      self.event_store_cache_event_types = true
       self.event_store = Sequent::Core::EventStore.new
       self.command_service = Sequent::Core::CommandService.new
       self.event_record_class = Sequent::Core::EventRecord
@@ -98,7 +102,6 @@ module Sequent
       self.event_publisher = Sequent::Core::EventPublisher.new
       self.disable_event_handlers = false
       self.versions_table_name = DEFAULT_VERSIONS_TABLE_NAME
-      self.replayed_ids_table_name = DEFAULT_REPLAYED_IDS_TABLE_NAME
       self.migration_sql_files_directory = DEFAULT_MIGRATION_SQL_FILES_DIRECTORY
       self.view_schema_name = DEFAULT_VIEW_SCHEMA_NAME
       self.event_store_schema_name = DEFAULT_EVENT_STORE_SCHEMA_NAME
@@ -121,24 +124,19 @@ module Sequent
       self.primary_database_key = :primary
 
       self.time_precision = DEFAULT_TIME_PRECISION
+
+      self.enable_autoregistration = false
     end
 
     def can_use_multiple_databases?
       enable_multiple_database_support && ActiveRecord.version > Gem::Version.new('6.1.0')
     end
 
-    def replayed_ids_table_name=(table_name)
-      fail ArgumentError, 'table_name can not be nil' unless table_name
-
-      @replayed_ids_table_name = table_name
-      Sequent::Migrations::ViewSchema::ReplayedIds.table_name = table_name
-    end
-
     def versions_table_name=(table_name)
       fail ArgumentError, 'table_name can not be nil' unless table_name
 
       @versions_table_name = table_name
-      Sequent::Migrations::ViewSchema::Versions.table_name = table_name
+      Sequent::Migrations::Versions.table_name = table_name
     end
 
     def migrations_class_name=(class_name)
@@ -149,5 +147,58 @@ module Sequent
 
       @migrations_class_name = class_name
     end
+
+    # @!visibility private
+    def autoregister!
+      return unless enable_autoregistration
+
+      # Only autoregister the AggregateSnapshotter if the autoregistration is enabled
+      Sequent::Core::AggregateSnapshotter.skip_autoregister = false
+
+      autoload_if_in_rails
+
+      self.class.instance.command_handlers ||= []
+      for_each_autoregisterable_descenant_of(Sequent::CommandHandler) do |command_handler_class|
+        Sequent.logger.debug("[Configuration] Autoregistering CommandHandler #{command_handler_class}")
+        self.class.instance.command_handlers << command_handler_class.new
+      end
+
+      self.class.instance.event_handlers ||= []
+      for_each_autoregisterable_descenant_of(Sequent::Projector) do |projector_class|
+        Sequent.logger.debug("[Configuration] Autoregistering Projector #{projector_class}")
+        self.class.instance.event_handlers << projector_class.new
+      end
+
+      for_each_autoregisterable_descenant_of(Sequent::Workflow) do |workflow_class|
+        Sequent.logger.debug("[Configuration] Autoregistering Workflow #{workflow_class}")
+        self.class.instance.event_handlers << workflow_class.new
+      end
+
+      self.class.instance.command_handlers.map(&:class).tally.each do |(clazz, count)|
+        if count > 1
+          fail "CommandHandler #{clazz} is registered #{count} times. A CommandHandler can only be registered once"
+        end
+      end
+
+      self.class.instance.event_handlers.map(&:class).tally.each do |(clazz, count)|
+        if count > 1
+          fail "EventHandler #{clazz} is registered #{count} times. An EventHandler can only be registered once"
+        end
+      end
+    end
+
+    private
+
+    def autoload_if_in_rails
+      Rails.autoloaders.main.eager_load(force: true) if defined?(Rails) && Rails.respond_to?(:autoloaders)
+    end
+
+    def for_each_autoregisterable_descenant_of(clazz, &block)
+      clazz
+        .descendants
+        .reject(&:abstract_class)
+        .reject(&:skip_autoregister)
+        .each(&block)
+    end
   end
 end

data/lib/sequent/core/aggregate_repository.rb

@@ -79,8 +79,8 @@ module Sequent
           .configuration
           .event_store
           .stream_events_for_aggregate(aggregate_id, load_until: load_until) do |event_stream|
-          aggregate.stream_from_history(event_stream)
-        end
+            aggregate.stream_from_history(event_stream)
+          end
 
         if clazz
           fail TypeError, "#{aggregate.class} is not a #{clazz}" unless aggregate.class <= clazz

data/lib/sequent/core/aggregate_snapshotter.rb

@@ -15,6 +15,10 @@ module Sequent
     end
 
     class AggregateSnapshotter < BaseCommandHandler
+      # By default skip autoregistering this CommandHandler.
+      # The AggregateSnapshotter is only autoregistered if autoregistration is enabled.
+      self.skip_autoregister = true
+
       on SnapshotCommand do |command|
         aggregate_ids = Sequent.configuration.event_store.aggregates_that_need_snapshots(
           @last_aggregate_id,

data/lib/sequent/core/base_command_handler.rb

@@ -21,6 +21,11 @@ module Sequent
     class BaseCommandHandler
       include Sequent::Core::Helpers::UuidHelper
       include Sequent::Core::Helpers::MessageHandler
+      extend ActiveSupport::DescendantsTracker
+
+      class << self
+        attr_accessor :abstract_class, :skip_autoregister
+      end
 
       protected
 

data/lib/sequent/core/core.rb

@@ -16,7 +16,7 @@ require_relative 'projector'
 require_relative 'event_store'
 require_relative 'event_record'
 require_relative 'command_record'
-require_relative 'aggregate_snapshotter'
 require_relative 'workflow'
 require_relative 'random_uuid_generator'
 require_relative 'event_publisher'
+require_relative 'aggregate_snapshotter'

data/lib/sequent/core/event.rb

@@ -29,8 +29,8 @@ module Sequent
           .reject { |k| payload_variables.include?(k) }
           .select { |k| self.class.types.keys.include?(to_attribute_name(k)) }
           .each do |k|
-          result[k.to_s[1..-1].to_sym] = instance_variable_get(k)
-        end
+            result[k.to_s[1..-1].to_sym] = instance_variable_get(k)
+          end
         result
       end
 

data/lib/sequent/core/event_record.rb

@@ -76,6 +76,7 @@ module Sequent
       include SerializesEvent
 
       self.table_name = 'event_records'
+      self.ignored_columns = %w[xact_id]
 
       belongs_to :stream_record
       belongs_to :command_record

data/lib/sequent/core/event_store.rb

@@ -35,14 +35,6 @@ module Sequent
         end
       end
 
-      def initialize(cache_event_types: true)
-        @event_types = if cache_event_types
-                         ThreadSafe::Cache.new
-                       else
-                         NoEventTypesCache.new
-                       end
-      end
-
       ##
       # Stores the events in the EventStore and publishes the events
       # to the registered event_handlers.
@@ -114,13 +106,13 @@ module Sequent
         events
           .group_by(&:aggregate_id)
           .map do |aggregate_id, es|
-          [
-            streams.find do |stream_record|
-              stream_record.aggregate_id == aggregate_id
-            end.event_stream,
-            es,
-          ]
-        end
+            [
+              streams.find do |stream_record|
+                stream_record.aggregate_id == aggregate_id
+              end.event_stream,
+              es,
+            ]
+          end
       end
 
       def aggregate_query(aggregate_id)
@@ -217,6 +209,18 @@ module Sequent
 
       private
 
+      def quote_table_name(table_name)
+        Sequent.configuration.event_record_class.connection.quote_table_name(table_name)
+      end
+
+      def event_types
+        @event_types = if Sequent.configuration.event_store_cache_event_types
+                         ThreadSafe::Cache.new
+                       else
+                         NoEventTypesCache.new
+                       end
+      end
+
       def column_names
         @column_names ||= Sequent
           .configuration
@@ -238,7 +242,7 @@ module Sequent
       end
 
       def resolve_event_type(event_type)
-        @event_types.fetch_or_store(event_type) { |k| Class.const_get(k) }
+        event_types.fetch_or_store(event_type) { |k| Class.const_get(k) }
       end
 
       def publish_events(events)

data/lib/sequent/core/helpers/attribute_support.rb

@@ -79,8 +79,8 @@ module Sequent
                 super if defined?(super)
                 ensure_known_attributes(attrs)
                 #{@types.map do |attribute, _|
-                    "@#{attribute} = attrs[:#{attribute}]"
-                  end.join("\n            ")}
+                  "@#{attribute} = attrs[:#{attribute}]"
+                end.join("\n            ")}
                 self
               end
 EOS
@@ -89,8 +89,8 @@ EOS
                def update_all_attributes_from_json(attrs)
                  super if defined?(super)
                  #{@types.map do |attribute, type|
-                     "@#{attribute} = #{type}.deserialize_from_json(attrs['#{attribute}'])"
-                   end.join("\n           ")}
+                   "@#{attribute} = #{type}.deserialize_from_json(attrs['#{attribute}'])"
+                 end.join("\n           ")}
                end
 EOS
           end
@@ -206,10 +206,10 @@ EOS
               value
                 .select { |val| val.respond_to?(:validation_errors) }
                 .each_with_index do |val, index|
-                val.validation_errors.each do |k, v|
-                  result["#{field[0]}_#{index}_#{k}".to_sym] = v
+                  val.validation_errors.each do |k, v|
+                    result["#{field[0]}_#{index}_#{k}".to_sym] = v
+                  end
                 end
-              end
             end
           end
           prefix ? HashWithIndifferentAccess[result.map { |k, v| ["#{prefix}_#{k}", v] }] : result

data/lib/sequent/core/helpers/message_handler.rb

@@ -2,7 +2,6 @@
 
 require_relative 'message_handler_option_registry'
 require_relative 'message_router'
-require_relative 'message_dispatcher'
 
 module Sequent
   module Core
@@ -60,11 +59,7 @@ module Sequent
           end
 
           def message_mapping
-            message_router
-              .routes
-              .select { |matcher, _handlers| matcher.is_a?(MessageMatchers::InstanceOf) }
-              .map { |k, v| [k.expected_class, v] }
-              .to_h
+            message_router.instanceof_routes
           end
 
           def handles_message?(message)
@@ -106,13 +101,17 @@ module Sequent
         end
 
         def handle_message(message)
-          message_dispatcher.dispatch_message(message)
+          handlers = self.class.message_router.match_message(message)
+          dispatch_message(message, handlers) unless handlers.empty?
         end
 
-        private
-
-        def message_dispatcher
-          MessageDispatcher.new(self.class.message_router, self)
+        def dispatch_message(message, handlers)
+          handlers.each do |handler|
+            if Sequent.logger.debug?
+              Sequent.logger.debug("[MessageHandler] Handler #{self.class} handling #{message.class}")
+            end
+            instance_exec(message, &handler)
+          end
         end
       end
     end

data/lib/sequent/core/helpers/message_router.rb

@@ -7,7 +7,7 @@ module Sequent
   module Core
     module Helpers
       class MessageRouter
-        attr_reader :routes
+        attr_reader :routes, :instanceof_routes
 
         def initialize
           clear_routes
@@ -21,7 +21,11 @@ module Sequent
         #
         def register_matchers(*matchers, handler)
           matchers.each do |matcher|
-            @routes[matcher] << handler
+            if matcher.is_a?(MessageMatchers::InstanceOf)
+              @instanceof_routes[matcher.expected_class] << handler
+            else
+              @routes[matcher] << handler
+            end
           end
         end
 
@@ -29,11 +33,12 @@ module Sequent
         # Returns a set of handlers that match the given message, or an empty set when none match.
         #
         def match_message(message)
-          @routes
-            .reduce(Set.new) do |memo, (matcher, handlers)|
-              memo = memo.merge(handlers) if matcher.matches_message?(message)
-              memo
-            end
+          result = Set.new
+          result.merge(@instanceof_routes[message.class])
+          @routes.each do |matcher, handlers|
+            result.merge(handlers) if matcher.matches_message?(message)
+          end
+          result
         end
 
         ##
@@ -47,6 +52,7 @@ module Sequent
         # Removes all routes from the router.
         #
         def clear_routes
+          @instanceof_routes = Hash.new { |h, k| h[k] = Set.new }
           @routes = Hash.new { |h, k| h[k] = Set.new }
         end
       end

data/lib/sequent/core/persistors/active_record_persistor.rb

@@ -117,6 +117,10 @@ module Sequent
           Sequent::ApplicationRecord.connection.execute(statement)
         end
 
+        def prepare
+          # noop
+        end
+
         def commit
           # noop
         end

data/lib/sequent/core/persistors/persistor.rb

@@ -76,6 +76,11 @@ module Sequent
           fail 'Method not supported in this persistor'
         end
 
+        # Hook to implement for instance the persistor batches statements
+        def prepare
+          fail 'Method not supported in this persistor'
+        end
+
         # Hook to implement for instance the persistor batches statements
         def commit
           fail 'Method not supported in this persistor'