Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't expose the version number #47

Merged
merged 1 commit into from
Dec 5, 2017
Merged

Don't expose the version number #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/RdbmsEventStore.EFCore.Tests/EventStoreTests/ExtraMetaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public ExtraMetaTests(ExtraMetaEventFactoryFixture fixture)
.Options;
_dbContext = new EFCoreEventStoreContext<string, ExtraMetaLongStringPersistedEventMetadata>(options);

var stream1 = _fixture.EventFactory.Create("stream-1", 0, new object[] {
var stream1 = _fixture.EventFactory.Create("stream-1", new object[] {
new FooEvent { Foo = "Foo" },
new BarEvent { Bar = "Bar" },
new FooEvent { Foo = "Baz" }
})
.Select(_fixture.EventSerializer.Serialize);
var stream2 = _fixture.EventFactory.Create("stream-2", 0, new object[] {
var stream2 = _fixture.EventFactory.Create("stream-2", new object[] {
new FooEvent { Foo = "Boo" },
new BarEvent { Bar = "Far" }
})
Expand Down Expand Up @@ -89,9 +89,9 @@ public class ExtraMetaEventFactory : DefaultEventFactory<string, ExtraMetaString
{
private int _total;

protected override ExtraMetaStringEvent CreateSingle(string streamId, long version, object payload)
protected override ExtraMetaStringEvent CreateSingle(string streamId, object payload)
{
var @event = base.CreateSingle(streamId, version, payload);
var @event = base.CreateSingle(streamId, payload);
@event.ExtraMeta = $"{payload.GetType().Name}-{_total++}";
return @event;
}
Expand Down
44 changes: 28 additions & 16 deletions src/RdbmsEventStore.EFCore.Tests/EventStoreTests/QueryEventsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using RdbmsEventStore.EFCore.Tests.Infrastructure;
using RdbmsEventStore.EFCore.Tests.TestData;
using Xunit;
Expand All @@ -10,23 +12,24 @@ public class QueryEventsTests : EventStoreTestBase<long, string, StringEvent, IE
{
public QueryEventsTests(EventStoreFixture<long, string, StringEvent, IEventMetadata<string>, LongStringPersistedEvent> fixture) : base(fixture)
{
var stream1 = _fixture.EventFactory.Create("stream-1", 0, new object[] {
new FooEvent { Foo = "Foo" },
new BarEvent { Bar = "Bar" },
new FooEvent { Foo = "Baz" }
})
.Select(_fixture.EventSerializer.Serialize);
var stream2 = _fixture.EventFactory.Create("stream-2", 0, new object[] {
new FooEvent { Foo = "Boo" },
new BarEvent { Bar = "Far" }
})
.Select(_fixture.EventSerializer.Serialize);
AddEvents("stream-1", new FooEvent { Foo = "Foo" });
Thread.Sleep(10); // to make timestamps differ between the first and the rest
AddEvents("stream-1", new BarEvent { Bar = "Bar" }, new FooEvent { Foo = "Baz" });
AddEvents("stream-2", new FooEvent { Foo = "Boo" });
Thread.Sleep(10);
AddEvents("stream-2", new BarEvent { Bar = "Far" });

_dbContext.Events.AddRange(stream1);
_dbContext.Events.AddRange(stream2);
_dbContext.SaveChanges();
}

private void AddEvents(string streamId, params object[] payloads)
{
var events = _fixture.EventFactory.Create(streamId, payloads)
.Select(_fixture.EventSerializer.Serialize)
.VersionedPerTimestamp<LongStringPersistedEvent, string>();
_dbContext.Events.AddRange(events);
}

[Theory]
[InlineData("stream-1", 3)]
[InlineData("stream-2", 2)]
Expand All @@ -42,8 +45,13 @@ public async Task ReturnsEventsFromCorrectStreamOnly(string streamId, long expec
[InlineData("stream-2", 1)]
public async Task ReturnsEventsAccordingToQuery(string streamId, long expectedCount)
{
var firstEventTimestamp = await _dbContext.Events
.Where(e => e.StreamId == streamId)
.Select(e => e.Timestamp)
.FirstAsync();

var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
var events = await store.Events(streamId, es => es.Where(e => e.Version > 1));
var events = await store.Events(streamId, es => es.Where(e => e.Timestamp > firstEventTimestamp));
Assert.Equal(expectedCount, events.Count());
}

Expand All @@ -58,9 +66,13 @@ public async Task ReturnsAllEvents()
[Fact]
public async Task ReturnsAllEventsAccordingToQuery()
{
var firstEventTimestamp = await _dbContext.Events
.Select(e => e.Timestamp)
.FirstAsync();

var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
var events = await store.Events(es => es.Where(e => e.Version > 1));
Assert.Equal(3, events.Count());
var events = await store.Events(es => es.Where(e => e.Timestamp > firstEventTimestamp));
Assert.Equal(4, events.Count());
}
}
}
21 changes: 10 additions & 11 deletions src/RdbmsEventStore.EFCore.Tests/EventStoreTests/WriteEventTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public WriteEventTests(EventStoreFixture<Guid, Guid, GuidEvent, IEventMetadata<G
public async Task CommittingEventStoresEventInContext()
{
var store = _fixture.BuildEventStore(_dbContext);
await store.Append(Guid.NewGuid(), 0, new[] { new FooEvent { Foo = "Bar" } });
await store.Append(Guid.NewGuid(), null, new[] { new FooEvent { Foo = "Bar" } });
Assert.Equal(1, await _dbContext.Events.CountAsync());
}

Expand All @@ -28,10 +28,10 @@ public async Task CommittingWithOutOfSyncDataThrowsConflictException()
{
var store = _fixture.BuildEventStore(_dbContext);
var stream = Guid.NewGuid();
_dbContext.Events.AddRange(_fixture.EventFactory.Create(stream, 0, new[] { new FooEvent { Foo = "Bar" } }).Select(_fixture.EventSerializer.Serialize));
_dbContext.Events.AddRange(_fixture.EventFactory.Create(stream, new[] { new FooEvent { Foo = "Bar" } }).Select(_fixture.EventSerializer.Serialize));
await _dbContext.SaveChangesAsync();

await Assert.ThrowsAsync<ConflictException>(() => store.Append(stream, 0, new[] { new FooEvent { Foo = "Qux" } }));
await Assert.ThrowsAsync<ConflictException>(() => store.Append(stream, null, new[] { new FooEvent { Foo = "Qux" } }));
}

[Fact]
Expand All @@ -44,7 +44,7 @@ public async Task CommittingNoEventsExitsEarly() {
var store = _fixture.BuildEventStore(context.Object);

try {
await store.Append(stream, 0, new object[] { });
await store.Append(stream, null, new object[] { });
} catch (NotImplementedException) {
// Thrown by the mock DbSet if we try to query for existing events
// This indicates that we didn't exit early
Expand All @@ -61,7 +61,7 @@ public async Task CommittingMultipleEventsStoresAllEventsInContext()
var store = _fixture.BuildEventStore(_dbContext);

var events = new[] { new FooEvent { Foo = "Foo" }, new FooEvent { Foo = "Bar" } };
await store.Append(Guid.NewGuid(), 0, events);
await store.Append(Guid.NewGuid(), null, events);

Assert.Equal(2, await _dbContext.Events.CountAsync());
}
Expand All @@ -74,7 +74,7 @@ public async Task CommittingMultipleEventsStoresEventsInOrder()
var store = _fixture.BuildEventStore(_dbContext);

var events = new object[] { new FooEvent { Foo = "Foo" }, new BarEvent { Bar = "Bar" } };
await store.Append(Guid.NewGuid(), 0, events);
await store.Append(Guid.NewGuid(), null, events);

Assert.Collection(await _dbContext.Events.OrderBy(e => e.Version).ToListAsync(),
foo => Assert.Equal(typeof(FooEvent), _fixture.EventRegistry.TypeFor(foo.Type)),
Expand All @@ -88,12 +88,11 @@ public async Task CommittingMultipleEventsIncrementsVersionForEachEvent()

var store = _fixture.BuildEventStore(_dbContext);
var events = new object[] { new FooEvent { Foo = "Foo" }, new BarEvent { Bar = "Bar" } };
await store.Append(Guid.NewGuid(), 0, events);
await store.Append(Guid.NewGuid(), null, events);

var storedEvents = await _dbContext.Events.OrderBy(e => e.Timestamp).ToListAsync();
Assert.Collection(storedEvents,
foo => Assert.Equal(1, foo.Version),
bar => Assert.Equal(2, bar.Version));
Assert.Collection(await _dbContext.Events.OrderBy(e => e.Timestamp).ToListAsync(),
foo => Assert.Equal(typeof(FooEvent), _fixture.EventRegistry.TypeFor(foo.Type)),
bar => Assert.Equal(typeof(BarEvent), _fixture.EventRegistry.TypeFor(bar.Type)));
}
}
}
2 changes: 1 addition & 1 deletion src/RdbmsEventStore.EFCore.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public async Task CanCommitEventsToStoreWithDefaultImplementations()
{
var store = _fixture.BuildEventStore(_dbContext);

await store.Append(1, 0, new[] { new FooEvent { Foo = "Bar" } });
await store.Append(1, null, new[] { new FooEvent { Foo = "Bar" } });
}

[Fact]
Expand Down
17 changes: 12 additions & 5 deletions src/RdbmsEventStore.EFCore/EFCoreEventStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public async Task<IEnumerable<TEvent>> Events(Func<IQueryable<TEventMetadata>, I
return events;
}

public async Task Append(TStreamId streamId, long versionBefore, IEnumerable<object> payloads)
public async Task Append(TStreamId streamId, DateTimeOffset? versionBefore, IEnumerable<object> payloads)
{
if (!payloads.Any())
{
Expand All @@ -55,16 +55,23 @@ public async Task Append(TStreamId streamId, long versionBefore, IEnumerable<obj
{
var highestVersionNumber = await _dbContext.Events
.Where(e => e.StreamId.Equals(streamId))
.Select(e => e.Version)
.DefaultIfEmpty(0)
.MaxAsync();
.Select(e => e.Timestamp)
.DefaultIfEmpty(DateTimeOffset.MinValue)
.MaxAsync() as DateTimeOffset?;

if (highestVersionNumber == DateTimeOffset.MinValue)
{
highestVersionNumber = null;
}

if (highestVersionNumber != versionBefore)
{
throw new ConflictException(streamId, versionBefore, highestVersionNumber, payloads);
}

var events = _eventFactory.Create(streamId, versionBefore, payloads).Select(_eventSerializer.Serialize);
var events = _eventFactory.Create(streamId, payloads)
.Select(_eventSerializer.Serialize)
.VersionedPerTimestamp<TPersistedEvent, TStreamId>();
_dbContext.Events.AddRange(events);
await _dbContext.SaveChangesAsync();
}
Expand Down
11 changes: 6 additions & 5 deletions src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/ExtraMetaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using System;
using System.Linq;
using System.Threading.Tasks;
using RdbmsEventStore.EntityFramework.Tests.Infrastructure;
using RdbmsEventStore.EntityFramework.Tests.TestData;
Expand All @@ -21,13 +22,13 @@ public ExtraMetaTests(ExtraMetaEventFactoryFixture fixture, AssemblyInitializerF
_fixture = fixture;
_dbContext = new EntityFrameworkEventStoreContext<ExtraMetaLongStringPersistedEventMetadata>();

var stream1 = _fixture.EventFactory.Create("stream-1", 0, new object[] {
var stream1 = _fixture.EventFactory.Create("stream-1", new object[] {
new FooEvent { Foo = "Foo" },
new BarEvent { Bar = "Bar" },
new FooEvent { Foo = "Baz" }
})
.Select(_fixture.EventSerializer.Serialize);
var stream2 = _fixture.EventFactory.Create("stream-2", 0, new object[] {
var stream2 = _fixture.EventFactory.Create("stream-2", new object[] {
new FooEvent { Foo = "Boo" },
new BarEvent { Bar = "Far" }
})
Expand Down Expand Up @@ -87,9 +88,9 @@ public class ExtraMetaEventFactory : DefaultEventFactory<string, ExtraMetaString
{
private int _total;

protected override ExtraMetaStringEvent CreateSingle(string streamId, long version, object payload)
protected override ExtraMetaStringEvent CreateSingle(string streamId, object payload)
{
var @event = base.CreateSingle(streamId, version, payload);
var @event = base.CreateSingle(streamId, payload);
@event.ExtraMeta = $"{payload.GetType().Name}-{_total++}";
return @event;
}
Expand Down
46 changes: 29 additions & 17 deletions src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/QueryEventsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Linq;
using System.Data.Entity;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using RdbmsEventStore.EntityFramework.Tests.Infrastructure;
using RdbmsEventStore.EntityFramework.Tests.TestData;
Expand All @@ -10,23 +12,24 @@ public class QueryEventsTests : EventStoreTestBase<long, string, StringEvent, IE
{
public QueryEventsTests(EventStoreFixture<long, string, StringEvent, IEventMetadata<string>, LongStringPersistedEvent> fixture, AssemblyInitializerFixture initializer) : base(fixture, initializer)
{
var stream1 = _fixture.EventFactory.Create("stream-1", 0, new object[] {
new FooEvent { Foo = "Foo" },
new BarEvent { Bar = "Bar" },
new FooEvent { Foo = "Baz" }
})
.Select(_fixture.EventSerializer.Serialize);
var stream2 = _fixture.EventFactory.Create("stream-2", 0, new object[] {
new FooEvent { Foo = "Boo" },
new BarEvent { Bar = "Far" }
})
.Select(_fixture.EventSerializer.Serialize);
AddEvents("stream-1", new FooEvent { Foo = "Foo" });
Thread.Sleep(10); // to make timestamps differ between the first and the rest
AddEvents("stream-1", new BarEvent { Bar = "Bar" }, new FooEvent { Foo = "Baz" });
AddEvents("stream-2", new FooEvent { Foo = "Boo" });
Thread.Sleep(10);
AddEvents("stream-2", new BarEvent { Bar = "Far" });

_dbContext.Events.AddRange(stream1);
_dbContext.Events.AddRange(stream2);
_dbContext.SaveChanges();
}

private void AddEvents(string streamId, params object[] payloads)
{
var events = _fixture.EventFactory.Create(streamId, payloads)
.Select(_fixture.EventSerializer.Serialize)
.VersionedPerTimestamp<LongStringPersistedEvent, string>();
_dbContext.Events.AddRange(events);
}

[Theory]
[InlineData("stream-1", 3)]
[InlineData("stream-2", 2)]
Expand All @@ -42,8 +45,13 @@ public async Task ReturnsEventsFromCorrectStreamOnly(string streamId, long expec
[InlineData("stream-2", 1)]
public async Task ReturnsEventsAccordingToQuery(string streamId, long expectedCount)
{
var firstEventTimestamp = await _dbContext.Events
.Where(e => e.StreamId == streamId)
.Select(e => e.Timestamp)
.FirstAsync();

var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
var events = await store.Events(streamId, es => es.Where(e => e.Version > 1));
var events = await store.Events(streamId, es => es.Where(e => e.Timestamp > firstEventTimestamp));
Assert.Equal(expectedCount, events.Count());
}

Expand All @@ -58,9 +66,13 @@ public async Task ReturnsAllEvents()
[Fact]
public async Task ReturnsAllEventsAccordingToQuery()
{
var firstEventTimestamp = await _dbContext.Events
.Select(e => e.Timestamp)
.FirstAsync();

var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
var events = await store.Events(es => es.Where(e => e.Version > 1));
Assert.Equal(3, events.Count());
var events = await store.Events(es => es.Where(e => e.Timestamp > firstEventTimestamp));
Assert.Equal(4, events.Count());
}
}
}
29 changes: 7 additions & 22 deletions src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/WriteEventTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public WriteEventTests(EventStoreFixture<Guid, Guid, GuidEvent, IEventMetadata<G
public async Task CommittingEventStoresEventInContext()
{
var store = _fixture.BuildEventStore(_dbContext);
await store.Append(Guid.NewGuid(), 0, new[] { new FooEvent { Foo = "Bar" } });
await store.Append(Guid.NewGuid(), null, new[] { new FooEvent { Foo = "Bar" } });
Assert.Equal(1, await _dbContext.Events.CountAsync());
}

Expand All @@ -29,10 +29,10 @@ public async Task CommittingWithOutOfSyncDataThrowsConflictException()
{
var store = _fixture.BuildEventStore(_dbContext);
var stream = Guid.NewGuid();
_dbContext.Events.AddRange(_fixture.EventFactory.Create(stream, 0, new[] { new FooEvent { Foo = "Bar" } }).Select(_fixture.EventSerializer.Serialize));
_dbContext.Events.AddRange(_fixture.EventFactory.Create(stream, new[] { new FooEvent { Foo = "Bar" } }).Select(_fixture.EventSerializer.Serialize));
await _dbContext.SaveChangesAsync();

await Assert.ThrowsAsync<ConflictException>(() => store.Append(stream, 0, new[] { new FooEvent { Foo = "Qux" } }));
await Assert.ThrowsAsync<ConflictException>(() => store.Append(stream, null, new[] { new FooEvent { Foo = "Qux" } }));
}

[Fact]
Expand All @@ -45,7 +45,7 @@ public async Task CommittingNoEventsExitsEarly() {
var store = _fixture.BuildEventStore(context.Object);

try {
await store.Append(stream, 0, new object[] { });
await store.Append(stream, null, new object[] { });
} catch (NotImplementedException) {
// Thrown by the mock DbSet if we try to query for existing events
// This indicates that we didn't exit early
Expand All @@ -62,7 +62,7 @@ public async Task CommittingMultipleEventsStoresAllEventsInContext()
var store = _fixture.BuildEventStore(_dbContext);

var events = new[] { new FooEvent { Foo = "Foo" }, new FooEvent { Foo = "Bar" } };
await store.Append(Guid.NewGuid(), 0, events);
await store.Append(Guid.NewGuid(), null, events);

Assert.Equal(2, await _dbContext.Events.CountAsync());
}
Expand All @@ -75,26 +75,11 @@ public async Task CommittingMultipleEventsStoresEventsInOrder()
var store = _fixture.BuildEventStore(_dbContext);

var events = new object[] { new FooEvent { Foo = "Foo" }, new BarEvent { Bar = "Bar" } };
await store.Append(Guid.NewGuid(), 0, events);
await store.Append(Guid.NewGuid(), null, events);

Assert.Collection(await _dbContext.Events.OrderBy(e => e.Version).ToListAsync(),
Assert.Collection(await _dbContext.Events.OrderBy(e => e.Timestamp).ToListAsync(),
foo => Assert.Equal(typeof(FooEvent), _fixture.EventRegistry.TypeFor(foo.Type)),
bar => Assert.Equal(typeof(BarEvent), _fixture.EventRegistry.TypeFor(bar.Type)));
}

[Fact]
public async Task CommittingMultipleEventsIncrementsVersionForEachEvent()
{
Assert.Empty(await _dbContext.Events.ToListAsync());

var store = _fixture.BuildEventStore(_dbContext);
var events = new object[] { new FooEvent { Foo = "Foo" }, new BarEvent { Bar = "Bar" } };
await store.Append(Guid.NewGuid(), 0, events);

var storedEvents = await _dbContext.Events.OrderBy(e => e.Timestamp).ToListAsync();
Assert.Collection(storedEvents,
foo => Assert.Equal(1, foo.Version),
bar => Assert.Equal(2, bar.Version));
}
}
}