generator-codedesignplus 0.1.0-alpha.1 → 0.1.0-alpha.5

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Domain/OrderAggregate.cs

@@ -4,34 +4,32 @@ namespace CodeDesignPlus.Net.Microservice.Domain;
 
 public class OrderAggregate(Guid id) : AggregateRoot(id)
 {
-    public long? CompletedAt { get; private set; }
-    public long? CancelledAt { get; private set; }
+    public Instant? CompletedAt { get; private set; }
+    public Instant? CancelledAt { get; private set; }
     public ClientValueObject Client { get; private set; } = default!;
     public List<ProductEntity> Products { get; private set; } = [];
     public OrderStatus Status { get; private set; }
     public string? ReasonForCancellation { get; private set; }
     public AddressValueObject ShippingAddress { get; private set; } = default!;
 
-    public static OrderAggregate Create(Guid id, ClientValueObject client, AddressValueObject shippingAddress, Guid tenant, Guid createBy)
+    public static OrderAggregate Create(Guid id, ClientValueObject client, AddressValueObject shippingAddress, Guid tenant, Guid createdBy)
     {
         DomainGuard.GuidIsEmpty(id, Errors.IdOrderIsInvalid);
         DomainGuard.IsNull(client, Errors.ClientIsNull);
         DomainGuard.GuidIsEmpty(tenant, Errors.TenantIsInvalid);
         DomainGuard.IsNull(shippingAddress, Errors.AddressIsNull);
 
-        var @event = OrderCreatedDomainEvent.Create(id, client, shippingAddress, tenant, createBy);
-
         var aggregate = new OrderAggregate(id)
         {
             Client = client,
             ShippingAddress = shippingAddress,
-            CreatedAt = @event.CreatedAt,
-            Status = @event.OrderStatus,
+            CreatedAt = SystemClock.Instance.GetCurrentInstant(),
+            Status = OrderStatus.Created,
             Tenant = tenant,
-            CreatedBy = createBy
+            CreatedBy = createdBy
         };
 
-        aggregate.AddEvent(@event);
+        aggregate.AddEvent(OrderCreatedDomainEvent.Create(aggregate.Id, aggregate.Client, aggregate.ShippingAddress, aggregate.Tenant, aggregate.CreatedBy));
 
         return aggregate;
     }
@@ -43,7 +41,7 @@ public class OrderAggregate(Guid id) : AggregateRoot(id)
         DomainGuard.IsLessThan(price, 0, Errors.PriceProductIsInvalid);
         DomainGuard.IsLessThan(quantity, 0, Errors.QuantityProductIsInvalid);
 
-        this.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        this.UpdatedAt = SystemClock.Instance.GetCurrentInstant();
         this.UpdatedBy = updateBy;
 
         var product = new ProductEntity
@@ -68,7 +66,7 @@ public class OrderAggregate(Guid id) : AggregateRoot(id)
 
         DomainGuard.IsNull(product, Errors.ProductNotFound);
 
-        this.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        this.UpdatedAt = SystemClock.Instance.GetCurrentInstant();
         this.UpdatedBy = updateBy;
 
         Products.Remove(product);
@@ -85,7 +83,7 @@ public class OrderAggregate(Guid id) : AggregateRoot(id)
 
         DomainGuard.IsNull(product, Errors.ProductNotFound);
 
-        this.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        this.UpdatedAt = SystemClock.Instance.GetCurrentInstant();
         this.UpdatedBy = updateBy;
 
         product.Quantity = newQuantity;
@@ -100,7 +98,7 @@ public class OrderAggregate(Guid id) : AggregateRoot(id)
 
         var @event = OrderCompletedDomainEvent.Create(Id);
 
-        this.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        this.UpdatedAt = SystemClock.Instance.GetCurrentInstant();
         this.UpdatedBy = updateBy;
 
         this.CompletedAt = @event.CompletedAt;
@@ -113,10 +111,10 @@ public class OrderAggregate(Guid id) : AggregateRoot(id)
     {
         DomainGuard.IsTrue(Status == OrderStatus.Cancelled, Errors.OrderAlreadyCancelled);
 
-        this.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        this.UpdatedAt = SystemClock.Instance.GetCurrentInstant();
         this.UpdatedBy = updateBy;
         this.ReasonForCancellation = reason;
-        this.CancelledAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        this.CancelledAt = SystemClock.Instance.GetCurrentInstant();
         this.Status = OrderStatus.Cancelled;
 
         AddEvent(OrderCancelledDomainEvent.Create(Id, reason));

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Domain/Repositories/IOrderRepository.cs

@@ -2,13 +2,9 @@
 
 public interface IOrderRepository : IRepositoryBase
 {
-    Task<OrderAggregate> FindAsync(Guid id, CancellationToken cancellationToken);
-    Task<List<OrderAggregate>> GetAllOrdersAsync(CancellationToken cancellationToken);
-    Task CreateOrderAsync(OrderAggregate order, CancellationToken cancellationToken);
-    Task AddProductToOrderAsync(AddProductToOrderParams parameters, CancellationToken cancellationToken);
-    Task RemoveProductFromOrderAsync(RemoveProductFromOrderParams parameters, CancellationToken cancellationToken);
-    Task UpdateQuantityProductAsync(UpdateQuantityProductParams parameters, CancellationToken cancellationToken);
-    Task CompleteOrderAsync(CompleteOrderParams parameters, CancellationToken cancellationToken);
-    Task CancelOrderAsync(CancelOrderParams parameters, CancellationToken cancellationToken);
-    Task UpdateOrderAsync(OrderAggregate order, CancellationToken cancellationToken);
+    Task AddProductToOrderAsync(Guid id, Guid tenant, AddProductToOrderParams parameters, CancellationToken cancellationToken);
+    Task CancelOrderAsync(CancelOrderParams parameters, Guid tenant, CancellationToken cancellationToken);
+    Task CompleteOrderAsync(CompleteOrderParams parameters, Guid tenant, CancellationToken cancellationToken);
+    Task RemoveProductFromOrderAsync(RemoveProductFromOrderParams parameters, Guid tenant, CancellationToken cancellationToken);
+    Task UpdateQuantityProductAsync(Guid id, Guid tenant, UpdateQuantityProductParams parameters, CancellationToken cancellationToken);
 }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Domain/Usings.cs

@@ -4,6 +4,7 @@ global using CodeDesignPlus.Net.Exceptions.Guards;
 global using CodeDesignPlus.Net.Mongo.Abstractions;
 global using CodeDesignPlus.Net.Serializers;
 global using System.Text.RegularExpressions;
+global using NodaTime;
 
 global using CodeDesignPlus.Net.Microservice.Domain.DomainEvents;
 global using CodeDesignPlus.Net.Microservice.Domain.Entities;

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Infrastructure/Repositories/OrderRepository.cs

@@ -3,18 +3,22 @@
 public class OrderRepository(IServiceProvider serviceProvider, IOptions<MongoOptions> mongoOptions, ILogger<RepositoryBase> logger) 
     : RepositoryBase(serviceProvider, mongoOptions, logger), IOrderRepository
 {
-    public Task AddProductToOrderAsync(AddProductToOrderParams parameters, CancellationToken cancellationToken)
+    public Task AddProductToOrderAsync(Guid id, Guid tenant, AddProductToOrderParams parameters, CancellationToken cancellationToken)
     {
         var product = new ProductEntity
         {
-            Id = parameters.IdProduct,
+            Id = parameters.Id,
             Name = parameters.Name,
             Description = parameters.Description,
             Price = parameters.Price,
-            Quantity = parameters.Quantity
+            Quantity = parameters.Quantity,
         };
 
-        var filterId = Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id);
+        var filter = Builders<OrderAggregate>.Filter.And(
+            Builders<OrderAggregate>.Filter.Eq(x => x.Id, id),
+            Builders<OrderAggregate>.Filter.Eq(x => x.Tenant, tenant)
+        );
+
         var update = Builders<OrderAggregate>.Update
             .Push(x => x.Products, product)
             .Set(x => x.UpdatedAt, parameters.UpdatedAt)
@@ -23,15 +27,18 @@ public class OrderRepository(IServiceProvider serviceProvider, IOptions<MongoOpt
         var collection = base.GetCollection<OrderAggregate>();
 
         return collection.UpdateOneAsync(
-            filterId,
+            filter,
             update,
             cancellationToken: cancellationToken
          );
     }
 
-    public Task CancelOrderAsync(CancelOrderParams parameters, CancellationToken cancellationToken)
+    public Task CancelOrderAsync(CancelOrderParams parameters, Guid tenant, CancellationToken cancellationToken)
     {
-        var filterId = Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id);
+        var filter = Builders<OrderAggregate>.Filter.And(
+            Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id),
+            Builders<OrderAggregate>.Filter.Eq(x => x.Tenant, tenant)
+        );
 
         var update = Builders<OrderAggregate>.Update
             .Set(x => x.Status, parameters.OrderStatus)
@@ -40,12 +47,15 @@ public class OrderRepository(IServiceProvider serviceProvider, IOptions<MongoOpt
             .Set(x => x.UpdatedAt, parameters.UpdatedAt)
             .Set(x => x.UpdatedBy, parameters.UpdateBy);
 
-        return base.GetCollection<OrderAggregate>().UpdateOneAsync(filterId, update, cancellationToken: cancellationToken);
+        return base.GetCollection<OrderAggregate>().UpdateOneAsync(filter, update, cancellationToken: cancellationToken);
     }
 
-    public Task CompleteOrderAsync(CompleteOrderParams parameters, CancellationToken cancellationToken)
+    public Task CompleteOrderAsync(CompleteOrderParams parameters, Guid tenant, CancellationToken cancellationToken)
     {
-        var filterId = Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id);
+        var filterId = Builders<OrderAggregate>.Filter.And(
+            Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id),
+            Builders<OrderAggregate>.Filter.Eq(x => x.Tenant, tenant)
+        );
 
         var update = Builders<OrderAggregate>.Update
             .Set(x => x.CompletedAt, parameters.CompletedAt)
@@ -56,28 +66,12 @@ public class OrderRepository(IServiceProvider serviceProvider, IOptions<MongoOpt
         return base.GetCollection<OrderAggregate>().UpdateOneAsync(filterId, update, cancellationToken: cancellationToken);
     }
 
-    public Task CreateOrderAsync(OrderAggregate order, CancellationToken cancellationToken)
-    {
-        return this.CreateAsync(order, cancellationToken);
-    }
-
-    public Task<OrderAggregate> FindAsync(Guid id, CancellationToken cancellationToken)
-    {
-        var filterId = Builders<OrderAggregate>.Filter.Eq(x => x.Id, id);
-
-        return base.GetCollection<OrderAggregate>().FindAsync(filterId, cancellationToken: cancellationToken).Result.FirstOrDefaultAsync(cancellationToken);
-    }
-
-    public async Task<List<OrderAggregate>> GetAllOrdersAsync(CancellationToken cancellationToken)
+    public Task RemoveProductFromOrderAsync(RemoveProductFromOrderParams parameters, Guid tenant, CancellationToken cancellationToken)
     {
-        var result = await base.GetCollection<OrderAggregate>().FindAsync(x => true, cancellationToken: cancellationToken);
-
-        return await result.ToListAsync(cancellationToken);
-    }
-
-    public Task RemoveProductFromOrderAsync(RemoveProductFromOrderParams parameters, CancellationToken cancellationToken)
-    {
-        var filterId = Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id);
+        var filterId = Builders<OrderAggregate>.Filter.And(
+            Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id),
+            Builders<OrderAggregate>.Filter.Eq(x => x.Tenant, tenant)
+        );
 
         var update = Builders<OrderAggregate>.Update
             .PullFilter(x => x.Products, p => p.Id == parameters.IdProduct)
