Simplify event store by re-using overloads

tomasaschan · Nov 1, 2017 · 9119b23 · 9119b23
1 parent b24d2c3
commit 9119b23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/EventStoreFixture.cs b/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/EventStoreFixture.cs
@@ -12,7 +12,7 @@ public class EventStoreFixture<TId, TStreamId, TEvent, TEventMetadata, TPersiste
         where TStreamId : IEquatable<TStreamId>
         where TEvent : class, TEventMetadata, IMutableEvent<TStreamId>, new()
         where TPersistedEvent : class, TEventMetadata, IPersistedEvent<TStreamId>, new()
-        where TEventMetadata : IEventMetadata<TStreamId>
+        where TEventMetadata : class, IEventMetadata<TStreamId>
     {
         public EventStoreFixture()
         {

diff --git a/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/EventStoreTestBase.cs b/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/EventStoreTestBase.cs
@@ -8,7 +8,7 @@ namespace RdbmsEventStore.EntityFramework.Tests.Infrastructure
     public class EventStoreTestBase<TId, TStreamId, TEvent, TEventMetadata, TPersistedEvent> : IClassFixture<EventStoreFixture<TId, TStreamId, TEvent, TEventMetadata, TPersistedEvent>>, IDisposable
         where TId : IEquatable<TId>
         where TStreamId : IEquatable<TStreamId>
-        where TEventMetadata : IEventMetadata<TStreamId>
+        where TEventMetadata : class, IEventMetadata<TStreamId>
         where TEvent : class, TEventMetadata, IMutableEvent<TStreamId>, new()
         where TPersistedEvent : class, TEventMetadata, IPersistedEvent<TStreamId>, new()
     {

diff --git a/src/RdbmsEventStore.EntityFramework/EntityFrameworkEventStore.cs b/src/RdbmsEventStore.EntityFramework/EntityFrameworkEventStore.cs
@@ -13,7 +13,7 @@ public class EntityFrameworkEventStore<TId, TStreamId, TContext, TEvent, TEventM
         where TContext : DbContext, IEventDbContext<TPersistedEvent>
         where TEvent : class, TEventMetadata, IMutableEvent<TStreamId>, new()
         where TPersistedEvent : class, IPersistedEvent<TStreamId>, TEventMetadata, new()
-        where TEventMetadata : IEventMetadata<TStreamId>
+        where TEventMetadata : class, IEventMetadata<TStreamId>
     {
         private readonly TContext context;
         private readonly IEventFactory<TStreamId, TEvent> _eventFactory;
@@ -47,21 +47,8 @@ public async Task<IEnumerable<TEvent>> Events(Func<IQueryable<TEventMetadata>, I
 
         public Task<IEnumerable<TEvent>> Events(TStreamId streamId) => Events(streamId, events => events);
 
-        public async Task<IEnumerable<TEvent>> Events(TStreamId streamId, Func<IQueryable<TEventMetadata>, IQueryable<TEventMetadata>> query)
-        {
-            var storedEvents = await context.Events
-                    .Where(e => e.StreamId.Equals(streamId))
-                    .AsNoTracking()
-                    .Apply(query)
-                    .OrderBy(e => e.Timestamp)
-                    .ToListAsync();
-
-            var events = storedEvents
-                .Cast<TPersistedEvent>()
-                .Select(_serializer.Deserialize);
-
-            return events;
-        }
+        public Task<IEnumerable<TEvent>> Events(TStreamId streamId, Func<IQueryable<TEventMetadata>, IQueryable<TEventMetadata>> query)
+            => Events(events => events.Where(e => e.StreamId.Equals(streamId)).Apply(query));
 
         public Task Append(TStreamId streamId, long versionBefore, object payload)
             => Append(streamId, versionBefore, new[] { payload });