Fixed versions conflicts and package vulnerabilities causing build errors

Core.EventStoreDB/Events/EventStoreDBExtensions.cs

@@ -25,13 +25,10 @@ CancellationToken cancellationToken
         if (await readResult.ReadState.ConfigureAwait(false) == ReadState.StreamNotFound)
             return null;
 
-        return await readResult
-            .Select(@event => @event.Deserialize()!)
-            .AggregateAsync(
-                ObjectFactory<TEntity>.GetDefaultOrUninitialized(),
-                when,
-                cancellationToken
-            ).ConfigureAwait(false);
+        var result = ObjectFactory<TEntity>.GetDefaultOrUninitialized();
+        await foreach (var @event in readResult)
+            result = when(result, @event);
+        return result;
     }
 
     public static async Task<TEntity> Find<TEntity>(
@@ -51,13 +48,10 @@ public static async Task<TEntity> Find<TEntity>(
         if (await readResult.ReadState.ConfigureAwait(false) == ReadState.StreamNotFound)
             throw AggregateNotFoundException.For<TEntity>(id);
 
-        return await readResult
-            .Select(@event => @event.Deserialize()!)
-            .AggregateAsync(
-                getDefault(),
-                when,
-                cancellationToken
-            ).ConfigureAwait(false);
+        var result = getDefault();
+        await foreach (var @event in readResult)
+            result = when(result, @event);
+        return result;
     }
 
     public static async Task<List<object>> ReadStream(
@@ -75,9 +69,10 @@ public static async Task<List<object>> ReadStream(
         if (await readResult.ReadState.ConfigureAwait(false) == ReadState.StreamNotFound)
             return [];
 
-        return await readResult
-            .Select(@event => @event.Deserialize()!)
-            .ToListAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+        var result =  new List<object>();
+        await foreach (var @event in readResult)
+            result.Add(@event);
+        return result;
     }
 
     public static async Task<ulong> Append(
@@ -146,7 +141,10 @@ CancellationToken ct
             return null;
         }
 
-        return await result.FirstAsync(ct).ConfigureAwait(false);
+        await foreach (var @event in result)
+            return @event;
+
+        return null;
     }
 
     public static async Task AppendToStreamWithSingleEvent(

Core.EventStoreDB/Subscriptions/Checkpoints/EventStoreDBSubscriptionCheckpointRepository.cs

@@ -17,18 +17,19 @@ public async ValueTask<Checkpoint> Load(string subscriptionId, CancellationToken
     {
         var streamName = GetCheckpointStreamName(subscriptionId);
 
-        var result = eventStoreClient.ReadStreamAsync(Direction.Backwards, streamName, StreamPosition.End, 1,
+        var readResult = eventStoreClient.ReadStreamAsync(Direction.Backwards, streamName, StreamPosition.End, 1,
             cancellationToken: ct);
 
-        if (await result.ReadState.ConfigureAwait(false) == ReadState.StreamNotFound)
+        if (await readResult.ReadState.ConfigureAwait(false) == ReadState.StreamNotFound)
             return Checkpoint.None;
 
-        ResolvedEvent? resolvedEvent = await result.FirstOrDefaultAsync(ct).ConfigureAwait(false);
+        await foreach (var resolvedEvent in readResult)
+            return Checkpoint.From(
+                resolvedEvent.Deserialize<CheckpointStored>()?.Position,
+                resolvedEvent.Event.EventNumber
+            );
 
-        return Checkpoint.From(
-            resolvedEvent?.Deserialize<CheckpointStored>()?.Position,
-            resolvedEvent?.Event.EventNumber
-        );
+        throw new InvalidOperationException("Didn't find Checkpoint!");
     }
 
     public async ValueTask<StoreResult> Store(

Core.Marten/Extensions/DocumentSessionExtensions.cs

@@ -31,21 +31,23 @@ public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id, int version,
         Func<T, object> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, version, stream =>
-            stream.AppendOne(handle(stream.Aggregate)), ct);
+            stream.AppendOne(handle(stream.Aggregate ?? initial())), ct);
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         string id,
         int version,
         Func<T, IEnumerable<EventOrCommand>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, version, stream =>
         {
-            var messages = handle(stream.Aggregate);
+            var messages = handle(stream.Aggregate ?? initial());
 
             foreach (var message in messages)
             {
@@ -61,11 +63,12 @@ public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         string id,
         Func<T, IEnumerable<EventOrCommand>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, stream =>
         {
-            var messages = handle(stream.Aggregate);
+            var messages = handle(stream.Aggregate ?? initial());
 
             foreach (var message in messages)
             {
@@ -80,44 +83,49 @@ public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         string id,
         Func<T, IEnumerable<object>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id,
-            stream => stream.AppendMany(handle(stream.Aggregate)), ct);
+            stream => stream.AppendMany(handle(stream.Aggregate ?? initial())), ct);
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, object> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, stream =>
-            stream.AppendOne(handle(stream.Aggregate)), ct);
+            stream.AppendOne(handle(stream.Aggregate ?? initial())), ct);
 
     public static Task GetAndUpdate<T, TEvent>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, Maybe<TEvent>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, stream =>
-            handle(stream.Aggregate).IfExists(@event => stream.AppendOne(@event)), ct);
+            handle(stream.Aggregate ?? initial()).IfExists(@event => stream.AppendOne(@event!)), ct);
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, Maybe<object>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, stream =>
-            handle(stream.Aggregate).IfExists(stream.AppendOne), ct);
+            handle(stream.Aggregate ?? initial()).IfExists(stream.AppendOne), ct);
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, Maybe<object[]>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.Events.WriteToAggregate<T>(id, stream =>
-            handle(stream.Aggregate).IfExists(stream.AppendMany), ct);
+            handle(stream.Aggregate ?? initial()).IfExists(stream.AppendMany), ct);
 }

