generator-codedesignplus 0.1.0-beta.2 → 0.1.1-alpha.1

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

@@ -3,16 +3,17 @@
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Protobuf_UseNodaTime>true</Protobuf_UseNodaTime>
   </PropertyGroup>
   <ItemGroup Label="Protos">
     <Protobuf Include="Protos\orders.proto" GrpcServices="Server" />
   </ItemGroup>
   <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.Microservice.Commons" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.5.0-beta.81" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
     <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.67.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.68.1">
+    <PackageReference Include="Grpc.Tools" Version="2.69.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -24,12 +25,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\domain\CodeDesignPlus.Net.Microservice.Infrastructure\CodeDesignPlus.Net.Microservice.Infrastructure.csproj" />
-    <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.Exceptions" Version="0.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.5.0-beta.60" />
+    <PackageReference Include="NodaTime.Serialization.Protobuf" Version="2.0.2" />
+    <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.Exceptions" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.5.0-beta.81" />
   </ItemGroup>
 </Project>

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/Core/Mapster/MapsterConfig.cs

@@ -1,11 +1,19 @@
-namespace CodeDesignPlus.Net.Microservice.gRpc.Core.Mapster;
+using NodaTime;
+using NodaTime.Serialization.Protobuf;
+
+namespace CodeDesignPlus.Net.Microservice.gRpc.Core.Mapster;
 
 public static class MapsterConfig
 {
     public static void Configure()
     {
         TypeAdapterConfig<Net.Core.Abstractions.Models.Criteria.Criteria, Net.Core.Abstractions.Models.Criteria.Criteria>.NewConfig().TwoWays();
-        TypeAdapterConfig<OrderDto, Order>.NewConfig().TwoWays();
+        TypeAdapterConfig<OrderDto, Order>
+            .NewConfig()
+            .Map(dest => dest.CreatedAt, src => src.CreatedAt.ToTimestamp())
+            .Map(dest => dest.UpdatedAt, src => (src.UpdatedAt ?? Instant.MinValue).ToTimestamp())
+            .Map(dest => dest.CompletedAt, src => (src.CompletedAt ?? Instant.MinValue).ToTimestamp())
+            .Map(dest => dest.CancelledAt, src => (src.CancelledAt ?? Instant.MinValue).ToTimestamp());
 
         TypeAdapterConfig<ClientDto, Client>.NewConfig().TwoWays();
         TypeAdapterConfig<ProductDto, Product>.NewConfig().TwoWays();

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/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 8080
+
+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.gRpc/", "entrypoints/CodeDesignPlus.Net.Microservice.gRpc/"]
+RUN dotnet restore "./entrypoints/CodeDesignPlus.Net.Microservice.gRpc/CodeDesignPlus.Net.Microservice.gRpc.csproj"
+
+WORKDIR "/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc"
+RUN dotnet build "./CodeDesignPlus.Net.Microservice.gRpc.csproj" -c "$BUILD_CONFIGURATION" -o /app/build
+
+FROM build AS publish
+WORKDIR /src
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./entrypoints/CodeDesignPlus.Net.Microservice.gRpc/CodeDesignPlus.Net.Microservice.gRpc.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 8080
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "CodeDesignPlus.Net.Microservice.gRpc.dll"]

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

@@ -19,7 +19,6 @@ builder.Host.UseSerilog();
 
 builder.Configuration.AddVault();
 
-// Add services to the container.
 builder.Services.AddGrpc(options =>
 {
     options.Interceptors.Add<ErrorInterceptor>();
@@ -43,8 +42,7 @@ var app = builder.Build();
 
 app.UseAuth();
 
-// Configure the HTTP request pipeline.
-app.MapGrpcService<OrdersService>().RequireAuthorization();
+app.MapGrpcService<OrderService>().RequireAuthorization();
 
 if (app.Environment.IsDevelopment())
 {

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

@@ -4,17 +4,8 @@
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5103",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7263;http://localhost:5103",
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/Protos/orders.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 
 import "google/protobuf/wrappers.proto";
-import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "CodeDesignPlus.Net.Microservice.gRpc";
 
@@ -20,7 +20,7 @@ enum OrderStatus
     Created = 1;
     Pending = 2;
     Completed = 3;
-    Cancelled= 4;
+    Cancelled = 4;
 }
 
 // The orders service definition.
@@ -39,16 +39,16 @@ message GetOrderResponse {
 
 message Order {
   string id = 1;
-  google.protobuf.Int64Value completed_at = 2;
-  google.protobuf.Int64Value cancelled_at = 3;
+  google.protobuf.Timestamp completed_at = 2;
+  google.protobuf.Timestamp cancelled_at = 3;
   Client client = 4;
   repeated Product products = 5;
   OrderStatus status = 6;
   google.protobuf.StringValue reason_for_cancellation = 7;
-  int64 created_at = 8;
+  google.protobuf.Timestamp created_at = 8;
   string created_by = 9;
-  int64 updated_at = 10;
-  string updated_by = 11;
+  optional google.protobuf.Timestamp updated_at = 10;
+  optional string updated_by = 11;
   bool is_active = 12;
 }
 

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/Services/OrderService.cs

@@ -1,7 +1,6 @@
-
 namespace CodeDesignPlus.Net.Microservice.gRpc.Services;
 
-public class OrdersService(IMediator mediator, IMapper mapper) : Orders.OrdersBase
+public class OrderService(IMediator mediator, IMapper mapper) : Orders.OrdersBase
 {
     public override async Task GetOrder(IAsyncStreamReader<GetOrderRequest> requestStream, IServerStreamWriter<GetOrderResponse> responseStream, ServerCallContext context)
     {

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/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.gRpc/appsettings.json

@@ -1,9 +1,6 @@
 {
   "Kestrel": {
     "Endpoints": {
-      "Http": {
-        "Url": "http://*:5000"
-      },
       "Http2": {
         "Url": "http://*:5001",
         "Protocols": "Http2"
@@ -81,12 +78,17 @@
     }
   },
   "Vault": {
+    "Enable": true,
     "Address": "http://127.0.0.1:8200",
     "AppName": "ms-archetype",
-    "Solution": "archetype",
+    "Solution": "vault",
     "Token": "root",
     "Mongo": {
+      "Enable": true,
       "TemplateConnectionString": "mongodb://{0}:{1}@localhost:27017"
+    },
+    "RabbitMQ": {
+      "Enable": true
     }
   }
-}
+}

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.AsyncWorker.Test/CodeDesignPlus.Net.Microservice.AsyncWorker.Test.csproj

@@ -7,16 +7,16 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.5.0-beta.60" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.5.0-beta.81" />
     <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.Rest.Test/CodeDesignPlus.Net.Microservice.Rest.Test.csproj

@@ -7,17 +7,17 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.5.0-beta.60" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.5.0-beta.81" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
     <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.Rest.Test/Controllers/OrderControllerTest.cs

@@ -3,10 +3,10 @@
 public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Program>>
 {
     public OrderControllerTest(Server<Program> server) : base(server)
-    {
+    {        
         server.InMemoryCollection = (x) =>
         {
-            x.Add("Vault:Enabled", "false");
+            x.Add("Vault:Enable", "false");
             x.Add("Vault:Address", "http://localhost:8200");
             x.Add("Vault:Token", "root");
             x.Add("Solution", "CodeDesignPlus");
@@ -30,7 +30,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
 
         var json = await response.Content.ReadAsStringAsync();
 
-        var orders = Newtonsoft.Json.JsonConvert.DeserializeObject<IEnumerable<OrderDto>>(json);
+        var orders = JsonSerializer.Deserialize<IEnumerable<OrderDto>>(json);
 
         Assert.NotNull(orders);
         Assert.NotEmpty(orders);
@@ -50,7 +50,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
 
         var json = await response.Content.ReadAsStringAsync();
 
-        var order = Newtonsoft.Json.JsonConvert.DeserializeObject<OrderDto>(json);
+        var order = JsonSerializer.Deserialize<OrderDto>(json);
 
         Assert.NotNull(order);
         Assert.Equal(orderCreated.Id, order.Id);
@@ -82,13 +82,13 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
             }
         };
 
-        var json = Newtonsoft.Json.JsonConvert.SerializeObject(data);
+        var json = JsonSerializer.Serialize(data);
 
         var content = new StringContent(json, Encoding.UTF8, "application/json");
 
         var response = await this.RequestAsync("http://localhost/api/Orders", tenant, content, HttpMethod.Post);
 
-        var order = await this.GetRecordAsync(data.Id);
+        var order = await this.GetRecordAsync(data.Id, tenant);
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
@@ -98,8 +98,8 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         Assert.Equal(data.Client.Id, order.Client.Id);
         Assert.NotEqual(Guid.Empty, order.CreatedBy);
         Assert.Equal(Guid.Empty, order.UpdatedBy);
-        Assert.NotEqual(0, order.CreatedAt);
-        Assert.Equal(0, order.UpdatedAt);
+        Assert.True(order.CreatedAt > Instant.MinValue);
+        Assert.Null(order.UpdatedAt);
     }
 
     [Fact]
@@ -116,7 +116,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         // Act
         var response = await this.RequestAsync($"http://localhost/api/Orders/{orderCreated.Id}/cancel", tenant, content, HttpMethod.Delete);
 
-        var order = await this.GetRecordAsync(orderCreated.Id);
+        var order = await this.GetRecordAsync(orderCreated.Id, tenant);
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
@@ -125,8 +125,8 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         Assert.NotNull(order.CancelledAt);
         Assert.NotEqual(Guid.Empty, order.CreatedBy);
         Assert.NotEqual(Guid.Empty, order.UpdatedBy);
-        Assert.NotEqual(0, order.CreatedAt);
-        Assert.NotEqual(0, order.UpdatedAt);
+        Assert.True(order.CreatedAt > Instant.MinValue);
+        Assert.True(order.UpdatedAt > Instant.MinValue);
     }
 
     [Fact]
@@ -139,7 +139,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         // Act
         var response = await this.RequestAsync($"http://localhost/api/Orders/{orderCreated.Id}/complete", tenant, null, HttpMethod.Patch);
 
-        var order = await this.GetRecordAsync(orderCreated.Id);
+        var order = await this.GetRecordAsync(orderCreated.Id, tenant);
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
@@ -147,8 +147,8 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         Assert.NotNull(order.CompletedAt);
         Assert.NotEqual(Guid.Empty, order.CreatedBy);
         Assert.NotEqual(Guid.Empty, order.UpdatedBy);
-        Assert.NotEqual(0, order.CreatedAt);
-        Assert.NotEqual(0, order.UpdatedAt);
+        Assert.True(order.CreatedAt > Instant.MinValue);
+        Assert.True(order.UpdatedAt > Instant.MinValue);
     }
 
     [Fact]
@@ -173,7 +173,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         // Act
         var response = await this.RequestAsync($"http://localhost/api/Orders/{orderCreated.Id}/products", tenant, content, HttpMethod.Post);
 
-        var order = await this.GetRecordAsync(orderCreated.Id);
+        var order = await this.GetRecordAsync(orderCreated.Id, tenant);
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
@@ -185,8 +185,8 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         Assert.Equal(addProduct.Quantity, order.Products.First().Quantity);
         Assert.NotEqual(Guid.Empty, order.CreatedBy);
         Assert.NotEqual(Guid.Empty, order.UpdatedBy);
-        Assert.NotEqual(0, order.CreatedAt);
-        Assert.NotEqual(0, order.UpdatedAt);
+        Assert.True(order.CreatedAt > Instant.MinValue);
+        Assert.True(order.UpdatedAt > Instant.MinValue);
     }
 
     [Fact]
@@ -222,7 +222,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         // Act
         var response = await this.RequestAsync($"http://localhost/api/Orders/{orderCreated.Id}/products/{addProduct.IdProduct}", tenant, content, HttpMethod.Put);
 
-        var order = await this.GetRecordAsync(orderCreated.Id);
+        var order = await this.GetRecordAsync(orderCreated.Id, tenant);
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
@@ -230,8 +230,8 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         Assert.Equal(updateQuantity.Quantity, order.Products.First().Quantity);
         Assert.NotEqual(Guid.Empty, order.CreatedBy);
         Assert.NotEqual(Guid.Empty, order.UpdatedBy);
-        Assert.NotEqual(0, order.CreatedAt);
-        Assert.NotEqual(0, order.UpdatedAt);
+        Assert.True(order.CreatedAt > Instant.MinValue);
+        Assert.True(order.UpdatedAt > Instant.MinValue);
     }
 
     [Fact]
@@ -258,20 +258,20 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         // Act
         var response = await this.RequestAsync($"http://localhost/api/Orders/{orderCreated.Id}/products/{addProduct.IdProduct}", tenant, null, HttpMethod.Delete);
 
-        var order = await this.GetRecordAsync(orderCreated.Id);
+        var order = await this.GetRecordAsync(orderCreated.Id, tenant);
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
         Assert.Empty(order.Products);
         Assert.NotEqual(Guid.Empty, order.CreatedBy);
         Assert.NotEqual(Guid.Empty, order.UpdatedBy);
-        Assert.NotEqual(0, order.CreatedAt);
-        Assert.NotEqual(0, order.UpdatedAt);
+        Assert.True(order.CreatedAt > Instant.MinValue);
+        Assert.True(order.UpdatedAt > Instant.MinValue);
     }
 
     private static StringContent BuildBody(object data)
     {
-        var json = Newtonsoft.Json.JsonConvert.SerializeObject(data);
+        var json = JsonSerializer.Serialize(data);
 
         var content = new StringContent(json, Encoding.UTF8, "application/json");
 
@@ -300,7 +300,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
             }
         };
 
-        var json = Newtonsoft.Json.JsonConvert.SerializeObject(data);
+        var json = JsonSerializer.Serialize(data);
 
         var content = new StringContent(json, Encoding.UTF8, "application/json");
 
@@ -309,13 +309,13 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
         return data;
     }
 
