Adds Generic CommandHandlerDecorator

Application/Pages/Index.cshtml.cs

@@ -1,4 +1,3 @@
-using Akka.Actor;
 using Microsoft.ApplicationInsights;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

Application/PlanTempus.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 

Core/CommandQueries/Command.cs

@@ -0,0 +1,7 @@
+namespace PlanTempus.Core.CommandQueries;
+
+public abstract class Command : ICommand
+{
+    public required Guid CorrelationId { get; set; }
+    public Guid TransactionId { get; set; }
+}

Core/CommandQueries/CommandResponse.cs

@@ -0,0 +1,16 @@
+namespace PlanTempus.Core.CommandQueries;
+
+public class CommandResponse
+{
+    public Guid RequestId { get; }
+    public Guid CorrelationId { get; }
+    public Guid? TransactionId { get; }
+    public DateTime CreatedAt { get; }
+
+    public CommandResponse(Guid correlationId)
+    {
+        CorrelationId = correlationId;
+        RequestId = Guid.CreateVersion7();
+        CreatedAt = DateTime.Now;
+    }
+}

Core/CommandQueries/ICommand.cs

@@ -0,0 +1,7 @@
+namespace PlanTempus.Core.CommandQueries;
+
+public interface ICommand
+{
+    Guid CorrelationId { get; set; }
+    Guid TransactionId { get; set; }
+}

Core/Database/DatabaseScope.cs

@@ -15,6 +15,7 @@ public class DatabaseScope : IDisposable
         Connection = connection;
         _operation = operation;
         _operation.Telemetry.Success = true;
+        _operation.Telemetry.Timestamp = DateTimeOffset.UtcNow;
         _stopwatch = Stopwatch.StartNew();
     }
 

Core/ModuleRegistry/TelemetryModule.cs

@@ -17,7 +17,7 @@ namespace PlanTempus.Core.ModuleRegistry
             var client = new Microsoft.ApplicationInsights.TelemetryClient(configuration);
             client.Context.GlobalProperties["Application"] = GetType().Namespace?.Split('.')[0];
             client.Context.GlobalProperties["MachineName"] = Environment.MachineName;
-            client.Context.GlobalProperties["Version"] = Environment.Version.ToString();
+            client.Context.GlobalProperties["CLRVersion"] = Environment.Version.ToString();
             client.Context.GlobalProperties["ProcessorCount"] = Environment.ProcessorCount.ToString();
 
             builder.Register(c => client).InstancePerLifetimeScope();

Core/PlanTempus.Core.csproj

@@ -1,13 +1,11 @@
-
+<Project Sdk="Microsoft.NET.Sdk">
-<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
-		<PackageReference Include="Akka" Version="1.5.32" />
         <PackageReference Include="Autofac" Version="8.1.1"/>
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0"/>
         <PackageReference Include="FluentValidation" Version="11.11.0"/>

Database/PlanTempus.Database.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

PlanTempus.Components/CommandHandler.cs

@@ -1,13 +1,14 @@
 using Autofac;
 using PlanTempus.Components.Users.Create;
+using PlanTempus.Core.CommandQueries;
 
 namespace PlanTempus.Components;
 
 public class CommandHandler(IComponentContext context) : ICommandHandler
 {
-    public async Task<TCommandResult> Handle<TCommand, TCommandResult>(TCommand command)
+    public async Task<CommandResponse> Handle<TCommand>(TCommand command) where TCommand : ICommand
     {
-        var handler = context.Resolve<ICommandHandler<TCommand, TCommandResult>>();
+        var handler = context.Resolve<ICommandHandler<TCommand>>();
         return await handler.Handle(command);
     }
 }

PlanTempus.Components/ICommandHandler.cs

@@ -1,13 +1,15 @@
-namespace PlanTempus.Components;
+using PlanTempus.Core.CommandQueries;
+
+namespace PlanTempus.Components;
 
 public interface ICommandHandler
 {
-    Task<TCommandResult> Handle<TCommand, TCommandResult>(TCommand command);
+    Task<CommandResponse> Handle<TCommand>(TCommand command) where TCommand : ICommand;
 }
 
-public interface ICommandHandler<in T, TResult>
+public interface ICommandHandler<TCommand> where TCommand : ICommand
 {
-    Task<TResult> Handle(T input);
+    Task<CommandResponse> Handle(TCommand command);
 }
 
 public interface ICommandHandlerDecorator

PlanTempus.Components/ModuleRegistry/CommandModule.cs