@@ -87,16 +81,12 @@ public class OrderRepository(IServiceProvider serviceProvider, IOptions<MongoOpt
         return base.GetCollection<OrderAggregate>().UpdateOneAsync(filterId, update, cancellationToken: cancellationToken);
     }
 
-    public Task UpdateOrderAsync(OrderAggregate order, CancellationToken cancellationToken)
-    {
-        return this.UpdateAsync(order, cancellationToken);
-    }
-
-    public Task UpdateQuantityProductAsync(UpdateQuantityProductParams parameters, CancellationToken cancellationToken)
+    public Task UpdateQuantityProductAsync(Guid id, Guid tenant, UpdateQuantityProductParams parameters, CancellationToken cancellationToken)
     {
         var filterId = Builders<OrderAggregate>.Filter.And(
-            Builders<OrderAggregate>.Filter.Eq(x => x.Id, parameters.Id),
-            Builders<OrderAggregate>.Filter.ElemMatch(x => x.Products, x => x.Id == parameters.ProductId)
+            Builders<OrderAggregate>.Filter.Eq(x => x.Id, id),
+            Builders<OrderAggregate>.Filter.Eq(x => x.Tenant, tenant),
+            Builders<OrderAggregate>.Filter.ElemMatch(x => x.Products, x => x.Id == parameters.Id)
         );
 
         var update = Builders<OrderAggregate>.Update

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/CodeDesignPlus.Net.Microservice.AsyncWorker.csproj

@@ -7,14 +7,14 @@
     <PublishAot>false</PublishAot>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.5.0-beta.60" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.5.0-beta.81" />
   </ItemGroup>
   <ItemGroup>
     <SonarQubeSetting Include="sonar.coverage.exclusions">

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/Dockerfile

@@ -0,0 +1,36 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+USER app
+WORKDIR /app
+EXPOSE 5002
+
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+# Install clang/zlib1g-dev dependencies for publishing to native
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+    clang zlib1g-dev \
+    && apt-get clean
+
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["src/domain/", "domain/"]
+COPY ["src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/", "entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/"]
+RUN dotnet restore "./entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/CodeDesignPlus.Net.Microservice.AsyncWorker.csproj"
+
+WORKDIR "/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker"
+RUN dotnet build "./CodeDesignPlus.Net.Microservice.AsyncWorker.csproj" -c "$BUILD_CONFIGURATION" -o /app/build
+
+FROM build AS publish
+WORKDIR /src
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/CodeDesignPlus.Net.Microservice.AsyncWorker.csproj" \
+    -c "$BUILD_CONFIGURATION" \
+    -o /app/publish /p:UseAppHost=true
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final
+USER app
+WORKDIR /app
+EXPOSE 5002
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "CodeDesignPlus.Net.Microservice.AsyncWorker.dll"]

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/Program.cs

