Commanded 1.4.0 Part 1 (#2)

* Fix error return in add_stream * Rename concurrency option to be compatible with Commanded 1.4
fabriziosestito · Jul 6, 2022 · 6178702 · 6178702
1 parent c71e9df
commit 6178702
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/commanded/event_store/adapters/spear/subscription.ex b/lib/commanded/event_store/adapters/spear/subscription.ex
@@ -20,7 +20,7 @@ defmodule Commanded.EventStore.Adapters.Spear.Subscription do
     :serializer,
     :stream,
     :start_from,
-    :subscriber_max_count,
+    :concurrency_limit,
     :subscriber,
     :subscriber_ref,
     :subscription,
@@ -38,7 +38,7 @@ defmodule Commanded.EventStore.Adapters.Spear.Subscription do
       serializer: serializer,
       subscriber: subscriber,
       start_from: Keyword.get(opts, :start_from),
-      subscriber_max_count: Keyword.get(opts, :subscriber_max_count, 1),
+      concurrency_limit: Keyword.get(opts, :concurrency_limit, 1),
       retry_interval: subscription_retry_interval()
     }
 
@@ -168,11 +168,11 @@ defmodule Commanded.EventStore.Adapters.Spear.Subscription do
       name: name,
       stream: stream,
       start_from: start_from,
-      subscriber_max_count: subscriber_max_count
+      concurrency_limit: concurrency_limit
     } = state
 
     settings = %Spear.PersistentSubscription.Settings{
-      max_subscriber_count: subscriber_max_count,
+      max_subscriber_count: concurrency_limit,
       message_timeout: 10_000,
       resolve_links?: true
     }

diff --git a/lib/commanded/event_store/adapters/spear/subscriptions_supervisor.ex b/lib/commanded/event_store/adapters/spear/subscriptions_supervisor.ex
@@ -47,11 +47,11 @@ defmodule Commanded.EventStore.Adapters.Spear.SubscriptionsSupervisor do
         {:ok, pid}
 
       {:error, {:already_started, _pid}} ->
-        case Keyword.get(opts, :subscriber_max_count) do
+        case Keyword.get(opts, :concurrency_limit) do
           nil ->
             {:error, :subscription_already_exists}
 
-          subscriber_max_count when index < subscriber_max_count - 1 ->
+          concurrency_limit when index < concurrency_limit - 1 ->
             start_subscription(
               event_store,
               conn,

diff --git a/lib/commanded/event_store/spear.ex b/lib/commanded/event_store/spear.ex
@@ -216,8 +216,8 @@ defmodule Commanded.EventStore.Adapters.Spear do
       {:ok, _events} ->
         add_to_stream(adapter_meta, stream, :any_version, events)
 
-      {:error, :stream_not_found} ->
-        {:error, :stream_does_not_exist}
+      err ->
+        err
     end
   end
 
@@ -240,7 +240,7 @@ defmodule Commanded.EventStore.Adapters.Spear do
 
         case expected_version do
           :no_stream -> {:error, :stream_exists}
-          :stream_exists -> {:error, :stream_does_not_exist}
+          :stream_exists -> {:error, :stream_not_found}
           _expected_version -> {:error, :wrong_expected_version}
         end