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

package/generators/microservice/core/appsettings.mjs

@@ -39,15 +39,16 @@ export default class AppSettingsGenerator {
         });
 
         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) {
+    _updateConfigVault(file, options) {
         const configFile = this._generator.destinationPath(file);
 
         let config = this._generator.fs.read(configFile);
@@ -64,6 +65,16 @@ export default class AppSettingsGenerator {
         this._generator.fs.write(configFile, config);
     }
 
+    _updateReadme(options) {
+        const readmeFile = this._generator.destinationPath('README.md');
+
+        let readme = this._generator.fs.read(readmeFile);
+
+        readme = readme.replace(/\bms-archetype\b/g, options.appSettings.appName);
+
+        this._generator.fs.write(readmeFile, readme);
+    }
+
     getArguments() {
         this._generator.option('description', { type: String, alias: 'd', required: true, description: 'A detailed description of the microservice providing clear context about its purpose.' });
         this._generator.option('contact-name', { type: String, alias: 'cn', required: true, description: 'Name of the contact person responsible for the microservice.' });

package/generators/microservice/core/utils.mjs

@@ -49,14 +49,14 @@ export default class Utils {
 
         answers = { 
             ...answers,  
-            organization: archetypeValues.organization,
-            microservice: archetypeValues.microservice,
-            description: archetypeValues.description,
-            organization: archetypeValues.organization,
+            organization: archetypeValues?.organization ?? answers.organization,
+            microservice: archetypeValues?.microservice ?? answers.microservice,
+            description: archetypeValues?.description ?? answers.description,
+            organization: archetypeValues?.organization ?? answers.organization,
             aggregate: answers.aggregate ?? archetypeValues.aggregate,
-            vault: archetypeValues.vault,
-            contactName: archetypeValues.contactName,
-            contactEmail: archetypeValues.contactEmail
+            vault: archetypeValues?.vault ?? answers.vault,
+            contactName: archetypeValues?.contactName ?? answers.contactName,
+            contactEmail: archetypeValues?.contactEmail ?? answers.contactEmail
         };
 
         const organization = this.toPascalCase(answers.organization);

package/generators/microservice/templates/microservice/LICENSE.md

@@ -0,0 +1,21 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2023 CodeDesignPlus
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+As an additional permission under GNU LGPL version 3 section 7, you may distribute
+non-source (e.g., minimized or compacted) forms of that code without the copy of the GNU LGPL,
+but you must make the corresponding source code available under the GNU LGPL as provided above.

package/generators/microservice/templates/microservice/README.md

@@ -0,0 +1,175 @@
+# CodeDesignPlus .NET 9 Microservice Template
+
+A production-ready microservice template built with .NET 9, implementing Clean Architecture, DDD, and CQRS patterns. This template provides a robust foundation for building scalable and maintainable microservices.
+
+## 🚀 Key Features
+
+- Clean Architecture implementation
+- Domain-Driven Design (DDD) principles
+- Command Query Responsibility Segregation (CQRS)
+- Multiple entry points (REST API, gRPC, Worker)
+- Distributed caching with Redis
+- Message broker integration with RabbitMQ
+- MongoDB database integration
+- OAuth2/OpenID Connect security
+- Swagger API documentation
+- Application monitoring and tracing
+- Docker containerization
+- Unit and integration testing
+- Load testing scripts
+
+## 🛠️ Technology Stack
+
+- .NET 9
+- MongoDB
+- Redis
+- RabbitMQ
+- Vault
+- Swagger/OpenAPI
+- gRPC
+- MediatR
+- FluentValidation
+- Mapster
+- Docker
+
+## ⚙️ Prerequisites
+
+- .NET 9 SDK
+- Docker and Docker Compose
+- MongoDB
+- Redis
+- RabbitMQ
+- Vault (optional)
+
+## 🚀 Getting Started
+
+The following instructions will help you set up the project on your local machine for development and testing purposes.
+
+1. Clone the repository:
+```bash
+git clone <repository-url>
+```
+
+2. Run the MongoDB, Redis, and RabbitMQ services using Docker Compose. Clone this repository [CodeDesignPlus.Environment.Dev](https://github.com/codedesignplus/CodeDesignPlus.Environment.Dev) and run the following command:
+
+```bash
+cd resources
+
+docker-compose up -d
+```
+
+3. Run the script to config the vault:
+
+```bash
+cd tools/vault
+
+./config-vault.sh
+```
+
+4. Build the solution:
+```bash
+dotnet build
+```
+
+5. Run the desired entry point:
+   
+   - For REST API:
+      ```bash
+      dotnet run --project src/entrypoints/CodeDesignPlus.Net.Microservice.Rest
+      ```
+
+   - For gRPC:
+      ```bash
+      dotnet run --project src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc
+      ```
+
+   - For Worker:
+      ```bash
+      dotnet run --project src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker
+      ```
+
+## 🧪 Testing
+To run the unit and integration tests, execute the following command:
+
+```bash
+dotnet test
+```
+
+## 📦 Update Packages
+To update the NuGet packages, run the following script:
+
+```bash
+cd tools/update-packages
+
+./update-packages.sh
+```
+
+## 📦 Upgrading .NET Version
+
+To upgrade the .NET version, run the following script:
+
+```bash
+cd tools/upgrade-dotnet
+
+./upgrade-dotnet.sh
+```
+
+## 🧪 SonarQube Analysis
+
+To run the SonarQube analysis, follow the instructions in the sonarqube directory.
+
+1. Replace the SonarQube URL and token in the sonarqube.sh script to analyze with SonarQube locally.
+2. Run the script:
+
+   ```bash
+   cd tools/sonarqube
+
+   ./sonarqube.sh
+   ```
+
+🐳 Docker Support
+
+To build and run the application using Docker, follow these steps:
+
+1. Build the Docker image using the Dockerfile in the REST API entry point:
+   ```bash
+   docker build -t ms-archetype-rest . -f src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/Dockerfile
+
+   docker run -d -p 5000:5000 --network=backend -e ASPNETCORE_ENVIRONMENT=Docker --name ms-archetype-rest ms-archetype-rest
+   ```
+
+2. Build the Docker image using the Dockerfile in the gRPC entry point:
+   ```bash
+   docker build -t ms-archetype-grpc . -f src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/Dockerfile
+
+   docker run -d -p 5001:5001 --network=backend -e ASPNETCORE_ENVIRONMENT=Docker --name ms-archetype-grpc ms-archetype-grpc
+   ```
+
+3. Build the Docker image using the Dockerfile in the Worker entry point:
+   ```bash
+   docker build -t ms-archetype-worker . -f src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/Dockerfile
+
+   docker run -d -p 5002:5002 --network=backend -e ASPNETCORE_ENVIRONMENT=Docker --name ms-archetype-worker ms-archetype-worker
+   ```
+
+## 📚 Documentation
+1. API documentation available at `/swagger`
+2. gRPC service definitions in Protos or `MapGrpcReflectionService` for reflection
+
+## 🤝 Contributing
+Please read our Contributing Guide for details on our code of conduct and development process.
+
+## 📄 License
+This project is licensed under the GNU Lesser General Public License v3.0 - see the LICENSE.md file for details.
+
+## 🔧 Tools
+The repository includes several utility scripts in the tools directory:
+
+- `convert-crlf-to-lf.sh`: Converts line endings
+- `update-packages/`: Updates NuGet packages
+- `upgrade-dotnet/`: Upgrades .NET version
+- `vault/`: Vault configuration scripts
+- `sonarqube/`: SonarQube analysis configuration
+
+## 📦 CodeDesignPlus Packages
+This template use the `CodeDesignPlus.Net.Sdk` package to simplify the development process. For more information, visit the [Doc Site](https://codedesignplus.github.io/).

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.5.0-beta.60" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.5.0-beta.60" />
-		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.5.0-beta.60" />
-		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.5.0-beta.60" />
+		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.5.0-beta.81" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.5.0-beta.81" />
+		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.5.0-beta.81" />
+		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.5.0-beta.81" />
 		<PackageReference Include="Mapster" Version="7.4.0" />
 		<PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
 		<PackageReference Include="MediatR" Version="12.4.1" />

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Commands/AddProductToOrder/AddProductToOrderCommandHandler.cs

@@ -4,16 +4,15 @@ public class AddProductToOrderCommandHandler(IOrderRepository orderRepository, I
 {
     public async Task Handle(AddProductToOrderCommand request, CancellationToken cancellationToken)
     {
-        var order = await orderRepository.FindAsync(request.Id, cancellationToken);
+        var order = await orderRepository.FindAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
         ApplicationGuard.IsNull(order, Errors.OrderNotFound);
 
         order.AddProduct(request.IdProduct, request.Name, request.Description, request.Price, request.Quantity, user.IdUser);
 
-        await orderRepository.AddProductToOrderAsync(new AddProductToOrderParams()
+        await orderRepository.AddProductToOrderAsync(order.Id, user.Tenant, new AddProductToOrderParams()
         {
-            Id = order.Id,
-            IdProduct = request.IdProduct,
+            Id = request.IdProduct,
             Name = request.Name,
             Description = request.Description,
             Price = request.Price,

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Commands/CancelOrder/CancelOrderCommandHandler.cs

@@ -4,20 +4,21 @@ public class CancelOrderCommandHandler(IOrderRepository orderRepository, IUserCo
 {
     public async Task Handle(CancelOrderCommand request, CancellationToken cancellationToken)
     {
-        var order = await orderRepository.FindAsync(request.Id, cancellationToken);
+        var order = await orderRepository.FindAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
         ApplicationGuard.IsNull(order, Errors.OrderNotFound);
 
         order.CancelOrder(request.Reason, user.IdUser);
-        
-        await orderRepository.CancelOrderAsync(new CancelOrderParams() {
+
+        await orderRepository.CancelOrderAsync(new CancelOrderParams()
+        {
             Id = order.Id,
             OrderStatus = order.Status,
             Reason = order.ReasonForCancellation,
             CancelledAt = order.CancelledAt,
             UpdatedAt = order.UpdatedAt,
             UpdateBy = order.UpdatedBy
-        },cancellationToken);
+        }, user.Tenant, cancellationToken);
 
         await pubsub.PublishAsync(order.GetAndClearEvents(), cancellationToken);
     }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Commands/CompleteOrder/CompleteOrderCommandHandler.cs

@@ -4,7 +4,7 @@ public class CompleteOrderCommandHandler(IOrderRepository orderRepository, IUser
 {
     public async Task Handle(CompleteOrderCommand request, CancellationToken cancellationToken)
     {
-        var order = await orderRepository.FindAsync(request.Id, cancellationToken);
+        var order = await orderRepository.FindAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
         ApplicationGuard.IsNull(order, Errors.OrderNotFound);
 
@@ -17,7 +17,7 @@ public class CompleteOrderCommandHandler(IOrderRepository orderRepository, IUser
             OrderStatus = order.Status,
             UpdatedAt = order.UpdatedAt,
             UpdateBy = order.UpdatedBy
-        }, cancellationToken);
+        }, user.Tenant, cancellationToken);
 
         await pubsub.PublishAsync(order.GetAndClearEvents(), cancellationToken);
     }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Commands/CreateOrder/CreateOrderCommandHandler.cs

@@ -6,18 +6,17 @@ public class CreateOrderCommandHandler(IOrderRepository orderRepository, IUserCo
 {
     public async Task Handle(CreateOrderCommand request, CancellationToken cancellationToken)
     {
-        var order = await orderRepository.FindAsync(request.Id, cancellationToken);
-
-        ApplicationGuard.IsNotNull(order, Errors.OrderAlreadyExists);
+        var exist = await orderRepository.ExistsAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
+        ApplicationGuard.IsTrue(exist, Errors.OrderAlreadyExists);
 
         var client = ClientValueObject.Create(request.Client.Id, request.Client.Name, request.Client.Document, request.Client.TypeDocument);
 
         var address = AddressValueObject.Create(request.Address.Country, request.Address.State, request.Address.City, request.Address.Address, request.Address.CodePostal);
 
-        order = OrderAggregate.Create(request.Id, client, address, user.Tenant, user.IdUser);
+        var order = OrderAggregate.Create(request.Id, client, address, user.Tenant, user.IdUser);
 
-        await orderRepository.CreateOrderAsync(order, cancellationToken);
+        await orderRepository.CreateAsync(order, cancellationToken);
 
         await pubsub.PublishAsync(order.GetAndClearEvents(), cancellationToken);
     }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Commands/RemoveProduct/RemoveProductCommandHandler.cs

@@ -4,7 +4,7 @@ public class RemoveProductCommandHandler(IOrderRepository orderRepository, IUser
 {
     public async Task Handle(RemoveProductCommand request, CancellationToken cancellationToken)
     {
-        var order = await orderRepository.FindAsync(request.Id, cancellationToken);
+        var order = await orderRepository.FindAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
         ApplicationGuard.IsNull(order, Errors.OrderNotFound);
 
@@ -15,7 +15,7 @@ public class RemoveProductCommandHandler(IOrderRepository orderRepository, IUser
             IdProduct = request.ProductId,
             UpdatedAt = order.UpdatedAt,
             UpdateBy = user.IdUser
-        }, cancellationToken);
+        }, user.Tenant, cancellationToken);
 
         await pubsub.PublishAsync(order.GetAndClearEvents(), cancellationToken);
     }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Commands/UpdateQuantityProduct/UpdateQuantityProductCommandHandler.cs

@@ -4,16 +4,15 @@ public class UpdateQuantityProductCommandHandler(IOrderRepository orderRepositor
 {
     public async Task Handle(UpdateQuantityProductCommand request, CancellationToken cancellationToken)
     {
-        var order = await orderRepository.FindAsync(request.Id, cancellationToken);
+        var order = await orderRepository.FindAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
         ApplicationGuard.IsNull(order, Errors.OrderNotFound);
 
         order.UpdateProductQuantity(request.ProductId, request.Quantity, user.IdUser);
 
-        await orderRepository.UpdateQuantityProductAsync(new UpdateQuantityProductParams()
+        await orderRepository.UpdateQuantityProductAsync(order.Id, user.Tenant, new UpdateQuantityProductParams()
         {
-            Id = order.Id,
-            ProductId = request.ProductId,
+            Id = request.ProductId,
             NewQuantity = request.Quantity,
             UpdatedAt = order.UpdatedAt,
             UpdateBy = user.IdUser

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/DataTransferObjects/OrderDto.cs

@@ -3,16 +3,16 @@
 public class OrderDto: IDtoBase
 {
     public Guid Id { get; set; }
-    public long? CompletedAt { get; set; }
-    public long? CancelledAt { get; set; }
+    public Instant? CompletedAt { get; set; }
+    public Instant? CancelledAt { get; set; }
     public ClientDto Client { get; set; } = default!;
     public AddressDto ShippingAddress { get; set; } = default!;
     public List<ProductDto> Products { get; set; } = [];
     public OrderStatus Status { get; set; }
     public string? ReasonForCancellation { get; set; }
-    public long CreatedAt { get; set; }
+    public Instant CreatedAt { get; set; }
     public Guid CreatedBy { get; set; }
-    public long UpdatedAt { get; set; }
+    public Instant? UpdatedAt { get; set; }
     public Guid UpdatedBy { get; set; }
     public bool IsActive { get; set; }
 }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Queries/FindOrderById/FindOrderByIdQueryHandler.cs

@@ -2,19 +2,16 @@
 
 namespace CodeDesignPlus.Net.Microservice.Application.Order.Queries.FindOrderById;
 
-public class FindOrderByIdQueryHandler(IOrderRepository orderRepository, IMapper mapper, ICacheManager cacheManager) : IRequestHandler<FindOrderByIdQuery, OrderDto>
+public class FindOrderByIdQueryHandler(IOrderRepository orderRepository, IMapper mapper, ICacheManager cacheManager, IUserContext user) : IRequestHandler<FindOrderByIdQuery, OrderDto>
 {
-    private readonly IOrderRepository orderRepository = orderRepository;
-    private readonly IMapper mapper = mapper;
-
     public async Task<OrderDto> Handle(FindOrderByIdQuery request, CancellationToken cancellationToken)
     {
         if(await cacheManager.ExistsAsync(request.Id.ToString())) 
             return await cacheManager.GetAsync<OrderDto>(request.Id.ToString());
 
-        var result = await this.orderRepository.FindAsync(request.Id, cancellationToken);
+        var result = await orderRepository.FindAsync<OrderAggregate>(request.Id, user.Tenant, cancellationToken);
 
-        var order = this.mapper.Map<OrderDto>(result);
+        var order = mapper.Map<OrderDto>(result);
 
         await cacheManager.SetAsync(request.Id.ToString(), order);
 

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Queries/GetAllOrders/GetAllOrdersQueryHandler.cs

@@ -1,17 +1,14 @@
 namespace CodeDesignPlus.Net.Microservice.Application.Order.Queries.GetAllOrders;
 
-public class GetAllOrdersQueryHandler(IOrderRepository orderRepository, IMapper mapper)
+public class GetAllOrdersQueryHandler(IOrderRepository orderRepository, IMapper mapper, IUserContext user)
     : IRequestHandler<GetAllOrdersQuery, List<OrderDto>>
 {
 
-    private readonly IOrderRepository orderRepository = orderRepository;
-    private readonly IMapper mapper = mapper;
-
     public async Task<List<OrderDto>> Handle(GetAllOrdersQuery request, CancellationToken cancellationToken)
     {
-        var result = await this.orderRepository.MatchingAsync<OrderAggregate>(request.Criteria, cancellationToken).ConfigureAwait(false);
+        var result = await orderRepository.MatchingAsync<OrderAggregate>(request.Criteria, user.Tenant, cancellationToken);
 
-        var data = this.mapper.Map<List<OrderDto>>(result);
+        var data = mapper.Map<List<OrderDto>>(result);
 
         return data;
     }

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

@@ -9,6 +9,7 @@ global using MediatR;
 global using C = CodeDesignPlus.Net.Core.Abstractions.Models.Criteria;
 global using CodeDesignPlus.Net.Core.Abstractions;
 global using CodeDesignPlus.Net.Serializers;
+global using NodaTime;
 
 global using CodeDesignPlus.Net.Microservice.Application.Order.DataTransferObjects;
 global using CodeDesignPlus.Net.Microservice.Domain;

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.5.0-beta.60" />
-    <PackageReference Include="CodeDesignPlus.Net.Mongo" Version="0.5.0-beta.60" />
+    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.5.0-beta.81" />
+    <PackageReference Include="CodeDesignPlus.Net.Mongo" Version="0.5.0-beta.81" /> 
   </ItemGroup>
 </Project>

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

@@ -5,11 +5,10 @@ namespace CodeDesignPlus.Net.Microservice.Domain.DataTransferObjects;
 public class AddProductToOrderParams: IDtoBase
 {
     public required Guid Id { get; set; }
-    public required Guid IdProduct { get; set; }
     public required string Name { get; set; }
     public required string Description { get; set; }
     public required long Price { get; set; }
     public required int Quantity { get; set; }
-    public required long? UpdatedAt { get; set; }
+    public required Instant? UpdatedAt { get; set; }
     public required Guid? UpdateBy { get; set; }
 }

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

@@ -7,7 +7,7 @@ public class CancelOrderParams: IDtoBase
     public required Guid Id { get; set; }
     public required OrderStatus OrderStatus { get; set; }
     public required string? Reason { get; set; }
-    public required long? CancelledAt { get; set; }
-    public required long? UpdatedAt { get; set; }
+    public required Instant? CancelledAt { get; set; }
+    public required Instant? UpdatedAt { get; set; }
     public required Guid? UpdateBy { get; set; }
 }

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

@@ -5,8 +5,8 @@ namespace CodeDesignPlus.Net.Microservice.Domain.DataTransferObjects;
 public class CompleteOrderParams: IDtoBase
 {
     public required Guid Id { get; set; }
-    public required long? CompletedAt { get; set; }
+    public required Instant? CompletedAt { get; set; }
     public required OrderStatus OrderStatus { get; set; }
-    public required long? UpdatedAt { get; set; }
+    public required Instant? UpdatedAt { get; set; }
     public required Guid? UpdateBy { get; set; }
 }

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

@@ -6,6 +6,6 @@ public class RemoveProductFromOrderParams: IDtoBase
 {
     public required Guid Id { get; set; }
     public required Guid IdProduct { get; set; }
-    public required long? UpdatedAt { get; set; }
+    public required Instant? UpdatedAt { get; set; }
     public required Guid? UpdateBy { get; set; }
 }

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

@@ -5,8 +5,7 @@ namespace CodeDesignPlus.Net.Microservice.Domain.DataTransferObjects;
 public class UpdateQuantityProductParams: IDtoBase
 {
     public required Guid Id { get; set; }
-    public required Guid ProductId { get; set; }
     public required int NewQuantity { get; set; }
-    public required long? UpdatedAt { get; set; }
+    public required Instant? UpdatedAt { get; set; }
     public required Guid? UpdateBy { get; set; }
 }

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

@@ -3,19 +3,19 @@
 [EventKey<OrderAggregate>(1, "OrderCancelled")]
 public class OrderCancelledDomainEvent(
     Guid aggregateId,
-    long cancelledAt,
+    Instant cancelledAt,
     string reason,
     Guid? eventId = null,
-    DateTime? occurredAt = null,
+    Instant? occurredAt = null,
     Dictionary<string, object>? metadata = null
 ) : DomainEvent(aggregateId, eventId, occurredAt, metadata)
 {
-    public long CancelledAt { get; } = cancelledAt;
+    public Instant CancelledAt { get; } = cancelledAt;
     public string Reason { get; } = reason;
 
     public static OrderCancelledDomainEvent Create(Guid aggregateId, string reason)
     {
-        return new OrderCancelledDomainEvent(aggregateId, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), reason);
+        return new OrderCancelledDomainEvent(aggregateId, SystemClock.Instance.GetCurrentInstant(), reason);
     }
 }
 

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

@@ -3,16 +3,16 @@
 [EventKey<OrderAggregate>(1, "OrderCompleted")]
 public class OrderCompletedDomainEvent(
      Guid aggregateId,
-     long completedAt,
+     Instant completedAt,
      Guid? eventId = null,
-     DateTime? occurredAt = null,
+     Instant? occurredAt = null,
      Dictionary<string, object>? metadata = null
 ) : DomainEvent(aggregateId, eventId, occurredAt, metadata)
 {
-    public long CompletedAt { get; } = completedAt;
+    public Instant CompletedAt { get; } = completedAt;
 
     public static OrderCompletedDomainEvent Create(Guid aggregateId)
     {
-        return new OrderCompletedDomainEvent(aggregateId, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+        return new OrderCompletedDomainEvent(aggregateId, SystemClock.Instance.GetCurrentInstant());
     }
 }

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

@@ -8,18 +8,18 @@ public class OrderCreatedDomainEvent(
    OrderStatus orderStatus,
    ClientValueObject client,
    AddressValueObject shippingAddress,
-   long createdAt,
+   Instant createdAt,
    Guid tenant,
    Guid createBy,
    Guid? eventId = null,
-   DateTime? occurredAt = null,
+   Instant? occurredAt = null,
    Dictionary<string, object>? metadata = null
 ) : DomainEvent(aggregateId, eventId, occurredAt, metadata)
 {
     public ClientValueObject Client { get; } = client;
     public AddressValueObject ShippingAddress { get; } = shippingAddress;
     public OrderStatus OrderStatus { get; } = orderStatus;
-    public long CreatedAt { get; } = createdAt;
+    public Instant CreatedAt { get; } = createdAt;
     public Guid Tenant { get; private set; } = tenant;
     public Guid CreateBy { get; private set; } = createBy;
 
@@ -35,7 +35,7 @@ public class OrderCreatedDomainEvent(
             OrderStatus.Created,
             client,
             shippingAddress,
-            DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+            SystemClock.Instance.GetCurrentInstant(),
             tenant,
             creaateBy
         );

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

@@ -6,7 +6,7 @@ public class ProductAddedToOrderDomainEvent(
     int quantity,
     ProductEntity product,
     Guid? eventId = null,
-    DateTime? occurredAt = null,
+    Instant? occurredAt = null,
     Dictionary<string, object>? metadata = null
 ) : DomainEvent(aggregateId, eventId, occurredAt, metadata)
 {

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

@@ -6,7 +6,7 @@ public class ProductQuantityUpdatedDomainEvent(
     Guid productId,
     int newQuantity,
     Guid? eventId = null,
-    DateTime? occurredAt = null,
+    Instant? occurredAt = null,
     Dictionary<string, object>? metadata = null
 ) : DomainEvent(aggregateId, eventId, occurredAt, metadata)
 {