@@ -29,7 +29,7 @@ builder.Services.AddMediatR<CodeDesignPlus.Net.Microservice.Application.Startup>
 
 var app = builder.Build();
 
-var home = app.MapGroup("/home");
+var home = app.MapGroup("/");
 
 home.MapGet("/", () => "Ready");
 

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/Properties/launchSettings.json

@@ -3,13 +3,13 @@
   "profiles": {
     "http": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "home",
-      "applicationUrl": "http://localhost:5246",
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5002"
+    },
   }
 }

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/appsettings.Docker.json

@@ -0,0 +1,25 @@
+{
+    "Redis": {
+      "Instances": {
+        "Core": {
+          "ConnectionString": "host.docker.internal:6379"
+        }
+      }
+    },
+    "RabbitMQ": {
+      "Host": "host.docker.internal"
+    },
+    "Logger": {
+      "OTelEndpoint": "http://host.docker.internal:4317"
+    },
+    "Observability": {
+      "ServerOtel": "http://host.docker.internal:4317"
+    },
+    "Vault": {
+      "Address": "http://host.docker.internal:8200",
+      "Mongo": {
+        "TemplateConnectionString": "mongodb://{0}:{1}@host.docker.internal:27017"
+      }
+    }
+  }
+  

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/appsettings.json

