sequent 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1a651a4d982304df2f61362bcefc1736a1eecb6a0693f0da66e95319199311
-  data.tar.gz: '0168575dabe5b65335e56b3feb815c3e8c8abb7b413ae94c271f3480e58fc327'
+  metadata.gz: 19b4f1e046b49ceea7b79a7984ba2329905cdec74dc0ab31d02820752f051585
+  data.tar.gz: 95cd39748cbe7b474c06f8556cd63e2cf548909d2d7e3aee23b794385fdfd2ca
 SHA512:
-  metadata.gz: 39d2faaf084d719c881b9901977bc96b38d8054fd24061d6104ee9036a5e9971565c60cde02f9b874efe722c79d847d544639a08eea6a693d7d027ba8ac49348
-  data.tar.gz: 3a4d7fdd19a09aad5e603d04c571d1c84ff53a63cfaf5571259dc250a4a5b08e7872a98e2ea367a27d719131d49d102da4dfab621e33c8209c88c24b173409e0
+  metadata.gz: d8738ec3b038f058a873db7b8751706cf05112d376fa5053dcb8196c9f96f96a05dc1f61582c98f36415d40899ec05facb572c0f39d03ede1c303b28449614b5
+  data.tar.gz: de81d600667fe597142ac81161b806a5eefbc92bc32fea8a3bb7f4f252bf5289d51fc1f55dbdf04ee62ac0eac37cda7175e0fc68ec7eddbe52d658a885b339a9

data/db/sequent_schema.rb

@@ -29,10 +29,14 @@ CREATE INDEX snapshot_events ON event_records (aggregate_id, sequence_number DES
     t.string "user_id"
     t.string "aggregate_id"
     t.string "command_type", :null => false
+    t.string "event_aggregate_id"
+    t.integer "event_sequence_number"
     t.text "command_json", :null => false
     t.datetime "created_at", :null => false
   end
 
+  add_index "command_records", ["event_aggregate_id", 'event_sequence_number'], :name => "index_command_records_on_event"
+
   create_table "stream_records", :force => true do |t|
     t.datetime "created_at", :null => false
     t.string "aggregate_type", :null => false

data/lib/sequent/core/command.rb

@@ -71,7 +71,7 @@ module Sequent
     #   command = Command.from_params(params)
     #
     class Command < BaseCommand
-      attrs aggregate_id: String, user_id: String
+      attrs aggregate_id: String, user_id: String, event_aggregate_id: String, event_sequence_number: Integer
 
       def initialize(args = {})
         raise ArgumentError, "Missing aggregate_id" if args[:aggregate_id].nil?

data/lib/sequent/core/command_record.rb

@@ -17,6 +17,8 @@ module Sequent
         self.user_id = command.user_id if command.respond_to? :user_id
         self.command_type = command.class.name
         self.command_json = Sequent::Core::Oj.dump(command.attributes)
+        self.event_aggregate_id = command.event_aggregate_id if command.respond_to? :event_aggregate_id
+        self.event_sequence_number = command.event_sequence_number if command.respond_to? :event_sequence_number
       end
     end
 
@@ -26,8 +28,26 @@ module Sequent
 
       self.table_name = "command_records"
 
+      has_many :event_records
+
       validates_presence_of :command_type, :command_json
 
+      def parent
+        EventRecord.find_by(aggregate_id: event_aggregate_id, sequence_number: event_sequence_number)
+      end
+
+      def children
+        event_records
+      end
+
+      def origin
+        parent.present? ? find_origin(parent) : self
+      end
+
+      def find_origin(record)
+        return find_origin(record.parent) if record.parent.present?
+        record
+      end
     end
   end
 end

data/lib/sequent/core/command_service.rb

@@ -1,4 +1,5 @@
 require_relative 'transactions/no_transactions'
+require_relative 'current_event'
 
 module Sequent
   module Core
@@ -21,6 +22,12 @@ module Sequent
       # * If the command is valid all +command_handlers+ that +handles_message?+ is invoked
       # * The +repository+ commits the command and all uncommitted_events resulting from the command
       def execute_commands(*commands)
+        commands.each do |command|
+          if command.respond_to?(:event_aggregate_id) && CurrentEvent.current
+            command.event_aggregate_id = CurrentEvent.current.aggregate_id
+            command.event_sequence_number = CurrentEvent.current.sequence_number
+          end
+        end
         commands.each { |command| command_queue.push(command) }
         process_commands
       end

data/lib/sequent/core/current_event.rb

@@ -0,0 +1,13 @@
+module Sequent
+  module Core
+    class CurrentEvent
+      def self.current=(event)
+        Thread.current[:sequent_current_event] = event
+      end
+
+      def self.current
+        Thread.current[:sequent_current_event]
+      end
+    end
+  end
+end

data/lib/sequent/core/event_record.rb

@@ -82,7 +82,23 @@ module Sequent
 
       validates_presence_of :aggregate_id, :sequence_number, :event_type, :event_json, :stream_record, :command_record
       validates_numericality_of :sequence_number, only_integer: true, greater_than: 0
-    end
 
+      def parent
+        command_record
+      end
+
+      def children
+        CommandRecord.where(event_aggregate_id: aggregate_id, event_sequence_number: sequence_number)
+      end
+
+      def origin
+        parent.present? ? find_origin(parent) : self
+      end
+
+      def find_origin(record)
+        return find_origin(record.parent) if record.parent.present?
+        record
+      end
+    end
   end
 end

data/lib/sequent/core/workflow.rb

@@ -1,10 +1,24 @@
 require_relative 'helpers/message_handler'
+require_relative 'current_event'
 
 module Sequent
   module Core
     class Workflow
       include Helpers::MessageHandler
 
+      def self.on(*message_classes, &block)
+        decorated_block = ->(event) do
+          begin
+            old_event = CurrentEvent.current
+            CurrentEvent.current = event
+            self.instance_exec(event, &block)
+          ensure
+            CurrentEvent.current = old_event
+          end
+        end
+        super(*message_classes, &decorated_block)
+      end
+
       def execute_commands(*commands)
         Sequent.configuration.command_service.execute_commands(*commands)
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Sequent
-  VERSION = '3.1.2'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequent
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Lars Vonk
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -274,6 +274,7 @@ files:
 - lib/sequent/core/command_record.rb
 - lib/sequent/core/command_service.rb
 - lib/sequent/core/core.rb
+- lib/sequent/core/current_event.rb
 - lib/sequent/core/event.rb
 - lib/sequent/core/event_publisher.rb
 - lib/sequent/core/event_record.rb