Refactor constructors and update Program.cs endpoints

Refactored constructors for better readability by placing each parameter on a new line and replacing `var` with explicit types where applicable. Modified `Startup.cs` to change `ConfigureServicesAsync` to a synchronous `ConfigureServices` method. Simplified `OrdersController.Get` method using a ternary operator. Updated `Program.cs` to remove `UseCore` and `UseGenocs` method calls, added `app.MapDefaultEndpoints()`, `app.Run()`, `app.UseHttpsRedirection()`, and `app.UseStaticFiles()`, and reformatted `builder` configuration for better readability.

Author: giovanninocco

src/apps/api-gateway/Genocs.APIGateway/Startup.cs

@@ -20,7 +20,13 @@ public Startup(IConfiguration configuration)
         Configuration = configuration;
     }
 
-    public async Task ConfigureServicesAsync(IServiceCollection services)
+    public void ConfigureServices(IServiceCollection services)
+    {
+        // Find a more elegant way to do this
+        Task.Run(async () => await ConfigureServicesAsync(services)).Wait();
+    }
+
+    private async Task ConfigureServicesAsync(IServiceCollection services)
     {
         services.AddScoped<LogContextMiddleware>();
         services.AddScoped<UserMiddleware>();

src/apps/identity/Genocs.Identities.Application/Commands/CreateUser.cs

@@ -11,8 +11,13 @@ public class CreateUser : ICommand
     public string Role { get; }
     public IEnumerable<string> Permissions { get; }
 
-    public CreateUser(Guid userId, string email, string name, string password, string role,
-        IEnumerable<string> permissions)
+    public CreateUser(
+                        Guid userId,
+                        string email,
+                        string name,
+                        string password,
+                        string role,
+                        IEnumerable<string> permissions)
     {
         UserId = userId == Guid.Empty ? Guid.NewGuid() : userId;
         Email = email;

src/apps/identity/Genocs.Identities.Application/Decorators/LoggingCommandHandlerDecorator.cs

@@ -15,8 +15,10 @@ internal sealed class LoggingCommandHandlerDecorator<TCommand> : ICommandHandler
     private readonly ICorrelationIdFactory _correlationIdFactory;
     private readonly ILogger<ICommandHandler<TCommand>> _logger;
 
-    public LoggingCommandHandlerDecorator(ICommandHandler<TCommand> handler,
-        ICorrelationIdFactory correlationIdFactory, ILogger<ICommandHandler<TCommand>> logger)
+    public LoggingCommandHandlerDecorator(
+                                            ICommandHandler<TCommand> handler,
+                                            ICorrelationIdFactory correlationIdFactory,
+                                            ILogger<ICommandHandler<TCommand>> logger)
     {
         _handler = handler;
         _correlationIdFactory = correlationIdFactory;
@@ -25,10 +27,10 @@ public LoggingCommandHandlerDecorator(ICommandHandler<TCommand> handler,
 
     public async Task HandleAsync(TCommand command, CancellationToken cancellationToken = default)
     {
-        var correlationId = _correlationIdFactory.Create();
+        string? correlationId = _correlationIdFactory.Create();
         using (LogContext.PushProperty("CorrelationId", correlationId))
         {
-            var name = command.GetType().Name.Underscore();
+            string? name = command.GetType().Name.Underscore();
             _logger.LogInformation($"Handling a command: '{name}'...");
             await _handler.HandleAsync(command);
         }

src/apps/identity/Genocs.Identities.Application/Decorators/LoggingEventHandlerDecorator.cs

@@ -15,8 +15,10 @@ internal sealed class LoggingEventHandlerDecorator<TEvent> : IEventHandler<TEven
     private readonly ICorrelationIdFactory _correlationIdFactory;
     private readonly ILogger<IEventHandler<TEvent>> _logger;
 
-    public LoggingEventHandlerDecorator(IEventHandler<TEvent> handler, ICorrelationIdFactory correlationIdFactory,
-        ILogger<IEventHandler<TEvent>> logger)
+    public LoggingEventHandlerDecorator(
+                                        IEventHandler<TEvent> handler,
+                                        ICorrelationIdFactory correlationIdFactory,
+                                        ILogger<IEventHandler<TEvent>> logger)
     {
         _handler = handler;
         _correlationIdFactory = correlationIdFactory;
@@ -25,10 +27,10 @@ public LoggingEventHandlerDecorator(IEventHandler<TEvent> handler, ICorrelationI
 
     public async Task HandleAsync(TEvent @event, CancellationToken cancellationToken = default)
     {
-        var correlationId = _correlationIdFactory.Create();
+        string? correlationId = _correlationIdFactory.Create();
         using (LogContext.PushProperty("CorrelationId", correlationId))
         {
-            var name = @event.GetType().Name.Underscore();
+            string? name = @event.GetType().Name.Underscore();
             _logger.LogInformation($"Handling an event: '{name}'...");
             await _handler.HandleAsync(@event);
         }

src/apps/identity/Genocs.Identities.Application/Decorators/OutboxCommandHandlerDecorator.cs

@@ -15,17 +15,20 @@ internal sealed class OutboxCommandHandlerDecorator<TCommand> : ICommandHandler<
     private readonly string _messageId;
     private readonly bool _enabled;
 
-    public OutboxCommandHandlerDecorator(ICommandHandler<TCommand> handler, IMessageOutbox outbox,
-        OutboxOptions outboxOptions, IMessagePropertiesAccessor messagePropertiesAccessor)
+    public OutboxCommandHandlerDecorator(
+                                            ICommandHandler<TCommand> handler,
+                                            IMessageOutbox outbox,
+                                            OutboxOptions outboxOptions,
+                                            IMessagePropertiesAccessor messagePropertiesAccessor)
     {
         _handler = handler;
         _outbox = outbox;
         _enabled = outboxOptions.Enabled;
 
         var messageProperties = messagePropertiesAccessor.MessageProperties;
         _messageId = string.IsNullOrWhiteSpace(messageProperties?.MessageId)
-            ? Guid.NewGuid().ToString("N")
-            : messageProperties.MessageId;
+                                                                            ? Guid.NewGuid().ToString("N")
+                                                                            : messageProperties.MessageId;
     }
 
     public Task HandleAsync(TCommand command, CancellationToken cancellationToken = default)

src/apps/identity/Genocs.Identities.Application/Decorators/OutboxEventHandlerDecorator.cs

@@ -15,8 +15,11 @@ internal sealed class OutboxEventHandlerDecorator<TEvent> : IEventHandler<TEvent
     private readonly string _messageId;
     private readonly bool _enabled;
 
-    public OutboxEventHandlerDecorator(IEventHandler<TEvent> handler, IMessageOutbox outbox,
-        OutboxOptions outboxOptions, IMessagePropertiesAccessor messagePropertiesAccessor)
+    public OutboxEventHandlerDecorator(
+                                        IEventHandler<TEvent> handler,
+                                        IMessageOutbox outbox,
+                                        OutboxOptions outboxOptions,
+                                        IMessagePropertiesAccessor messagePropertiesAccessor)
     {
         _handler = handler;
         _outbox = outbox;

src/apps/identity/Genocs.Identities.WebApi/Program.cs

@@ -25,10 +25,8 @@
 
 gnxBuilder.Build();
 var app = builder.Build();
-
 app.UseCore();
 app.UseDispatcherEndpoints(endpoints => endpoints
-                            .Get(string.Empty, ctx => ctx.GetAppName())
                             .Post<SignIn>("sign-in", afterDispatch: (cmd, ctx) =>
                             {
                                 var auth = ctx.RequestServices.GetRequiredService<ITokenStorage>().Get(cmd.Id);
@@ -51,6 +49,8 @@
                             .Put<LockUser>("users/{userId:guid}/lock", auth: true, roles: "admin")
                             .Put<UnlockUser>("users/{userId:guid}/unlock", auth: true, roles: "admin"));
 
+app.MapDefaultEndpoints();
+
 app.Run();
 
 Log.CloseAndFlush();

src/apps/orders/Genocs.Orders.WebApi/Controllers/OrdersController.cs

@@ -24,12 +24,7 @@ public OrdersController(ICommandDispatcher commandDispatcher, IQueryDispatcher q
     public async Task<ActionResult<OrderDto>> Get([FromRoute] GetOrder query)
     {
         var order = await _queryDispatcher.QueryAsync(query);
-        if (order is null)
-        {
-            return NotFound();
-        }
-
-        return order;
+        return order is null ? (ActionResult<OrderDto>)NotFound() : (ActionResult<OrderDto>)order;
     }
 
     [HttpPost]

src/apps/orders/Genocs.Orders.WebApi/Program.cs

@@ -75,14 +75,14 @@
     .UseCertificateAuthentication()
     .UseEndpoints(r => r.MapControllers())
     .UseDispatcherEndpoints(endpoints => endpoints
-        .Get(string.Empty, ctx => ctx.Response.WriteAsync("Orders Service"))
-        .Get("ping", ctx => ctx.Response.WriteAsync("pong"))
         .Get<GetOrder, OrderDto>("orders/{orderId}")
         .Post<CreateOrder>("orders", afterDispatch: (cmd, ctx) => ctx.Response.Created($"orders/{cmd.OrderId}")))
     .UseSwaggerDocs()
     .UseRabbitMQ()
     .SubscribeEvent<DeliveryStarted>();
 
+app.MapDefaultEndpoints();
+
 app.Run();
 
 Log.CloseAndFlush();

src/apps/products/Genocs.Products.WebApi/Program.cs

@@ -75,14 +75,14 @@
     .UseCertificateAuthentication()
     .UseEndpoints(r => r.MapControllers())
     .UseDispatcherEndpoints(endpoints => endpoints
-        .Get(string.Empty, ctx => ctx.Response.WriteAsync("Products Service"))
-        .Get("ping", ctx => ctx.Response.WriteAsync("pong"))
         .Get<BrowseProducts, PagedResult<ProductDto>>("products")
         .Get<GetProduct, ProductDto>("products/{productId}")
         .Post<CreateProduct>("products", afterDispatch: (cmd, ctx) => ctx.Response.Created($"products/{cmd.ProductId}")))
     .UseSwaggerDocs()
     .UseRabbitMQ();
 
+app.MapDefaultEndpoints();
+
 app.Run();
 
 Log.CloseAndFlush();