@@ -1,4 +1,12 @@
 {
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://*:5002",
+        "Protocols": "Http1"
+      }
+    }
+  },
   "Core": {
     "AppName": "ms-archetype",
     "Version": "v1",
@@ -76,54 +84,10 @@
   "Vault": {
     "Address": "http://127.0.0.1:8200",
     "AppName": "ms-archetype",
-    "Solution": "archetype",
+    "Solution": "vault",
     "Token": "root",
     "Mongo": {
       "TemplateConnectionString": "mongodb://{0}:{1}@localhost:27017"
     }
-  },
-  "Serilog": {
-    "Using": [
-      "Serilog.Sinks.Console"
-    ],
-    "Filter": [
-      {
-        "Name": "ByExcluding",
-        "Args": {
-          "expression": "RequestPath like '/health%'"
-        }
-      }
-    ],
-    "MinimumLevel": {
-      "Default": "Verbose",
-      "Override": {
-        "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning",
-        "Microsoft": "Warning",
-        "System": "Warning"
-      }
-    },
-    "Enrich": [
-      "FromLogContext"
-    ],
-    "Properties": {
-      "Category": "Event"
-    },
-    "WriteTo": [
-      {
-        "Name": "Async",
-        "Args": {
-          "configure": [
-            {
-              "Name": "Console",
-              "Args": {
-                "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
-                "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] [{Message:lj}] [{EscapedException}]{NewLine}",
-                "restrictedToMinimumLevel": "Verbose"
-              }
-            }
-          ]
-        }
-      }
-    ]
   }
 }

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/CodeDesignPlus.Net.Microservice.Rest.csproj

@@ -10,17 +10,18 @@
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.5.0-beta.60" />
+    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.5.0-beta.81" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="7.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.5.0-beta.60" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.5.0-beta.81" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="CodeDesignPlus.Net.Microservice.Rest.Test" />

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/Dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER app
 WORKDIR /app
