Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
fail-fast: false
matrix:
include:
- elixir: 1.18.x
- elixir: 1.19.x
otp: 27

steps:
Expand Down
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
elixir 1.19-otp-27
Comment thread
yordis marked this conversation as resolved.
Resolved
erlang 27.3.2
2 changes: 1 addition & 1 deletion lib/commanded/aggregates/aggregate.ex
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ defmodule Commanded.Aggregates.Aggregate do
# be taken. When it finishes, it will set the timeout.
{:reply, formatted_reply, state}
else
state = %Aggregate{state | lifespan_timeout: lifespan_timeout}
state = %{state | lifespan_timeout: lifespan_timeout}

reply_with_lifespan(formatted_reply, state)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/commanded/aggregates/aggregate_state_builder.ex
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ defmodule Commanded.Aggregates.AggregateStateBuilder do
%RecordedEvent{data: data, stream_version: stream_version} = event
%Aggregate{aggregate_module: aggregate_module, aggregate_state: aggregate_state} = state

state = %Aggregate{
state = %{
state
| aggregate_version: stream_version,
aggregate_state: aggregate_module.apply(aggregate_state, data)
Expand Down
19 changes: 10 additions & 9 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,24 @@ defmodule Commanded.Mixfile do
start_permanent: Mix.env() == :prod,
consolidate_protocols: Mix.env() == :prod,
dialyzer: dialyzer(),
source_url: @source_url,
preferred_cli_env: preferred_cli_env()
source_url: @source_url
]
end

def application do
def cli do
[
extra_applications: extra_applications(Mix.env()),
mod: {Commanded, []}
preferred_envs: [
setup: :test,
reset: :test,
"test.all": :test
]
]
end

defp preferred_cli_env do
Comment thread
yordis marked this conversation as resolved.
Resolved
def application do
[
setup: :test,
reset: :test,
"test.all": :test
extra_applications: extra_applications(Mix.env()),
mod: {Commanded, []}
]
end

Expand Down
7 changes: 2 additions & 5 deletions test/aggregates/aggregate_subscription_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,9 @@ defmodule Commanded.Aggregates.AggregateSubscriptionTest do
events =
EventStore.stream_forward(DefaultApp, account_number)
|> Enum.to_list()
|> Enum.map(fn recorded_event ->
|> Enum.map(fn %EventStore.RecordedEvent{} = recorded_event ->
# specify invalid stream version
%EventStore.RecordedEvent{
recorded_event
| stream_version: 999
}
%{recorded_event | stream_version: 999}
end)

# send invalid events, should stop the aggregate process
Expand Down
4 changes: 2 additions & 2 deletions test/event/support/error/error_event_handler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ defmodule Commanded.Event.ErrorEventHandler do
def error(
{:error, :failed},
%ErrorEvent{strategy: "retry_failure_context"} = event,
failure_context
%FailureContext{} = failure_context
) do
%ErrorEvent{delay: delay, reply_to: reply_to} = event
%FailureContext{context: context} = failure_context
Expand All @@ -78,7 +78,7 @@ defmodule Commanded.Event.ErrorEventHandler do
|> Map.put(:delay, delay)

# Record failure count in context map
failure_context = %FailureContext{failure_context | context: context}
failure_context = %{failure_context | context: context}

if Map.get(context, :failures) >= 3 do
# Stop error handler after third failure
Expand Down
Loading