Skip to content

Commit

Permalink
Next set of alignments with Marten V4 Event Sourcing changes
Browse files Browse the repository at this point in the history
  • Loading branch information
oskardudycz committed Mar 13, 2021
1 parent 47a25b9 commit 3307a6d
Show file tree
Hide file tree
Showing 57 changed files with 104 additions and 256 deletions.
2 changes: 1 addition & 1 deletion CQRS.Tests/CQRS.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
Expand Down
14 changes: 0 additions & 14 deletions Core.Marten/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,6 @@ public static IServiceCollection AddMarten(this IServiceCollection services, ICo
SetStoreOptions(options, martenConfig, configureOptions);
})
.InitializeStore();
// .AddSingleton<IDocumentStore>(sp =>
// {
// var documentStore =
// DocumentStore.For(options => SetStoreOptions(options, martenConfig, configureOptions));
//
// if (martenConfig.ShouldRecreateDatabase)
// documentStore.Advanced.Clean.CompletelyRemoveAll();
//
// documentStore.Schema.ApplyAllConfiguredChangesToDatabase();
//
// return documentStore;
// })
// .AddScoped(sp => sp.GetRequiredService<IDocumentStore>().OpenSession())
// .AddScoped<IQuerySession>(sp => sp.GetRequiredService<IDocumentSession>());

if (martenConfig.ShouldRecreateDatabase)
documentStore.Advanced.Clean.CompletelyRemoveAll();
Expand Down
2 changes: 1 addition & 1 deletion Core.Marten/Core.Marten.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="3.0.1" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion Core.Tests/Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void Apply(IssueRemoved @event)
[Fact]
public void GivenStreamOfEvents_WhenAggregateStreamIsCalled_ThenChangesAreAppliedProperly()
{
var streamId = EventStore.StartStream<IssuesList>().Id;
var streamId = Guid.NewGuid();

//1. First Issue Was Created
var issue1Id = Guid.NewGuid();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,10 @@ public void Given_When_Then()
//9. Check if next event would be properly applied to inline aggregation
session.Events.Append(taskId, new IssueUpdated { IssueId = taskId, Description = "Completely New text" });
session.SaveChanges();
}

using (var session = CreateSessionWithInlineAggregationFor<NewVersion.Issue>())
{
var taskFromV2NewInlineAggregation = session.Load<NewVersion.Issue>(taskId);
taskFromV2NewInlineAggregation.Description.Should().Be.EqualTo("New Logic: Completely New text");
}
Expand Down
2 changes: 1 addition & 1 deletion Marten.Integration.Tests/Marten.Integration.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
Expand Down
2 changes: 1 addition & 1 deletion MediatR.Tests/MediatR.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public CreateClientTests()
}

[Fact]
public async Task IssueFlowTests()
public async Task ClientFlowTests()
{
// prepare command
var command = new CreateClient(
Expand Down Expand Up @@ -60,4 +60,4 @@ public async Task IssueFlowTests()
clientView.Name.Should().Be(command.Data.Name);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,28 @@ namespace EventSourcing.Sample.Transactions.Views.Accounts.AccountSummary
public class AccountSummaryView
{
public Guid Id { get; set; }

public Guid AccountId { get; set; }
public Guid ClientId { get; set; }
public string ClientName { get; set; }
public string Number { get; set; }
public decimal Balance { get; set; }
public int TransactionsCount { get; set; }
public bool IsDeleted { get; set; }

public void ApplyEvent(NewAccountCreated @event)
public void Apply(NewAccountCreated @event)
{
Id = @event.AccountId;
AccountId = @event.AccountId;
Balance = 0;
ClientId = @event.ClientId;
Number = @event.Number;
TransactionsCount = 0;
}

public void ApplyEvent(NewInflowRecorded @event)
public void Apply(NewInflowRecorded @event)
{
Balance += @event.Inflow.Amount;
}

internal void ApplyEvent(ClientCreated @event)
{
ClientName = @event.Data.Name;
}

internal void ApplyEvent(ClientUpdated @event)
{
ClientName = @event.Data.Name;
}

internal void ApplyEvent(ClientDeleted @event)
{
IsDeleted = false;
}

public void ApplyEvent(NewOutflowRecorded @event)
public void Apply(NewOutflowRecorded @event)
{
Balance -= @event.Outflow.Amount;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,15 @@ namespace EventSourcing.Sample.Transactions.Views.Accounts.AccountSummary
{
public class AccountSummaryViewProjection: ViewProjection<AccountSummaryView, Guid>
{
// public AccountSummaryViewProjection()
// {
// ProjectEvent<NewAccountCreated>((ev) => ev.AccountId, (view, @event) => view.ApplyEvent(@event));
// ProjectEvent<NewInflowRecorded>((ev) => ev.ToAccountId, (view, @event) => view.ApplyEvent(@event));
// ProjectEvent<NewOutflowRecorded>((ev) => ev.FromAccountId, (view, @event) => view.ApplyEvent(@event));
// ProjectEvent((IDocumentSession session, ClientCreated @event) => FindClientAccountIds(session, @event), (view, @event) => view.ApplyEvent(@event));
// ProjectEvent((IDocumentSession session, ClientUpdated @event) => FindClientAccountIds(session, @event), (view, @event) => view.ApplyEvent(@event));
// ProjectEvent((IDocumentSession session, ClientDeleted @event) => FindClientAccountIds(session, @event), (view, @event) => view.ApplyEvent(@event));
// }
//
// private List<Guid> FindClientAccountIds(IDocumentSession session, ClientCreated @event)
// {
// return FindClientAccountIds(session, @event.ClientId);
// }
//
// private List<Guid> FindClientAccountIds(IDocumentSession session, ClientUpdated @event)
// {
// return FindClientAccountIds(session, @event.ClientId);
// }
//
// private List<Guid> FindClientAccountIds(IDocumentSession session, ClientDeleted @event)
// {
// return FindClientAccountIds(session, @event.ClientId);
// }
//
// private List<Guid> FindClientAccountIds(IDocumentSession session, Guid clientId)
// {
// return session.Query<AccountSummaryView>()
// .Where(a => a.ClientId == clientId)
// .Select(a => a.AccountId)
// .ToList();
// }
public AccountSummaryViewProjection()
{
Identity<NewAccountCreated>(ev => ev.AccountId);
Identity<NewInflowRecorded>(ev => ev.ToAccountId);
Identity<NewOutflowRecorded>(ev => ev.FromAccountId);

ProjectEvent<NewAccountCreated>((view, @event) => view.Apply(@event));
ProjectEvent<NewInflowRecorded>((view, @event) => view.Apply(@event));
ProjectEvent<NewOutflowRecorded>((view, @event) => view.Apply(@event));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public User(Guid id, string name)
// For deserialization
private User() { }

private void Apply(UserCreated @event)
public void Apply(UserCreated @event)
{
Id = @event.UserId;
Name = @event.UserName;
}

private void Apply(UserNameUpdated @event)
public void Apply(UserNameUpdated @event)
{
Name = @event.UserName;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public User(Guid id, string name)
// For deserialization
private User() { }

private void Apply(UserCreated @event)
public void Apply(UserCreated @event)
{
Id = @event.UserId;
Name = @event.UserName;
}

private void Apply(UserNameUpdated @event)
public void Apply(UserNameUpdated @event)
{
Name = @event.UserName;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.7" />
<PackageReference Include="Marten" Version="4.0.0-alpha.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Marten" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ public void ChangeName(string name)
Apply(@event);
}

private void Apply(UserCreated @event)
public void Apply(UserCreated @event)
{
Id = @event.UserId;
Name = @event.UserName;
}

private void Apply(UserNameUpdated @event)
public void Apply(UserNameUpdated @event)
{
Name = @event.UserName;
}
Expand Down
Loading

0 comments on commit 3307a6d

Please sign in to comment.