-EXPOSE 8080
+EXPOSE 5000
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 # Install clang/zlib1g-dev dependencies for publishing to native
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -14,8 +14,8 @@ RUN apt-get update \
 
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["domain/", "domain/"]
-COPY ["entrypoints/CodeDesignPlus.Net.Microservice.Rest/", "entrypoints/CodeDesignPlus.Net.Microservice.Rest/"]
+COPY ["src/domain/", "domain/"]
+COPY ["src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/", "entrypoints/CodeDesignPlus.Net.Microservice.Rest/"]
 RUN dotnet restore "./entrypoints/CodeDesignPlus.Net.Microservice.Rest/CodeDesignPlus.Net.Microservice.Rest.csproj"
 
 WORKDIR "/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest"
@@ -28,10 +28,9 @@ RUN dotnet publish "./entrypoints/CodeDesignPlus.Net.Microservice.Rest/CodeDesig
     -c "$BUILD_CONFIGURATION" \
     -o /app/publish /p:UseAppHost=true
 
-
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final
 USER app
 WORKDIR /app
-EXPOSE 8080
+EXPOSE 5000
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "CodeDesignPlus.Net.Microservice.Rest.dll"]

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/Program.cs

@@ -4,6 +4,8 @@ using CodeDesignPlus.Net.Microservice.Commons.FluentValidation;
 using CodeDesignPlus.Net.Microservice.Commons.MediatR;
 using CodeDesignPlus.Net.Redis.Cache.Extensions;
 using CodeDesignPlus.Net.Vault.Extensions;
+using NodaTime;
+using NodaTime.Serialization.SystemTextJson;
 
 var builder = WebApplication.CreateSlimBuilder(args);
 
@@ -13,7 +15,10 @@ builder.Host.UseSerilog();
 
 builder.Configuration.AddVault();
 
-builder.Services.AddControllers();
+builder.Services
+    .AddControllers()
+    .AddJsonOptions(opt => opt.JsonSerializerOptions.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb));
+
 
 builder.Services.AddEndpointsApiExplorer();
 

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/Properties/launchSettings.json

@@ -5,19 +5,17 @@
       "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "VAULT_ROLE_ID": "vault_role_id",
-        "VAULT_SECRET_ID": "vault_secret_id",
+        "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5175"
+      "applicationUrl": "http://localhost:5000"
     },
     "Docker": {
       "commandName": "Docker",
       "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
       "environmentVariables": {
-        "ASPNETCORE_HTTP_PORTS": "8080"
+        "ASPNETCORE_HTTP_PORTS": "5000"
       },
       "publishAllPorts": true
     }

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/appsettings.Docker.json

@@ -0,0 +1,25 @@
+{
+    "Redis": {
+      "Instances": {
+        "Core": {
+          "ConnectionString": "host.docker.internal:6379"
+        }
+      }
+    },
+    "RabbitMQ": {
+      "Host": "host.docker.internal"
+    },
+    "Logger": {
+      "OTelEndpoint": "http://host.docker.internal:4317"
+    },
+    "Observability": {
+      "ServerOtel": "http://host.docker.internal:4317"
+    },
+    "Vault": {
+      "Address": "http://host.docker.internal:8200",
+      "Mongo": {
+        "TemplateConnectionString": "mongodb://{0}:{1}@host.docker.internal:27017"
+      }
+    }
+  }
+  

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/appsettings.json

@@ -1,5 +1,13 @@
 {
   "AllowedHosts": "*",
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://*:5000",
+        "Protocols": "Http1"
+      }
+    }
+  },
   "Core": {
     "AppName": "ms-archetype",
     "Version": "v1",
@@ -50,11 +58,11 @@
   },  
   "Logger": {
     "Enable": true,
-    "OTelEndpoint": "http://127.0.0.1:4317"
+    "OTelEndpoint": "http://localhost:4317"
   },
   "Observability": {
     "Enable": true,
-    "ServerOtel": "http://127.0.0.1:4317",
+    "ServerOtel": "http://localhost:4317",
     "Trace": {
       "Enable": true,
       "AspNetCore": true,
@@ -71,9 +79,9 @@
   },
   "Vault": {
     "Enable": true,
-    "Address": "http://127.0.0.1:8200",
+    "Address": "http://localhost:8200",
     "AppName": "ms-archetype",
-    "Solution": "archetype",
+    "Solution": "vault",
     "Token": "root",
     "Mongo": {
       "Enable": true,