@@ -1,5 +1,6 @@
 using Autofac;
 using PlanTempus.Components.Users.Create;
+using PlanTempus.Core.CommandQueries;
 using PlanTempus.Core.SeqLogging;
 
 namespace PlanTempus.Components.ModuleRegistry
@@ -10,35 +11,27 @@ namespace PlanTempus.Components.ModuleRegistry
 
         protected override void Load(ContainerBuilder builder)
         {
-
             builder.RegisterType<PlanTempus.Components.CommandHandler>()
                 .As<PlanTempus.Components.ICommandHandler>()
                 .InstancePerLifetimeScope();
 
             builder.RegisterAssemblyTypes(ThisAssembly)
                 .Where(t => !typeof(ICommandHandlerDecorator).IsAssignableFrom(t))
-                .AsClosedTypesOf(typeof(ICommandHandler<,>))
+                .AsClosedTypesOf(typeof(ICommandHandler<>))
                 .InstancePerLifetimeScope();
 
-            
-            // Registrer alle handlers
-            // builder.RegisterAssemblyTypes(ThisAssembly)
-            //     .AsClosedTypesOf(typeof(ICommandHandler<,>))
-            //     .InstancePerLifetimeScope();
-
             builder.RegisterAssemblyTypes(ThisAssembly)
                 .As<ICommandHandlerDecorator>();
 
 
-            builder.RegisterDecorator(
+            builder.RegisterGenericDecorator(
-                typeof(CreateUserHandlerDecorator), 
+                typeof(CommandHandlerDecorator<>),
-                typeof(ICommandHandler<CreateUserCommand, CreateUserResult>));
+                typeof(ICommandHandler<>));
             //     
             // Registrer en decorator for alle ICommandHandler<TCommand>
             // builder.RegisterGenericDecorator(
             //     typeof(CommandHandlerDecorator<,>), 
             //     typeof(ICommandHandler<,>));
-
         }
     }
 }

PlanTempus.Components/PlanTempus.Components.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 

PlanTempus.Components/Users/Create/CommandHandlerDecorator.cs

@@ -1,27 +1,30 @@
 using System.Diagnostics;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.DataContracts;
+using PlanTempus.Core.CommandQueries;
 
 namespace PlanTempus.Components.Users.Create;
 
