aggregate_streams 1.0.0.0.rc1 → 1.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f3677271347279d2697fd882d26202f4de35f1b1a572f111f71215a3931796
-  data.tar.gz: 0044e3485e0b089b938312743894272bdaa7db5bc34d71140c2ec0ce35d7552b
+  metadata.gz: cdcf7bac6c03a998987f6cf21d3e88efdf7bcef26f6d00c6e72f19363e1d58a3
+  data.tar.gz: d9cc11c444fd189ddc431009d5c32823144ed7f54b31285477c7ad67ce484791
 SHA512:
-  metadata.gz: d0fde2fec378bc68128cb6fd5408a9c9498c7a2d20b5bab72b6df16bbe3b54b7c1c643e2f98bb4f50428cffcaf2baf88654702d6075d62a62196aa40fd8916b4
-  data.tar.gz: 29d05a5f5ab4dbe717c1914a8134dc749bcd2aeb24867d4760c1dac30d6881fc94889a046ade1ce04e55042067e0c332c1bd5dfcd03fa5cc0861e9d828c1e2b1
+  metadata.gz: 75b2874f85d2c020e81065d27923cac9b3b32c20805989ef84e381ed1399bddd427d06bef4a3c87e51feb9a51d040af39e0fcca6f9cef63f780307b8275af318
+  data.tar.gz: 687bbdb915c196352707e7d27fc633083ac86b28bd9c3964c6a3c71ce9c60f419848d9d15eb2af5754db661c0380c0a38a9e86a66f77e1e1c570c741708d5b4a

data/lib/aggregate_streams.rb

@@ -1,7 +1,7 @@
 require 'consumer/postgres'
 require 'entity_store'
 require 'entity_snapshot/postgres'
-require 'try'
+require 'retry'
 
 require 'aggregate_streams/aggregation'
 require 'aggregate_streams/projection'

data/lib/aggregate_streams/controls/message_data/metadata.rb

@@ -2,7 +2,7 @@ module AggregateStreams
   module Controls
     module MessageData
       module Metadata
-        def self.example(category: nil, stream_id: nil, stream_name: nil, position: nil, global_position: nil, causation_message_stream_name: nil, causation_message_position: nil, causation_message_global_position: nil, correlation_stream_name: nil, reply_stream_name: nil, schema_version: nil)
+        def self.example(category: nil, stream_id: nil, stream_name: nil, position: nil, global_position: nil, causation_message_stream_name: nil, causation_message_position: nil, causation_message_global_position: nil, correlation_stream_name: nil, reply_stream_name: nil, properties: nil, local_properties: nil, schema_version: nil)
           if stream_name == :none
             stream_name = nil
           else
@@ -51,6 +51,18 @@ module AggregateStreams
             reply_stream_name ||= Metadata.reply_stream_name
           end
 
+          if properties == :none
+            properties = nil
+          else
+            properties ||= self.properties
+          end
+
+          if local_properties == :none
+            local_properties = nil
+          else
+            local_properties ||= self.local_properties
+          end
+
           if schema_version == :none
             schema_version = nil
           else
@@ -68,6 +80,10 @@ module AggregateStreams
 
             :correlation_stream_name => correlation_stream_name,
             :reply_stream_name => reply_stream_name,
+
+            :properties => properties,
+            :local_properties => local_properties,
+
             :schema_version => schema_version
           }
 
@@ -108,6 +124,14 @@ module AggregateStreams
           Messaging::Controls::Metadata.reply_stream_name
         end
 
+        def self.properties
+          Messaging::Controls::Properties.example
+        end
+
+        def self.local_properties
+          Messaging::Controls::LocalProperties.example
+        end
+
         def self.schema_version
           Messaging::Controls::Metadata.schema_version
         end

data/lib/aggregate_streams/handle.rb

@@ -5,6 +5,8 @@ module AggregateStreams
 
     include Log::Dependency
 
+    include Settings::Setting
+
     TransformError = Class.new(RuntimeError)
 
     setting :category
@@ -15,7 +17,9 @@ module AggregateStreams
     dependency :store, Store
     dependency :write, MessageStore::Postgres::Write
 