-    private async Task<OrderDto> GetRecordAsync(Guid id)
+    private async Task<OrderDto> GetRecordAsync(Guid id, Guid tenant)
     {
-        var response = await this.RequestAsync($"http://localhost/api/Orders/{id}", Guid.NewGuid(), null, HttpMethod.Get);
+        var response = await this.RequestAsync($"http://localhost/api/Orders/{id}", tenant, null, HttpMethod.Get);
 
         var json = await response.Content.ReadAsStringAsync();
 
-        return Newtonsoft.Json.JsonConvert.DeserializeObject<OrderDto>(json)!;
+        return JsonSerializer.Deserialize<OrderDto>(json)!;
     }
 
     private async Task<HttpResponseMessage> RequestAsync(string uri, Guid tenant, HttpContent? content, HttpMethod method)

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.Rest.Test/Usings.cs

@@ -4,5 +4,6 @@ global using System.Net;
 global using System.Net.Http.Headers;
 global using System.Text;
 global using CodeDesignPlus.Net.Serializers;
+global using NodaTime;
 
 global using CodeDesignPlus.Net.Microservice.Application.Order.DataTransferObjects;

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.gRpc.Test/CodeDesignPlus.Net.Microservice.gRpc.Test.csproj

@@ -5,25 +5,27 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <Protobuf_UseNodaTime>true</Protobuf_UseNodaTime>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Google.Protobuf" Version="3.29.2" />
+    <PackageReference Include="Google.Protobuf" Version="3.29.3" />
     <PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.68.1">