Core.Marten/Extensions/DocumentSessionExtensionsWithOpenTelemetry.cs

@@ -24,54 +24,59 @@ public static Task GetAndUpdate<T>(
         Guid id,
         int version,
         Func<T, object> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.WithTelemetry<T>(
-            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, version, handle, token),
+            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, version, handle, initial, token),
             ct
         );
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, object> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.WithTelemetry<T>(
-            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, token),
+            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, initial, token),
             ct
         );
 
     public static Task GetAndUpdate<T, TEvent>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, Maybe<TEvent>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.WithTelemetry<T>(
-            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, token),
+            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, initial, token),
             ct
         );
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, Maybe<object>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.WithTelemetry<T>(
-            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, token),
+            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, initial, token),
             ct
         );
 
     public static Task GetAndUpdate<T>(
         this IDocumentSession documentSession,
         Guid id,
         Func<T, Maybe<object[]>> handle,
+        Func<T> initial,
         CancellationToken ct
     ) where T : class =>
         documentSession.WithTelemetry<T>(
-            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, token),
+            token => DocumentSessionExtensions.GetAndUpdate(documentSession, id, handle, initial, token),
             ct
         );
 

Core.Marten/Ids/UUIDv7IdGenerator.cs

@@ -0,0 +1,8 @@
+using Core.Ids;
+
+namespace Core.Marten.Ids;
+
+public class UUIDv7IdGenerator: IIdGenerator
+{
+    public Guid New() => Guid.CreateVersion7();
+}

Core.Marten/MartenConfig.cs

@@ -3,8 +3,9 @@
 using Core.Marten.Commands;
 using Core.Marten.Ids;
 using Core.Marten.Subscriptions;
+using JasperFx;
+using JasperFx.Events.Daemon;
 using Marten;
-using Marten.Events.Daemon.Resiliency;
 using Marten.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -57,7 +58,7 @@ public static MartenServiceCollectionExtensions.MartenConfigurationExpression Ad
     )
     {
         var config = services
-            .AddScoped<IIdGenerator, MartenIdGenerator>()
+            .AddScoped<IIdGenerator, UUIDv7IdGenerator>()
             .AddMarten(sp =>
             {
                 var dataSource = sp.GetService<NpgsqlDataSource>();

Core.Marten/Subscriptions/MartenEventPublisher.cs

@@ -1,8 +1,8 @@
 using Core.Events;
 using Core.OpenTelemetry;
+using JasperFx.Events.Daemon;
+using JasperFx.Events.Projections;
 using Marten;
-using Marten.Events.Daemon;
-using Marten.Events.Daemon.Internals;
 using Marten.Subscriptions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;