-    def configure(session: nil)
+    def configure(session: nil, settings:)
+      settings.set(self)
+
       writer_session = self.writer_session
       writer_session ||= session
 
@@ -27,54 +31,67 @@ module AggregateStreams
     def handle(message_data)
       logger.trace { "Handling message (Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})" }
 
-      stream_id = Messaging::StreamName.get_id(message_data.stream_name)
+      Retry.(MessageStore::ExpectedVersion::Error, millisecond_intervals: [0, 10, 100, 1000]) do
+        stream_id = Messaging::StreamName.get_id(message_data.stream_name)
 
-      aggregation, version = store.fetch(stream_id, include: :version)
+        aggregation, version = store.fetch(stream_id, include: :version)
 
-      if aggregation.processed?(message_data)
-        logger.info(tag: :ignored) { "Message already handled (Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})" }
-        return
-      end
+        if aggregation.processed?(message_data)
+          logger.info(tag: :ignored) { "Message already handled (Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})" }
+          return
+        end
 
-      raw_input_data = Messaging::Message::Transform::MessageData.read(message_data)
-      input_metadata = Messaging::Message::Metadata.build(raw_input_data[:metadata])
+        raw_input_data = Messaging::Message::Transform::MessageData.read(message_data)
+        input_metadata = Messaging::Message::Metadata.build(raw_input_data[:metadata])
 
-      output_metadata = Messaging::Message::Metadata.build
+        output_metadata = raw_metadata(input_metadata)
 
-      output_metadata.follow(input_metadata)
+        write_message_data = MessageStore::MessageData::Write.new
 
-      output_metadata = output_metadata.to_h
-      output_metadata.delete_if { |_, v| v.nil? }
+        SetAttributes.(write_message_data, message_data, copy: [:type, :data])
 
-      write_message_data = MessageStore::MessageData::Write.new
+        write_message_data.metadata = output_metadata
 
-      SetAttributes.(write_message_data, message_data, copy: [:type, :data])
+        input_category = Messaging::StreamName.get_category(message_data.stream_name)
+        write_message_data = transform(write_message_data, input_category)
 
-      write_message_data.metadata = output_metadata
+        if write_message_data
+          assure_message_data(write_message_data)
+        else
+          logger.info(tag: :ignored) { "Message ignored (Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})" }
+          return
+        end
 
-      input_category = Messaging::StreamName.get_category(message_data.stream_name)
-      write_message_data = transform(write_message_data, input_category)
+        stream_name = stream_name(stream_id)
+        write.(write_message_data, stream_name, expected_version: version)
 
-      if write_message_data
-        assure_message_data(write_message_data)
-      else
-        logger.info(tag: :ignored) { "Message ignored (Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})" }
-        return
-      end
+        logger.info do
+          message_type = message_data.type
+          unless write_message_data.type == message_type
+            message_type = "#{write_message_data.type} ← #{message_type}"
+          end
 
-      logger.info do
-        message_type = message_data.type
-        unless write_message_data.type == message_type
-          message_type = "#{write_message_data.type} ← #{message_type}"
+          "Message copied (Message Type: #{message_type}, Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})"
         end
-
-        "Message copied (Message Type: #{message_type}, Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})"
       end
+    end
 
-      Try.(MessageStore::ExpectedVersion::Error) do
-        stream_name = stream_name(stream_id)
-        write.(write_message_data, stream_name, expected_version: version)
+    def raw_metadata(metadata)
+      output_metadata = Messaging::Message::Metadata.build
+
+      output_metadata.follow(metadata)
+
+      output_metadata = output_metadata.to_h
+
+      output_metadata.delete(:local_properties)
+
+      if output_metadata[:properties].empty?
+        output_metadata.delete(:properties)
       end
+
+      output_metadata.delete_if { |_, v| v.nil? }
+
+      output_metadata
     end
 
     def transform(write_message_data, stream_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggregate_streams
 version: !ruby/object:Gem::Version
-  version: 1.0.0.0.rc1
+  version: 1.0.0.0
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer-postgres
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: evt-try
+  name: evt-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,11 +132,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Combine messages from multiple Eventide streams into an aggregate stream