event_store_client 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee380d04b9833045afa980313c8e734f90501ba8301568855e358ed5df45590
-  data.tar.gz: 0ce74c041e3a27406316bc7962580e4df024c3585a0390cdf87ac90693ffd0aa
+  metadata.gz: '08af7988b22788f181f313f057f739a3c78f538cf53758eb075391551e4d9baf'
+  data.tar.gz: ca38daf119afa7676e910dc4ca2cad2ab8fd16d6a675ed6fde48335d2db670bf
 SHA512:
-  metadata.gz: 0dcd1e350f99cb88fd26cbd03ae9f5011176cdd70867a2d6afdcb054c6aa8d96e7edb9ddaca128f7884695b5dbffcdda655a5ea5d03ff97d6706af6a2ec5eabb
-  data.tar.gz: fb9a02e5171e777d7bb635008538a000bb2148c8cf4cc9fef0c614222961ed02f1348c913a803fc54c309097de0e135dd7784ebc45fbdd9a58ba9071b05681a5
+  metadata.gz: 21dcbc1dafdc7362cd54373ff93f1343397aa432d90ab935f286fd49b921421b88728f5d41178f8075a465cc948fc7ecbf15b42a7489e6565e31467c367bbaff
+  data.tar.gz: '098272251a70ae10f095f9f118fdf2ba197cfe12e586b3ee6d31e96501ceea7032fe25964f087861b7938edd6c6204ceb057135713ef9c89377d59651bb1fc9b'

data/lib/event_store_client/client.rb

@@ -5,9 +5,12 @@ require 'dry-struct'
 module EventStoreClient
   class Client
     NoCallMethodOnSubscriber = Class.new(StandardError)
+    WrongExpectedEventVersion = Class.new(StandardError)
 
     def publish(stream:, events:, expected_version: nil)
       connection.publish(stream: stream, events: events, expected_version: expected_version)
+    rescue StoreAdapter::Api::Client::WrongExpectedEventVersion => e
+      raise WrongExpectedEventVersion.new(e.message)
     end
 
     def read(stream, direction: 'forward', start: 0, all: false)
@@ -61,12 +64,15 @@ module EventStoreClient
       nil
     end
 
-    def link_to(stream:, events:)
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def link_to(stream:, events:, expected_version: nil)
       raise ArgumentError if !stream || stream == ''
       raise ArgumentError if events.nil? || (events.is_a?(Array) && events.empty?)
-
-      connection.link_to(stream, events)
+      connection.link_to(stream, events, expected_version: expected_version)
+    rescue StoreAdapter::Api::Client::WrongExpectedEventVersion => e
+      raise WrongExpectedEventVersion.new(e.message)
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     attr_accessor :connection, :service_name
 

data/lib/event_store_client/connection.rb

@@ -43,8 +43,8 @@ module EventStoreClient
       events
     end
 
-    def link_to(stream, events)
-      client.link_to(stream, events)
+    def link_to(stream, events, expected_version: nil)
+      client.link_to(stream, events, expected_version: expected_version)
 
       true
     end

data/lib/event_store_client/event.rb

@@ -6,8 +6,7 @@ require 'json'
 
 module EventStoreClient
   class Event < Dry::Struct
-    attr_reader :id
-
+    attribute :id, Types::Strict::String.optional.default(nil)
     attribute :type, Types::Strict::String
     attribute :title, Types::Strict::String.optional.default(nil)
     attribute :data, Types::Strict::String.default('{}')
@@ -16,7 +15,7 @@ module EventStoreClient
     private
 
     def initialize(**args)
-      @id = SecureRandom.uuid
+      id = args[:id] || SecureRandom.uuid
       hash_meta = JSON.parse(args[:metadata] || '{}')
       hash_meta['created_at'] ||= Time.now
       args[:metadata] = JSON.generate(hash_meta)

data/lib/event_store_client/store_adapter/api/client.rb

@@ -4,14 +4,17 @@ module EventStoreClient
   module StoreAdapter
     module Api
       class Client
+        WrongExpectedEventVersion = Class.new(StandardError)
+
         def append_to_stream(stream_name, events, expected_version: nil)
           headers = {
-            'ES-ExpectedVersion' => expected_version.to_s
-          }.reject { |_key, val| val.empty? }
+            'ES-ExpectedVersion' => expected_version&.to_s
+          }.reject { |_key, val| val.nil? || val.empty? }
 
           data = build_events_data(events)
-
-          make_request(:post, "/streams/#{stream_name}", body: data, headers: headers)
+          response = make_request(:post, "/streams/#{stream_name}", body: data, headers: headers)
+          validate_response(response, expected_version)
+          response
         end
 
         def delete_stream(stream_name, hard_delete)
@@ -69,14 +72,20 @@ module EventStoreClient
           )
         end
 
-        def link_to(stream_name, events)
+        def link_to(stream_name, events, expected_version: nil)
           data = build_linkig_data(events)
+          headers = {
+            'ES-ExpectedVersion' => expected_version&.to_s
+          }.reject { |_key, val| val.nil? || val.empty? }
 
-          make_request(
+          response = make_request(
             :post,
             "/streams/#{stream_name}",
-            body: data
+            body: data,
+            headers: headers
           )
+          validate_response(response, expected_version)
+          response
         end
 
         def ack(url)
@@ -125,6 +134,14 @@ module EventStoreClient
         def connection
           @connection ||= Api::Connection.new(endpoint).call
         end
+
+        def validate_response(resp, expected_version)
+          return unless resp.status == 400 && resp.reason_phrase == 'Wrong expected EventNumber'
+          raise WrongExpectedEventVersion.new(
+            "current version: #{resp.headers.fetch('es-currentversion')} | "\
+            "expected: #{expected_version}"
+          )
+        end
       end
     end
   end

data/lib/event_store_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventStoreClient
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema