Skip to content

Commit

Permalink
Update samples to 0.6.0-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomas Lycken committed Dec 5, 2017
1 parent ee14a56 commit 21777e9
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 40 deletions.
8 changes: 4 additions & 4 deletions ...NET WebApi 2 with EF 6/EventSourcing.PoC.Application/EventSourcing.PoC.Application.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
<Reference Include="Nito.Disposables, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
</Reference>
<Reference Include="RdbmsEventStore, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.0.5.0\lib\net461\RdbmsEventStore.dll</HintPath>
<Reference Include="RdbmsEventStore, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.0.6.0-beta0001.222\lib\net461\RdbmsEventStore.dll</HintPath>
</Reference>
<Reference Include="RdbmsEventStore.EntityFramework, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.EntityFramework.0.5.0\lib\net461\RdbmsEventStore.EntityFramework.dll</HintPath>
<Reference Include="RdbmsEventStore.EntityFramework, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.EntityFramework.0.6.0-beta0001.222\lib\net461\RdbmsEventStore.EntityFramework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand Down
9 changes: 5 additions & 4 deletions ...T WebApi 2 with EF 6/EventSourcing.PoC.Application/Messaging/LatestMessageQueryHandler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using EventSourcing.PoC.Application.Events;
using MediatR;
using RdbmsEventStore;

namespace EventSourcing.PoC.Application.Messaging
{
public class LatestMessageQueryHandler : IAsyncRequestHandler<LatestMessageQuery, string>
public class LatestMessageQueryHandler : IRequestHandler<LatestMessageQuery, string>
{
private readonly IEventStream<string, Event, IEventMetadata<string>> _eventStream;
private readonly IEventStore<string, Event, IEventMetadata<string>> _eventStream;

public LatestMessageQueryHandler(IEventStream<string, Event, IEventMetadata<string>> eventStream)
public LatestMessageQueryHandler(IEventStore<string, Event, IEventMetadata<string>> eventStream)
{
_eventStream = eventStream;
}

public async Task<string> Handle(LatestMessageQuery _)
public async Task<string> Handle(LatestMessageQuery _, CancellationToken token)
{
var events = await _eventStream.Events("1");
var message = events.Aggregate("", (current, evt) =>
Expand Down
4 changes: 1 addition & 3 deletions .../ASP.NET WebApi 2 with EF 6/EventSourcing.PoC.Application/Messaging/PostMessageCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ namespace EventSourcing.PoC.Application.Messaging
{
public class PostMessageCommand : IRequest
{
public PostMessageCommand(string message, long currentVersion)
public PostMessageCommand(string message)
{
Message = message;
CurrentVersion = currentVersion;
}

public string Message { get; }
public long CurrentVersion { get; }
}
}
29 changes: 22 additions & 7 deletions ...T WebApi 2 with EF 6/EventSourcing.PoC.Application/Messaging/PostMessageCommandHandler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,38 @@
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using EventSourcing.PoC.Application.Events;
using MediatR;
using RdbmsEventStore;

namespace EventSourcing.PoC.Application.Messaging
{
public class PostMessageCommandHandler : IAsyncRequestHandler<PostMessageCommand>
public class PostMessageCommandHandler : IRequestHandler<PostMessageCommand>
{
private readonly IEventStream<string, Event, IEventMetadata<string>> _eventWriter;
private readonly IEventStore<string, Event, IEventMetadata<string>> _eventWriter;

public PostMessageCommandHandler(IEventStream<string, Event, IEventMetadata<string>> eventWriter)
public PostMessageCommandHandler(IEventStore<string, Event, IEventMetadata<string>> eventWriter)
{
_eventWriter = eventWriter;
}

public Task Handle(PostMessageCommand command)
=> !string.IsNullOrWhiteSpace(command.Message)
? _eventWriter.Append("1", command.CurrentVersion, new MessagePostedEvent { Message = command.Message })
: throw new ArgumentException("Posting empty messages is not allowed");
public async Task Handle(PostMessageCommand command, CancellationToken token)
{
if (string.IsNullOrWhiteSpace(command.Message))
{
throw new ArgumentException("Posting empty messages is not allowed");
}

var currentVersion = (await _eventWriter.Events("1")).Select(e => e.Timestamp)
.DefaultIfEmpty(DateTimeOffset.MinValue)
.Max() as DateTimeOffset?;

if (currentVersion == DateTimeOffset.MinValue)
{
currentVersion = null;
}
await _eventWriter.Append("1", currentVersion, new MessagePostedEvent {Message = command.Message});
}
}
}
4 changes: 2 additions & 2 deletions samples/ASP.NET WebApi 2 with EF 6/EventSourcing.PoC.Application/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net462" />
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net462" />
<package id="Nito.Disposables" version="1.2.3" targetFramework="net462" />
<package id="RdbmsEventStore" version="0.5.0" targetFramework="net462" />
<package id="RdbmsEventStore.EntityFramework" version="0.5.0" targetFramework="net462" />
<package id="RdbmsEventStore" version="0.6.0-beta0001.222" targetFramework="net462" />
<package id="RdbmsEventStore.EntityFramework" version="0.6.0-beta0001.222" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net462" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
<package id="tlycken.Extensions" version="0.6.0" targetFramework="net462" />
Expand Down
8 changes: 4 additions & 4 deletions ...NET WebApi 2 with EF 6/EventSourcing.PoC.Persistence/EventSourcing.PoC.Persistence.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
<Reference Include="Nito.Disposables, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.Disposables.1.2.3\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
</Reference>
<Reference Include="RdbmsEventStore, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.0.5.0\lib\net461\RdbmsEventStore.dll</HintPath>
<Reference Include="RdbmsEventStore, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.0.6.0-beta0001.222\lib\net461\RdbmsEventStore.dll</HintPath>
</Reference>
<Reference Include="RdbmsEventStore.EntityFramework, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.EntityFramework.0.5.0\lib\net461\RdbmsEventStore.EntityFramework.dll</HintPath>
<Reference Include="RdbmsEventStore.EntityFramework, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.EntityFramework.0.6.0-beta0001.222\lib\net461\RdbmsEventStore.EntityFramework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion samples/ASP.NET WebApi 2 with EF 6/EventSourcing.PoC.Persistence/EventsContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace EventSourcing.PoC.Persistence
{
public class EventsContext : EventStoreContext<Event>
public class EventsContext : EntityFrameworkEventStoreContext<Event>
{
public EventsContext() : base("name=EventSourcingPoC") { }
}
Expand Down
4 changes: 2 additions & 2 deletions samples/ASP.NET WebApi 2 with EF 6/EventSourcing.PoC.Persistence/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net462" />
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net462" />
<package id="Nito.Disposables" version="1.2.3" targetFramework="net462" />
<package id="RdbmsEventStore" version="0.5.0" targetFramework="net462" />
<package id="RdbmsEventStore.EntityFramework" version="0.5.0" targetFramework="net462" />
<package id="RdbmsEventStore" version="0.6.0-beta0001.222" targetFramework="net462" />
<package id="RdbmsEventStore.EntityFramework" version="0.6.0-beta0001.222" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net462" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
<package id="tlycken.Extensions" version="0.6.0" targetFramework="net462" />
Expand Down
2 changes: 1 addition & 1 deletion ...with EF 6/EventSourcing.PoC.Web/Configuration/ServiceRegistrations/EventSourcingModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class EventSourcingModule : Module
{
protected override void Load(ContainerBuilder builder)
{
builder.RegisterAssemblyTypes(typeof(IEventStream<,,>).GetTypeInfo().Assembly).AsImplementedInterfaces().SingleInstance();
builder.RegisterAssemblyTypes(typeof(IEventStore<,,>).GetTypeInfo().Assembly).AsImplementedInterfaces().SingleInstance();

builder.RegisterInstance(new TranslatingEventRegistry(
new Dictionary<string, string>
Expand Down
7 changes: 1 addition & 6 deletions ...Api 2 with EF 6/EventSourcing.PoC.Web/Configuration/ServiceRegistrations/MediatRModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@ protected override void Load(ContainerBuilder builder)
var mediatrOpenTypes = new[]
{
typeof(IRequestHandler<>),
typeof(IAsyncRequestHandler<>),
typeof(IRequestHandler<,>),
typeof(IAsyncRequestHandler<,>),
typeof(ICancellableAsyncRequestHandler<,>),
typeof(INotificationHandler<>),
typeof(IAsyncNotificationHandler<>),
typeof(ICancellableAsyncNotificationHandler<>)
typeof(INotificationHandler<>)
};

foreach (var markerType in _markerTypes)
Expand Down
8 changes: 4 additions & 4 deletions samples/ASP.NET WebApi 2 with EF 6/EventSourcing.PoC.Web/EventSourcing.PoC.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="RdbmsEventStore, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.0.5.0\lib\net461\RdbmsEventStore.dll</HintPath>
<Reference Include="RdbmsEventStore, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.0.6.0-beta0001.222\lib\net461\RdbmsEventStore.dll</HintPath>
</Reference>
<Reference Include="RdbmsEventStore.EntityFramework, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.EntityFramework.0.5.0\lib\net461\RdbmsEventStore.EntityFramework.dll</HintPath>
<Reference Include="RdbmsEventStore.EntityFramework, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RdbmsEventStore.EntityFramework.0.6.0-beta0001.222\lib\net461\RdbmsEventStore.EntityFramework.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions samples/ASP.NET WebApi 2 with EF 6/EventSourcing.PoC.Web/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net461" />
<package id="RdbmsEventStore" version="0.5.0" targetFramework="net462" />
<package id="RdbmsEventStore.EntityFramework" version="0.5.0" targetFramework="net462" />
<package id="RdbmsEventStore" version="0.6.0-beta0001.222" targetFramework="net462" />
<package id="RdbmsEventStore.EntityFramework" version="0.6.0-beta0001.222" targetFramework="net462" />
<package id="System.AppContext" version="4.3.0" targetFramework="net462" />
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
Expand Down

0 comments on commit 21777e9

Please sign in to comment.