+    <PackageReference Include="Grpc.Tools" Version="2.69.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.5.0-beta.60" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
+    <PackageReference Include="NodaTime.Serialization.Protobuf" Version="2.0.2" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.5.0-beta.81" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.gRpc.Test/Protos/orders.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 
-
 import "google/protobuf/wrappers.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "CodeDesignPlus.Net.Microservice.gRpc.Test";
 
@@ -19,7 +20,7 @@ enum OrderStatus
     Created = 1;
     Pending = 2;
     Completed = 3;
-    Cancelled= 4;
+    Cancelled = 4;
 }
 
 // The orders service definition.
@@ -38,16 +39,16 @@ message GetOrderResponse {
 
 message Order {
   string id = 1;
-  google.protobuf.Int64Value completed_at = 2;
-  google.protobuf.Int64Value cancelled_at = 3;
+  google.protobuf.Timestamp completed_at = 2;
+  google.protobuf.Timestamp cancelled_at = 3;
   Client client = 4;
   repeated Product products = 5;
   OrderStatus status = 6;
   google.protobuf.StringValue reason_for_cancellation = 7;
-  int64 created_at = 8;
+  google.protobuf.Timestamp created_at = 8;
   string created_by = 9;
-  int64 updated_at = 10;
-  string updated_by = 11;
+  optional google.protobuf.Timestamp updated_at = 10;
+  optional string updated_by = 11;
   bool is_active = 12;
 }
 

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.gRpc.Test/Services/{OrdersServiceTest.cs → OrderServiceTest.cs}

@@ -1,14 +1,16 @@
 using CodeDesignPlus.Net.Microservice.Domain.ValueObjects;
+using NodaTime;
+using NodaTime.Serialization.Protobuf;
 
 namespace CodeDesignPlus.Net.Microservice.gRpc.Test.Services;
 
-public class OrdersServiceTest : ServerBase<Program>, IClassFixture<Server<Program>>
+public class OrderServiceTest : ServerBase<Program>, IClassFixture<Server<Program>>
 {
-    public OrdersServiceTest(Server<Program> server) : base(server)
+    public OrderServiceTest(Server<Program> server) : base(server)
     {
         server.InMemoryCollection = (x) =>
         {
-            x.Add("Vault:Enabled", "false");
+            x.Add("Vault:Enable", "false");
             x.Add("Vault:Address", "http://localhost:8200");
             x.Add("Vault:Token", "root");
             x.Add("Solution", "CodeDesignPlus");
@@ -32,7 +34,12 @@ public class OrdersServiceTest : ServerBase<Program>, IClassFixture<Server<Progr
 
         await repository.CreateAsync(orderExpected, CancellationToken.None);
 
-        using var streamingCall = orderClient.GetOrder();
+        var metadata = new Metadata
+        {
+            new("X-Tenant", orderExpected.Tenant.ToString())
+        };
+
+        using var streamingCall = orderClient.GetOrder(metadata);
 
         _ = Task.Run(async () =>
         {
@@ -43,7 +50,7 @@ public class OrdersServiceTest : ServerBase<Program>, IClassFixture<Server<Progr
                 Assert.Equal(orderExpected.Client.Id.ToString(), response.Order.Client.Id);
                 Assert.Equal(orderExpected.Client.Name, response.Order.Client.Name);
                 Assert.Equal(orderExpected.CreatedBy.ToString(), response.Order.CreatedBy);
-                Assert.True(response.Order.CreatedAt > 0);
+                Assert.True(response.Order.CreatedAt.ToInstant() > Instant.MinValue);
 
                 isInvoked = true;
             }
@@ -54,7 +61,7 @@ public class OrdersServiceTest : ServerBase<Program>, IClassFixture<Server<Progr
             Id = orderExpected.Id.ToString()
         });
 
-        await Task.Delay(1000);
+        await Task.Delay(2000);
 
         await streamingCall.RequestStream.CompleteAsync();