-public class CreateUserHandlerDecorator(
+public class CommandHandlerDecorator<TCommand>(
-    ICommandHandler<CreateUserCommand, CreateUserResult> decoratedHandler,
+    ICommandHandler<TCommand> decoratedHandler,
-    TelemetryClient telemetryClient)
+    TelemetryClient telemetryClient) : ICommandHandler<TCommand>, ICommandHandlerDecorator where TCommand : ICommand
-    : ICommandHandler<CreateUserCommand, CreateUserResult>, ICommandHandlerDecorator
 {
-    public async Task<CreateUserResult> Handle(CreateUserCommand command)
+    public async Task<CommandResponse> Handle(TCommand command)
     {
         // var correlationId = Activity.Current?.RootId ?? command.CorrelationId;
 
         using (var operation =
-               telemetryClient.StartOperation<RequestTelemetry>($"Handle {nameof(CreateUserCommand)}",
+               telemetryClient.StartOperation<RequestTelemetry>($"Handle {decoratedHandler.GetType().FullName}",
                    command.CorrelationId.ToString()))
         {
             try
             {
                 operation.Telemetry.Properties["CorrelationId"] = command.CorrelationId.ToString();
+                operation.Telemetry.Properties["TransactionId"] = command.TransactionId.ToString();
+
                 var result = await decoratedHandler.Handle(command);
 
+                operation.Telemetry.Properties["RequestId"] = result.RequestId.ToString();
                 operation.Telemetry.Success = true;
 
                 return result;
@@ -32,7 +35,9 @@ public class CreateUserHandlerDecorator(
 
                 telemetryClient.TrackException(ex, new Dictionary<string, string>
                 {
-                    ["CommandType"] = nameof(CreateUserCommand)
+                    ["CorrelationId"] = command.CorrelationId.ToString(),
+                    ["Command"] = command.GetType().Name,
+                    ["CommandHandler"] = decoratedHandler.GetType().FullName
                 });
                 throw;
             }

PlanTempus.Components/Users/Create/CreateUserCommand.cs

@@ -1,15 +1,11 @@
+using PlanTempus.Core.CommandQueries;
+
 namespace PlanTempus.Components.Users.Create
 {
-    public interface ICommand
+    public class CreateUserCommand : Command
-    {
-        Guid CorrelationId { get; set; }
-    }
-
-    public class CreateUserCommand : ICommand
     {
         public required string Email { get; set; }
         public required string Password { get; set; }
         public bool IsActive { get; set; } = true;
-        public required Guid CorrelationId { get; set; }
     }
 }

PlanTempus.Components/Users/Create/CreateUserController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using PlanTempus.Core.CommandQueries;
 
 namespace PlanTempus.Components.Users.Create
 {
@@ -7,7 +8,7 @@ namespace PlanTempus.Components.Users.Create
     public class CreateUserController(CreateUserHandler handler, CreateUserValidator validator) : ControllerBase
     {
         [HttpPost]
-		public async Task<ActionResult<CreateUserResult>> Create([FromBody] CreateUserCommand command)
+        public async Task<ActionResult<CommandResponse>> Create([FromBody] CreateUserCommand command)
         {
             try
             {
@@ -19,11 +20,7 @@ namespace PlanTempus.Components.Users.Create
 
                 var result = await handler.Handle(command);
 
-				return CreatedAtAction(
+                return Accepted($"/api/requests/{result.RequestId}", result);
-					nameof(CreateUserCommand),
-					"GetUser",
-					new { id = result.Id },
-					result);
             }
             catch (Exception ex)
             {

PlanTempus.Components/Users/Create/CreateUserHandler.cs

@@ -3,17 +3,16 @@ using Microsoft.ApplicationInsights;
 using Npgsql;
 using PlanTempus.Components.Users.Exceptions;
 using PlanTempus.Core;
+using PlanTempus.Core.CommandQueries;
 using PlanTempus.Core.Database;
-using PlanTempus.Core.Telemetry;
 
 namespace PlanTempus.Components.Users.Create
 {
     public class CreateUserHandler(
-        TelemetryClient telemetryClient,
         IDatabaseOperations databaseOperations,
-        ISecureTokenizer secureTokenizer) : ICommandHandler<CreateUserCommand, CreateUserResult>
+        ISecureTokenizer secureTokenizer) : ICommandHandler<CreateUserCommand>
     {
-        public async Task<CreateUserResult> Handle(CreateUserCommand command)
+        public async Task<CommandResponse> Handle(CreateUserCommand command)
         {
             using var db = databaseOperations.CreateScope(nameof(CreateUserHandler));
             try
@@ -28,20 +27,19 @@ namespace PlanTempus.Components.Users.Create
 
                 var data = await db.Connection.QuerySqlAsync<CreateUserResult>(sql, new
                 {
-                    Email = command.Email,
+                    command.Email,
                     PasswordHash = secureTokenizer.TokenizeText(command.Password),
                     SecurityStamp = Guid.NewGuid().ToString("N"),
                     EmailConfirmed = false,
                     AccessFailedCount = 0,
                     LockoutEnabled = false,
-                    IsActive = command.IsActive,
+                    command.IsActive,
                 });
 
 
                 var result = data.First();
 
-
+                return new CommandResponse(command.CorrelationId);
-                return result;
             }
             catch (PostgresException ex) when (ex.SqlState == "23505")
             {

PlanTempus.X.BDD/PlanTempus.X.BDD.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<IsPackable>false</IsPackable>

SetupInfrastructure/PlanTempus.SetupInfrastructure.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 

Tests/CommandQueryHandlerTests/HandlerTest.cs

@@ -2,6 +2,7 @@ using Autofac;
 using Insight.Database;
 using PlanTempus.Components;
 using PlanTempus.Components.Users.Create;
+using PlanTempus.Core.CommandQueries;
 using PlanTempus.Core.Database;
 using PlanTempus.Core.Database.ConnectionFactory;
 using Shouldly;
@@ -24,13 +25,13 @@ public class HandlerTest : TestFixture
 
         var command = new CreateUserCommand
         {
-            Email = "lloyd@dumbanddumber.com1", // Lloyd Christmas
+            Email = "lloyd@dumbanddumber.com3", // Lloyd Christmas
             Password = "1234AceVentura#LOL", // Ace Ventura
             IsActive = true,
             CorrelationId = Guid.NewGuid()
         };
 
-        var result = await commandHandler.Handle<CreateUserCommand, CreateUserResult>(command);
+        var result = await commandHandler.Handle(command);
         
         result.ShouldNotBeNull();
     }

Tests/PlanTempus.X.TDD.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
 
         <IsPackable>false</IsPackable>