Skip to content

Commit

Permalink
Fix build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SebastianStehle
SebastianStehle committed Jan 15, 2025
1 parent b63ed03 commit 63e2a6f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions events/Squidex.Events.EntityFramework/EFEventStore_Reader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public async Task<IReadOnlyList<StoredEvent>> QueryStreamAsync(string streamName

var result = Convert(commits, afterStreamPosition);

if ((commits.Count == 0 || commits[0].EventStreamOffset != afterStreamPosition) && afterStreamPosition > EtagVersion.Empty)
if ((commits.Count == 0 || commits[0].EventStreamOffset != afterStreamPosition) && afterStreamPosition > EventsVersion.Empty)
{
commits = await context.Set<EFEventCommit>()
.ByStream(StreamFilter.Name(streamName))
Expand Down Expand Up @@ -67,7 +67,7 @@ public async IAsyncEnumerable<StoredEvent> QueryAllReverseAsync(StreamFilter fil
var taken = 0;
foreach (var commit in query)
{
foreach (var @event in commit.Filtered(EtagVersion.Empty).Reverse())
foreach (var @event in commit.Filtered(EventsVersion.Empty).Reverse())
{
yield return @event;

Expand Down
2 changes: 1 addition & 1 deletion events/Squidex.Events.GetEventStore/GetEventStore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public async IAsyncEnumerable<StoredEvent> QueryAllReverseAsync(StreamFilter fil
}
}

public async Task<IReadOnlyList<StoredEvent>> QueryStreamAsync(string streamName, long afterStreamPosition = EtagVersion.Empty,
public async Task<IReadOnlyList<StoredEvent>> QueryStreamAsync(string streamName, long afterStreamPosition = EventsVersion.Empty,
CancellationToken ct = default)
{
var result = new List<StoredEvent>();
Expand Down
24 changes: 12 additions & 12 deletions events/Squidex.Events.Tests/EventStoreTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public async Task Should_throw_exception_for_version_mismatch_and_update()
CreateEventData(2)
};

await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit);

await Assert.ThrowsAsync<WrongEventVersionException>(() => sut.AppendAsync(Guid.NewGuid(), streamName, 0, commit));
}
Expand All @@ -99,8 +99,8 @@ public async Task Should_append_events()
CreateEventData(2)
};

await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit1, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit2, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit1, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit2, ct);

var readEvents1 = await sut.QueryStreamAsync(streamName, ct: ct);
var readEvents2 = await sut.QueryAllAsync(streamFilter, ct: ct).ToListAsync();
Expand Down Expand Up @@ -169,8 +169,8 @@ public async Task Should_return_no_result_if_queried_from_end()
CreateEventData(2)
};

await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit1, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit2, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit1, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit2, ct);

var readEvents = await sut.QueryAllAsync(streamFilter, StreamPosition.End, ct: ct).ToListAsync();

Expand All @@ -193,7 +193,7 @@ public async Task Should_subscribe_to_events()

var readEvents = await QueryWithSubscriptionAsync(sut, streamFilter, 1, async () =>
{
await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit1, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit1, ct);
});

var expected = new[]
Expand Down Expand Up @@ -222,7 +222,7 @@ public async Task Should_subscribe_to_next_events()
// Append and read in parallel.
await QueryWithSubscriptionAsync(sut, streamFilter, 1, async () =>
{
await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit1, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit1, ct);
});

var commit2 = new[]
Expand All @@ -234,7 +234,7 @@ await QueryWithSubscriptionAsync(sut, streamFilter, 1, async () =>
// Append and read in parallel.
var readEventsFromPosition = await QueryWithSubscriptionAsync(sut, streamFilter, 1, async () =>
{
await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit2, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit2, ct);
});

var expectedFromPosition = new[]
Expand Down Expand Up @@ -285,7 +285,7 @@ await Parallel.ForEachAsync(Enumerable.Range(0, numTasks), async (i, ct) =>
CreateEventData(i * j)
};

await sut.AppendAsync(Guid.NewGuid(), fullStreamName, EtagVersion.Any, commit, ct);
await sut.AppendAsync(Guid.NewGuid(), fullStreamName, EventsVersion.Any, commit, ct);
}
});
});
Expand Down Expand Up @@ -313,8 +313,8 @@ public async Task Should_read_multiple_streams()
CreateEventData(4)
};

await sut.AppendAsync(Guid.NewGuid(), streamName1, EtagVersion.Any, stream1Commit, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName2, EtagVersion.Any, stream2Commit, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName1, EventsVersion.Any, stream1Commit, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName2, EventsVersion.Any, stream2Commit, ct);

var readEvents = await sut.QueryAllAsync(StreamFilter.Name(streamName1, streamName2), ct: ct).ToListAsync();

Expand Down Expand Up @@ -585,7 +585,7 @@ private async Task<List<EventData>> AppendEventsAsync(IEventStore sut, string st
{
var commit = events.Skip(i * commits).Take(commits).ToArray();

await sut.AppendAsync(Guid.NewGuid(), streamName, EtagVersion.Any, commit, ct);
await sut.AppendAsync(Guid.NewGuid(), streamName, EventsVersion.Any, commit, ct);
}

return events;
Expand Down

0 comments on commit 63e2a6f

Please sign in to comment.