aggregate_streams 1.0.0.0.rc4 → 1.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab8ab1a6d681ef30dcfc03fade5e32f3b1c7d54cb8fea4ff3f9e5b22a7c3122f
-  data.tar.gz: d2903306103791d7466069ef61f10652ce08daaea9b6a6371af6002bb9c706b6
+  metadata.gz: cdcf7bac6c03a998987f6cf21d3e88efdf7bcef26f6d00c6e72f19363e1d58a3
+  data.tar.gz: d9cc11c444fd189ddc431009d5c32823144ed7f54b31285477c7ad67ce484791
 SHA512:
-  metadata.gz: e24676f6919e982afaa00badb072dce9b4fe76cb1f86ac90bb3dfc53f55bfd9b45170f779eee70821c6e60752efe14852e51bef89159ab06b42bfc6b511a8c9c
-  data.tar.gz: deb98567a015486f7523419a3f34c1f0d86bb958021155253a037c92fe8b8ba607411ed1d33b7116d5aefdb05f7d98942f2520f0cf696e15f68c0a547743aec3
+  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/handle.rb

@@ -31,48 +31,48 @@ 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 = raw_metadata(input_metadata)
+        output_metadata = raw_metadata(input_metadata)
 
-      write_message_data = MessageStore::MessageData::Write.new
+        write_message_data = MessageStore::MessageData::Write.new
 
-      SetAttributes.(write_message_data, message_data, copy: [:type, :data])
+        SetAttributes.(write_message_data, message_data, copy: [:type, :data])
 
-      write_message_data.metadata = output_metadata
+        write_message_data.metadata = output_metadata
 
-      input_category = Messaging::StreamName.get_category(message_data.stream_name)
-      write_message_data = transform(write_message_data, input_category)
+        input_category = Messaging::StreamName.get_category(message_data.stream_name)
+        write_message_data = transform(write_message_data, input_category)
 
-      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
+        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
 
-      Try.(MessageStore::ExpectedVersion::Error) do
         stream_name = stream_name(stream_id)
         write.(write_message_data, stream_name, expected_version: version)
-      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}"
+          end
 
-        "Message copied (Message Type: #{message_type}, Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})"
+          "Message copied (Message Type: #{message_type}, Stream: #{message_data.stream_name}, Global Position: #{message_data.global_position})"
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggregate_streams
 version: !ruby/object:Gem::Version
-  version: 1.0.0.0.rc4
+  version: 1.0.0.0
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-08 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.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Combine messages from multiple Eventide streams into an aggregate stream