generator-codedesignplus 0.5.0 → 0.6.0-beta.13

package/generators/microservice/core/appsettings.mjs

@@ -1,3 +1,5 @@
+import { randomUUID } from 'crypto';
+import { glob } from 'glob';
 import path from 'path';
 
 export default class AppSettingsGenerator {
@@ -10,42 +12,65 @@ export default class AppSettingsGenerator {
 
     async generate(options, sources = []) {
 
-        if(sources.length === 0) {
+        if (sources.length === 0) {
             sources = [
-                options.paths.src.rest,
-                options.paths.src.grpc,
-                options.paths.src.asyncWorker
+                options.paths.src.rest
             ];
+
+            if (options.enableGrpc)
+                sources.push(options.paths.src.grpc);
+
+            if (options.enableAsyncWorker)
+                sources.push(options.paths.src.asyncWorker);
         }
 
         const destination = this._generator.destinationPath();
 
         sources.forEach(source => {
 
-            const appSettingsFile = path.join(destination, source, 'appsettings.json');
-
-            const json = this._generator.fs.readJSON(appSettingsFile, {});
-
-            json.Core.AppName = options.appSettings.appName;
-            json.Core.Description = options.appSettings.description;
-            json.Core.Business = options.appSettings.business;
-            json.Core.Contact.Name = options.appSettings.contact.name;
-            json.Core.Contact.Email = options.appSettings.contact.email;
-            json.Vault.Solution = options.appSettings.vault;
-            json.Vault.AppName = options.appSettings.appName;
-            json.Mongo.Database = options.appSettings.database;
-
-            this._generator.fs.writeJSON(appSettingsFile, json);
+            const files = glob.sync('appsettings.*', { dot: true, nodir: true, cwd: path.join(destination, source) });
+
+            files.forEach(file => {
+
+                const appSettingsFile = path.join(destination, source, file);
+
+                const json = this._generator.fs.readJSON(appSettingsFile, {});
+
+                if (json.Core) {
+                    if (json.Core.Id)
+                        json.Core.Id = randomUUID().toString();
+                    if (json.Core.AppName)
+                        json.Core.AppName = options.appSettings.appName;
+                    if (json.Core.Description)
+                        json.Core.Description = options.appSettings.description;
+                    if (json.Core.Business)
+                        json.Core.Business = options.appSettings.business;
+                    if (json.Core.Contact?.Name)
+                        json.Core.Contact.Name = options.appSettings.contact.name;
+                    if (json.Core.Contact?.Email)
+                        json.Core.Contact.Email = options.appSettings.contact.email;
+                }
+                if (json.Vault) {
+                    json.Vault.Solution = options.appSettings.vault;
+                    json.Vault.AppName = options.appSettings.appName;
+                }
+                if (json.Mongo) {
+                    json.Mongo.Database = options.appSettings.database;
+                }
+
+                this._generator.fs.writeJSON(appSettingsFile, json);
+
+            });
         });
 
         try {
-            this._updateConfigVault(path.join('tools', 'vault','config-vault.ps1'), options);
-            this._updateConfigVault(path.join('tools', 'vault','config-vault.sh'), options);
+            this._updateConfigVault(path.join('tools', 'vault', 'config-vault.ps1'), options);
+            this._updateConfigVault(path.join('tools', 'vault', 'config-vault.sh'), options);
             this._updateReadme(options);
         } catch (error) {
             console.log('The vault configuration could not be updated.');
             console.log(error);
-        }    
+        }
     }
 
     _updateConfigVault(file, options) {

package/generators/microservice/core/grpc.mjs

@@ -59,8 +59,6 @@ export default class GrpcGenerator {
         
         const files = glob.sync('**', { dot: true, nodir: true, cwd: templateGrpcProject, ignore: ignores });
 
-        console.log(templateGrpcProject, files);
-
         await this._utils.generateFiles(options, options.solution, templateGrpcProject, grpcProjectPathDestination, files);
 
         await this._appsettings.generate(options, [options.paths.src.grpc]);

package/generators/microservice/core/utils.mjs

@@ -164,6 +164,7 @@ export default class Utils {
             [/global using CodeDesignPlus\.Net\.Microservice\.Application\.Order\.Queries\.GetAllOrders;/g, ''],
             [/app\.MapGrpcService<OrdersService>\(\)/g, `app.MapGrpcService<${options.proto?.name}Service>()`],
             [/Order/g, options.aggregate.name],
+            [/ms-archetype/g, `${options.appSettings.appName}`],
             ...transformations
         ]
     }
@@ -178,6 +179,7 @@ export default class Utils {
                 .replace(/CodeDesignPlus\.Net\.Microservice/g, namespace)
                 .replace(/Order/g, options.microservice)
                 .replace(/orders.proto/g, options.proto?.file)
+                .replace(/ms-archetype/g, `${options.appSettings.appName }`)
             );
 
             const content = await fs.readFile(src, { encoding: 'utf-8' });

package/generators/microservice/templates/microservice/-gitignore

@@ -0,0 +1,57 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+dist
+tmp
+/out-tsc
+
+# dependencies
+node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+**/coverage.opencover.xml
+**/bin
+**/obj
+**/doc[sS]
+**/.vs
+.env
+
+.scannerwork
+.nx
+.$packages.drawio.bkp
+
+.vs
+.sonarqube
+resources/prom_rw
+resources/shared/vault-config
+resources/shared/vault-data
+**/*.user

package/generators/microservice/templates/microservice/.dockerignore

@@ -0,0 +1,30 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+!**/.gitignore
+!.git/HEAD
+!.git/config
+!.git/packed-refs
+!.git/refs/heads/**

package/generators/microservice/templates/microservice/.github/workflows/ca.yaml

@@ -0,0 +1,51 @@
+name: Continuous DeploymentAdd commentMore actions
+
+on: 
+  workflow_dispatch:
+    inputs:
+      environment:
+        type: choice
+        description: Select the environment to deploy to
+        default: Staging
+        options: 
+        - Staging
+        - Production
+ 
+permissions:
+  contents: write
+  packages: write
+  repository-projects: write
+  id-token: write
+
+jobs:
+
+  version:
+    uses: codedesignplus/workflows/.github/workflows/release.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: ${{ github.event.inputs.environment }}
+    secrets: inherit
+
+  container:
+    needs: version
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/dev' }}
+    uses: codedesignplus/workflows/.github/workflows/container-image.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: ${{ github.event.inputs.environment }}
+    secrets: inherit
+  
+  deploy:
+    needs: container
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/dev' }}
+    uses: codedesignplus/workflows/.github/workflows/deploy-self-host.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      enable-rest: true
+      enable-grpc: true
+      enable-worker: true
+      environment: ${{ github.event.inputs.environment }}
+    secrets: inherit

package/generators/microservice/templates/microservice/.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: Continuous IntegrationAdd commentMore actions
+
+on: 
+  push:
+    branches:
+      - main
+      - rc
+      - dev
+      - feature/*  
+ 
+permissions:
+  contents: write
+  packages: write
+  repository-projects: write
+
+jobs:
+  build:
+    uses: codedesignplus/workflows/.github/workflows/build-microservice.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: Development
+    secrets: inherit
+  
+  sonarqube:
+    needs: build
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/dev' }}
+    uses: codedesignplus/workflows/.github/workflows/sonarqube.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: Development
+    secrets: inherit

package/generators/microservice/templates/microservice/CodeDesignPlus.Net.Microservice.sln

@@ -52,15 +52,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeDesignPlus.Net.Microser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeDesignPlus.Net.Microservice.Rest.Test", "tests\unit\CodeDesignPlus.Net.Microservice.Rest.Test\CodeDesignPlus.Net.Microservice.Rest.Test.csproj", "{86BB4D11-6C2F-44CA-B7DF-527FDFE79959}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9C6578E7-E4FE-79BB-1635-F363CC1E80DD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{E7A3C856-6834-D657-F2F0-05592DF2DDE9}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\ci.yml = .github\workflows\ci.yml
-		.github\workflows\chart.yaml = .github\workflows\chart.yaml
-		.github\workflows\build.yml = .github\workflows\build.yml
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -157,7 +148,6 @@ Global
 		{223DF4AA-8E95-4624-B439-EA232409E903} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
 		{B190F800-89F0-43CD-B9BD-3EDD0C2E4B37} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
 		{86BB4D11-6C2F-44CA-B7DF-527FDFE79959} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
-		{E7A3C856-6834-D657-F2F0-05592DF2DDE9} = {9C6578E7-E4FE-79BB-1635-F363CC1E80DD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {91BAB16E-7151-425E-919F-2725C0813642}

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.0.1
 appVersion: "0.0.1"
 dependencies:
   - name: ms-base
-    version: 0.0.1
+    version: 0.0.10
     repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/Production.yaml

@@ -32,7 +32,15 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
+      - name: grpc
+        port: 5001
+        targetPort: grpc
+        protocol: TCP
 
   ingress:
     enabled: false

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/Staging.yaml

@@ -32,7 +32,15 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
+      - name: grpc
+        port: 5001
+        targetPort: grpc
+        protocol: TCP
 
   ingress:
     enabled: false

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.0.1
 appVersion: "0.0.1"
 dependencies:
   - name: ms-base
-    version: 0.0.1
+    version: 0.0.10
     repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/Production.yaml

@@ -32,7 +32,11 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
 
   ingress:
     enabled: false
@@ -96,7 +100,7 @@ ms-base:
     hosts:
       - services.codedesignplus.com
     gateways:
-      - istio-ingress/services-gateway
+      - istio-ingress/istio-gateway
     http:
     - name: ms-archetype
       match:
@@ -106,6 +110,6 @@ ms-base:
         uri: /
       route:
       - destination:
-          host: ms-archetype-rest.default.svc.cluster.local
+          host: ms-archetype-rest.urbancore.svc.cluster.local
           port:
             number: 5000

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/Staging.yaml

@@ -32,7 +32,11 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
 
   ingress:
     enabled: false
@@ -96,7 +100,7 @@ ms-base:
     hosts:
       - services.codedesignplus.com
     gateways:
-      - istio-ingress/services-gateway
+      - istio-ingress/istio-gateway
     http:
     - name: ms-archetype
       match:
@@ -106,6 +110,6 @@ ms-base:
         uri: /
       route:
       - destination:
-          host: ms-archetype-rest.default.svc.cluster.local
+          host: ms-archetype-rest.urbancore.svc.cluster.local
           port:
             number: 5000

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.0.1
 appVersion: "0.0.1"
 dependencies:
   - name: ms-base
-    version: 0.0.1
+    version: 0.0.10
     repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/Production.yaml

@@ -32,7 +32,11 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
 
   ingress:
     enabled: false

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/Staging.yaml

@@ -32,7 +32,11 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
 
   ingress:
     enabled: false

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/CodeDesignPlus.Net.Microservice.Application.csproj

@@ -5,10 +5,10 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.6.0" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.6.0" />
-		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.6.0" />
-		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.6.0" />
+		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.7.0-beta.33" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.7.0-beta.33" />
+		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.7.0-beta.33" />
+		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.7.0-beta.33" />
 		<PackageReference Include="Mapster" Version="7.4.0" />
 		<PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
 		<PackageReference Include="MediatR" Version="12.5.0" />

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Errors.cs

@@ -1,10 +1,8 @@
-using CodeDesignPlus.Net.Core.Abstractions;
-
-namespace CodeDesignPlus.Net.Microservice.Application;
+namespace CodeDesignPlus.Net.Microservice.Application;
 
 public class Errors: IErrorCodes
 {
     public const string OrderNotFound = "200 : The order does not exist.";
     public const string OrderAlreadyExists = "201 : The order already exists.";
-    public const string ClientIsNull = "300 : The client is null.";
+    public const string ClientIsNull = "300 : The client is null."; 
 }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Setup/MapsterConfig.cs

@@ -27,7 +27,6 @@ public static class MapsterConfigOrder
             .Map(dest => dest.UpdatedBy, src => src.UpdatedBy)
             .Map(dest => dest.ReasonForCancellation, src => src.ReasonForCancellation);
 
-        
         TypeAdapterConfig<CodeDesignPlus.Microservice.Api.Dtos.AddProductToOrderDto, AddProductToOrderCommand>.NewConfig().TwoWays();
         TypeAdapterConfig<CodeDesignPlus.Microservice.Api.Dtos.CancelOrderDto, CancelOrderCommand>.NewConfig().TwoWays();
         TypeAdapterConfig<CodeDesignPlus.Microservice.Api.Dtos.CreateOrderDto, CreateOrderCommand>.NewConfig().TwoWays();

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

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Mongo" Version="0.6.0" /> 
+    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Mongo" Version="0.7.0-beta.33" /> 
   </ItemGroup>
 </Project>

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

@@ -1,8 +1,18 @@
+using Newtonsoft.Json;
+
 namespace CodeDesignPlus.Net.Microservice.Domain.ValueObjects;
 
 public sealed partial class AddressValueObject
 {
-    public AddressValueObject(string country, string state, string city, string address, int codePostal)
+
+    public string Country { get; private set; }
+    public string State { get; private set; }
+    public string City { get; private set; }
+    public string Address { get; private set; }
+    public int CodePostal { get; private set; }
+
+    [JsonConstructor]
+    private AddressValueObject(string country, string state, string city, string address, int codePostal)
     {
         this.Country = country;
         this.State = state;
@@ -11,11 +21,6 @@ public sealed partial class AddressValueObject
         this.CodePostal = codePostal;
     }
 
-    public string Country { get; private set; }
-    public string State { get; private set; }
-    public string City { get; private set; }
-    public string Address { get; private set; }
-    public int CodePostal { get; private set; }
 
     public static AddressValueObject Create(string country, string state, string city, string address, int codePostal)
     {

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

@@ -1,8 +1,16 @@
+using Newtonsoft.Json;
+
 namespace CodeDesignPlus.Net.Microservice.Domain.ValueObjects;
 
-    public sealed partial class ClientValueObject
+public sealed partial class ClientValueObject
 {
-    public ClientValueObject(Guid id, string name, string document, string typeDocument)
+    public Guid Id { get; private set; }
+    public string Name { get; private set; }
+    public string Document { get; private set; }
+    public string TypeDocument { get; private set; }
+
+    [JsonConstructor]
+    private ClientValueObject(Guid id, string name, string document, string typeDocument)
     {
         this.Id = id;
         this.Name = name;
@@ -10,11 +18,6 @@ namespace CodeDesignPlus.Net.Microservice.Domain.ValueObjects;
         this.TypeDocument = typeDocument;
     }
 
-    public Guid Id { get; private set; }
-    public string Name { get; private set; }
-    public string Document { get; private set; }
-    public string TypeDocument { get; private set; }
-
     public static ClientValueObject Create(Guid id, string name, string document, string typeDocument)
     {
         DomainGuard.GuidIsEmpty(id, Errors.IdClientIsInvalid);

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.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.7.0-beta.33" />
   </ItemGroup>
   <ItemGroup>
     <SonarQubeSetting Include="sonar.coverage.exclusions">

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

@@ -1,7 +1,9 @@
 using CodeDesignPlus.Net.Logger.Extensions;
 using CodeDesignPlus.Net.Microservice.Commons.FluentValidation;
+using CodeDesignPlus.Net.Microservice.Commons.HealthChecks;
 using CodeDesignPlus.Net.Microservice.Commons.MediatR;
 using CodeDesignPlus.Net.Mongo.Extensions;
+using CodeDesignPlus.Net.Observability.Extensions;
 using CodeDesignPlus.Net.RabbitMQ.Extensions;
 using CodeDesignPlus.Net.Redis.Cache.Extensions;
 using CodeDesignPlus.Net.Redis.Extensions;
@@ -26,9 +28,13 @@ builder.Services.AddCache(builder.Configuration);
 builder.Services.AddMapster();
 builder.Services.AddFluentValidation();
 builder.Services.AddMediatR<CodeDesignPlus.Net.Microservice.Application.Startup>();
+builder.Services.AddHealthChecksServices();
+builder.Services.AddObservability(builder.Configuration, builder.Environment);
 
 var app = builder.Build();
 
+app.UseHealthChecks();
+    
 var home = app.MapGroup("/");
 
 home.MapGet("/", () => "Ready");

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

@@ -2,7 +2,7 @@
   "Kestrel": {
     "Endpoints": {
       "Http": {
-        "Url": "http://*:5002",
+        "Url": "http://*:5000",
         "Protocols": "Http1"
       }
     }
@@ -18,14 +18,13 @@
     }
   },
   "Security": {
-    "Authority": "https://codedesignplus.b2clogin.com/codedesignplus.onmicrosoft.com/B2C_1_CodeDeseignPlus/oauth2/v2.0/",
     "ClientId": "a74cb192-598c-4757-95ae-b315793bbbca",
     "IncludeErrorDetails": true,
     "ValidateAudience": true,
     "ValidateIssuer": true,
     "ValidateLifetime": true,
     "RequireHttpsMetadata": true,
-    "ValidIssuer": "https://codedesignplus.b2clogin.com/3461e311-a66e-46ab-afdf-2bbfb72a5cb0/v2.0/",
+    "ValidIssuer": "",
     "ValidAudiences": [
       "a74cb192-598c-4757-95ae-b315793bbbca"
     ],

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

@@ -10,18 +10,19 @@
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.5" />
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.7.0-beta.33" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="8.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.7.0-beta.33" />
 
     <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0" />

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

@@ -1,3 +1,4 @@
+using CodeDesignPlus.Net.Microservice.Commons.Application;
 using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.Rest.Middlewares;
 using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.Rest.Resources;
 using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.Rest.Swagger;
@@ -6,10 +7,9 @@ using CodeDesignPlus.Net.Microservice.Commons.HealthChecks;
 using CodeDesignPlus.Net.Microservice.Commons.MediatR;
 using CodeDesignPlus.Net.Redis.Cache.Extensions;
 using CodeDesignPlus.Net.Vault.Extensions;
-using NodaTime.Serialization.SystemTextJson;
+using NodaTime.Serialization.JsonNet;
 
-
-    var builder = WebApplication.CreateSlimBuilder(args);
+var builder = WebApplication.CreateSlimBuilder(args);
 
 Serilog.Debugging.SelfLog.Enable(Console.Error);
 
@@ -19,7 +19,11 @@ builder.Configuration.AddVault();
 
 builder.Services
     .AddControllers()
-    .AddJsonOptions(opt => opt.JsonSerializerOptions.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb));
+    .AddNewtonsoftJson(options =>
+    {
+        options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Error;
+        options.SerializerSettings.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
+    });
 
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddCors();
@@ -45,6 +49,9 @@ app.UseCors(builder => builder
     .AllowAnyMethod()
     .AllowAnyHeader()
 );
+
+app.UsePath();
+
 app.UseExceptionMiddleware();
 app.UseHealthChecks();
 app.UseCodeErrors();

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

@@ -1,4 +1,7 @@
 {
+  "Core": {
+    "PathBase": ""
+  },
   "Vault": {
     "Enable": true,
     "Address": "http://localhost:8200",

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

@@ -1,25 +1,27 @@
 {
-    "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"
+  "Core": {
+    "PathBase": ""
+  },
+  "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

@@ -9,7 +9,8 @@
     }
   },
   "Core": {
-    "Id": "797742f0-2999-4dac-a0d2-6e8ecdff0fda",
+    "Id": "36612844-2102-49ff-847d-d294e8240338",
+    "PathBase": "/ms-archetype",
     "AppName": "ms-archetype-rest",
     "Version": "v1",
     "Description": "Microservice Archetype Template",
@@ -24,13 +25,12 @@
     "Server": "http://localhost:5001"
   },
   "Security": {
-    "Authority": "https://codedesignplus.b2clogin.com/codedesignplus.onmicrosoft.com/B2C_1_CodeDeseignPlus/oauth2/v2.0/",
     "IncludeErrorDetails": true,
     "ValidateAudience": true,
     "ValidateIssuer": true,
     "ValidateLifetime": true,
     "RequireHttpsMetadata": true,
-    "ValidIssuer": "https://codedesignplus.b2clogin.com/3461e311-a66e-46ab-afdf-2bbfb72a5cb0/v2.0/",
+    "ValidIssuer": "",
     "ValidAudiences": [],
     "Applications": [],
     "ValidateLicense": false,

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

@@ -9,11 +9,11 @@
     <Protobuf Include="Protos\orders.proto" GrpcServices="Server" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.7.0-beta.33" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.70.0" />
     <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.70.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.71.0">
+    <PackageReference Include="Grpc.Tools" Version="2.70.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -26,12 +26,12 @@
   <ItemGroup>
     <ProjectReference Include="..\..\domain\CodeDesignPlus.Net.Microservice.Infrastructure\CodeDesignPlus.Net.Microservice.Infrastructure.csproj" />
     <PackageReference Include="NodaTime.Serialization.Protobuf" Version="2.0.2" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.6.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.7.0-beta.33" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.7.0-beta.33" />
   </ItemGroup>
 </Project>

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

@@ -1,6 +1,7 @@
 using CodeDesignPlus.Net.Logger.Extensions;
 using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.gRpc.Interceptors;
 using CodeDesignPlus.Net.Microservice.Commons.FluentValidation;
+using CodeDesignPlus.Net.Microservice.Commons.HealthChecks;
 using CodeDesignPlus.Net.Microservice.Commons.MediatR;
 using CodeDesignPlus.Net.Microservice.gRpc.Services;
 using CodeDesignPlus.Net.Mongo.Extensions;
@@ -37,9 +38,12 @@ builder.Services.AddSecurity(builder.Configuration);
 builder.Services.AddObservability(builder.Configuration, builder.Environment);
 builder.Services.AddLogger(builder.Configuration);
 builder.Services.AddCache(builder.Configuration);
+builder.Services.AddHealthChecksServices();
 
 var app = builder.Build();
 
+app.UseHealthChecks();
+    
 app.UseAuth();
 
 app.MapGrpcService<OrderService>().RequireAuthorization();

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

@@ -22,13 +22,12 @@
     }
   },
   "Security": {
-    "Authority": "https://codedesignplus.b2clogin.com/codedesignplus.onmicrosoft.com/B2C_1_CodeDeseignPlus/oauth2/v2.0/",
     "IncludeErrorDetails": true,
     "ValidateAudience": true,
     "ValidateIssuer": true,
     "ValidateLifetime": true,
     "RequireHttpsMetadata": true,
-    "ValidIssuer": "https://codedesignplus.b2clogin.com/3461e311-a66e-46ab-afdf-2bbfb72a5cb0/v2.0/",
+    "ValidIssuer": "",
     "ValidAudiences": [],
     "Applications": []
   },

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

@@ -11,7 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
     <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />

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

@@ -12,7 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />

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

@@ -14,12 +14,12 @@
     </PackageReference>
     <PackageReference Include="Google.Protobuf" Version="3.30.2" />
     <PackageReference Include="Grpc.Net.Client" Version="2.70.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.71.0">
+    <PackageReference Include="Grpc.Tools" Version="2.70.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NodaTime.Serialization.Protobuf" Version="2.0.2" />
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.4" />

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

@@ -17,7 +17,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Default.Test/CodeDesignPlus.Net.Microservice.Default.Test.csproj

@@ -6,7 +6,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Serializers" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.Serializers" Version="0.7.0-beta.33" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -24,7 +24,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\domain\CodeDesignPlus.Net.Microservice.Infrastructure\CodeDesignPlus.Net.Microservice.Infrastructure.csproj" />

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

@@ -22,7 +22,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />

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

@@ -17,7 +17,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.7.0-beta.33" />
     <PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />

package/generators/microservice/templates/value-object/ItemValueObject.cs

@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace <%= ns %>;
 
@@ -10,7 +10,7 @@ public sealed partial class <%= name %>
     public string Value { get; private set; }
 
     [JsonConstructor]
-    public <%= name %>(string value)
+    private <%= name %>(string value)
     {
         DomainGuard.IsNullOrEmpty(value, Errors.UnknownError);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-codedesignplus",
-  "version": "0.5.0",
+  "version": "0.6.0-beta.13",
   "description": "Yeoman generator for creating microservices based on the CodeDesignPlus.Net.Microservice archetype.",
   "private": false,
   "main": "generators/index.mjs",