generator-codedesignplus 0.1.0-beta.2 → 0.1.0

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Infrastructure.Test/Repositories/OrderRepositoryTest.cs

@@ -49,6 +49,7 @@ public class OrderRepositoryTest
     {
         // Arrange
         var idOrder = Guid.NewGuid();
+        var tenant = Guid.NewGuid();
         var idProduct = Guid.NewGuid();
         var name = "Product Name";
         var description = "Product Description";
@@ -61,15 +62,14 @@ public class OrderRepositoryTest
             .ReturnsAsync(It.IsAny<UpdateResult>());
 
         // Act
-        await orderRepository.AddProductToOrderAsync(new AddProductToOrderParams()
+        await orderRepository.AddProductToOrderAsync(idOrder, tenant, new AddProductToOrderParams()
         {
-            Id = idOrder,
-            IdProduct = idProduct,
+            Id = idProduct,
             Name = name,
             Description = description,
             Price = price,
             Quantity = quantity,
-            UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+            UpdatedAt = SystemClock.Instance.GetCurrentInstant(),
             UpdateBy = Guid.NewGuid()
         }, cancellationToken);
 
@@ -82,9 +82,10 @@ public class OrderRepositoryTest
     {
         // Arrange
         var idOrder = Guid.NewGuid();
+        var tenant = Guid.NewGuid();
         var reason = "Reason for cancellation";
         var cancellationToken = CancellationToken.None;
-        var cancelledAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        var cancelledAt = SystemClock.Instance.GetCurrentInstant();
 
         collectionMock
             .Setup(x => x.UpdateOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<UpdateDefinition<OrderAggregate>>(), It.IsAny<UpdateOptions>(), cancellationToken))
@@ -97,9 +98,9 @@ public class OrderRepositoryTest
             OrderStatus = OrderStatus.Cancelled,
             Reason = reason,
             CancelledAt = cancelledAt,
-            UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+            UpdatedAt = SystemClock.Instance.GetCurrentInstant(),
             UpdateBy = Guid.NewGuid()
-        }, cancellationToken);
+        }, tenant, cancellationToken);
 
         // Assert
         collectionMock.Verify(x => x.UpdateOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<UpdateDefinition<OrderAggregate>>(), It.IsAny<UpdateOptions>(), cancellationToken), Times.Once);
@@ -110,8 +111,9 @@ public class OrderRepositoryTest
     {
         // Arrange
         var idOrder = Guid.NewGuid();
+        var tenant = Guid.NewGuid();
         var cancellationToken = CancellationToken.None;
-        var completedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        var completedAt = SystemClock.Instance.GetCurrentInstant();
 
         collectionMock
             .Setup(x => x.UpdateOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<UpdateDefinition<OrderAggregate>>(), It.IsAny<UpdateOptions>(), cancellationToken))
@@ -123,73 +125,20 @@ public class OrderRepositoryTest
             Id = idOrder,
             CompletedAt = completedAt,
             OrderStatus = OrderStatus.Completed,
-            UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+            UpdatedAt = SystemClock.Instance.GetCurrentInstant(),
             UpdateBy = Guid.NewGuid()
-        }, cancellationToken);
+        }, tenant, cancellationToken);
 
         // Assert
         collectionMock.Verify(x => x.UpdateOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<UpdateDefinition<OrderAggregate>>(), It.IsAny<UpdateOptions>(), cancellationToken), Times.Once);
     }
 
-    [Fact]
-    public async Task CreateOrderAsync_Should_Create_Order()
-    {
-        // Arrange
-        var client = ClientValueObject.Create(Guid.NewGuid(), "CodeDesignPlus", "1234567890", "CC");
-        var address = AddressValueObject.Create("Colombia", "Bogota", "Bogota", "Calle 123", 123456);
-        var order = OrderAggregate.Create(Guid.NewGuid(), client, address, Guid.NewGuid(), Guid.NewGuid());
-        var cancellationToken = CancellationToken.None;
-
-        collectionMock
-            .Setup(x => x.InsertOneAsync(It.IsAny<OrderAggregate>(), It.IsAny<InsertOneOptions>(), cancellationToken));
-
-        // Act
-        await orderRepository.CreateOrderAsync(order, cancellationToken);
-
-        // Assert
-        collectionMock.Verify(x => x.InsertOneAsync(It.IsAny<OrderAggregate>(), It.IsAny<InsertOneOptions>(), cancellationToken), Times.Once);
-    }
-
-    [Fact]
-    public async Task FindAsync_Should_Find_Order()
-    {
-        // Arrange
-        var id = Guid.NewGuid();
-        var cancellationToken = CancellationToken.None;
-
-        collectionMock
-            .Setup(x => x.FindAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<FindOptions<OrderAggregate, OrderAggregate>>(), cancellationToken))
-            .ReturnsAsync(new Mock<IAsyncCursor<OrderAggregate>>().Object);
-
-        // Act
-        await orderRepository.FindAsync(id, cancellationToken);
-
-        // Assert
-        collectionMock.Verify(x => x.FindAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<FindOptions<OrderAggregate, OrderAggregate>>(), cancellationToken), Times.Once);
-    }
-
-    [Fact]
-    public async Task GetAllOrdersAsync_Should_Get_All_Orders()
-    {
-        // Arrange
-        var cancellationToken = CancellationToken.None;
-
-        collectionMock
-            .Setup(x => x.FindAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<FindOptions<OrderAggregate, OrderAggregate>>(), cancellationToken))
-            .ReturnsAsync(new Mock<IAsyncCursor<OrderAggregate>>().Object);
-
-        // Act
-        await orderRepository.GetAllOrdersAsync(cancellationToken);
-
-        // Assert
-        collectionMock.Verify(x => x.FindAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<FindOptions<OrderAggregate, OrderAggregate>>(), cancellationToken), Times.Once);
-    }
-
     [Fact]
     public async Task RemoveProductFromOrderAsync_Should_Remove_Product_From_Order()
     {
         // Arrange
         var idOrder = Guid.NewGuid();
+        var tenant = Guid.NewGuid();
         var idProduct = Guid.NewGuid();
         var cancellationToken = CancellationToken.None;
 
@@ -198,43 +147,24 @@ public class OrderRepositoryTest
             .ReturnsAsync(It.IsAny<UpdateResult>());
 
         // Act
-        await orderRepository.RemoveProductFromOrderAsync( new RemoveProductFromOrderParams()
+        await orderRepository.RemoveProductFromOrderAsync(new RemoveProductFromOrderParams()
         {
             Id = idOrder,
             IdProduct = idProduct,
-            UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+            UpdatedAt = SystemClock.Instance.GetCurrentInstant(),
             UpdateBy = Guid.NewGuid()
-        }, cancellationToken);
+        }, tenant, cancellationToken);
 
         // Assert
         collectionMock.Verify(x => x.UpdateOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<UpdateDefinition<OrderAggregate>>(), It.IsAny<UpdateOptions>(), cancellationToken), Times.Once);
     }
 
-    [Fact]
-    public async Task UpdateOrderAsync_Should_Update_Order()
-    {
-        // Arrange
-        var client = ClientValueObject.Create(Guid.NewGuid(), "CodeDesignPlus", "1234567890", "CC");
-        var address = AddressValueObject.Create("Colombia", "Bogota", "Bogota", "Calle 123", 123456);
-        var order = OrderAggregate.Create(Guid.NewGuid(), client, address, Guid.NewGuid(), Guid.NewGuid());
-        var cancellationToken = CancellationToken.None;
-
-        collectionMock
-            .Setup(x => x.ReplaceOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<OrderAggregate>(), It.IsAny<ReplaceOptions>(), cancellationToken))
-            .ReturnsAsync(It.IsAny<ReplaceOneResult>());
-
-        // Act
-        await orderRepository.UpdateOrderAsync(order, cancellationToken);
-
-        // Assert
-        collectionMock.Verify(x => x.ReplaceOneAsync(It.IsAny<FilterDefinition<OrderAggregate>>(), It.IsAny<OrderAggregate>(), It.IsAny<ReplaceOptions>(), cancellationToken), Times.Once);
-    }
-
     [Fact]
     public async Task UpdateQuantityProductAsync_Should_Update_Quantity_Product()
     {
         // Arrange
         var idOrder = Guid.NewGuid();
+        var tenant = Guid.NewGuid();
         var productId = Guid.NewGuid();
         var newQuantity = 10;
         var cancellationToken = CancellationToken.None;
@@ -244,12 +174,11 @@ public class OrderRepositoryTest
             .ReturnsAsync(It.IsAny<UpdateResult>());
 
         // Act
-        await orderRepository.UpdateQuantityProductAsync(new UpdateQuantityProductParams()
+        await orderRepository.UpdateQuantityProductAsync(idOrder, tenant, new UpdateQuantityProductParams()
         {
-            Id = idOrder,
-            ProductId = productId,
+            Id = productId,
             NewQuantity = newQuantity,
-            UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+            UpdatedAt = SystemClock.Instance.GetCurrentInstant(),
             UpdateBy = Guid.NewGuid()
         }, cancellationToken);
 

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Infrastructure.Test/Usings.cs

@@ -7,6 +7,7 @@ global using MongoDB.Driver;
 global using Moq;
 global using Microsoft.Extensions.Configuration;
 global using CodeDesignPlus.Net.Serializers;
+global using NodaTime;
 
 global using CodeDesignPlus.Net.Microservice.Infrastructure.Repositories;
 global using CodeDesignPlus.Net.Microservice.Domain;

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

@@ -14,19 +14,19 @@
     </ItemGroup>
   </Target>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.3">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <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="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <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/unit/CodeDesignPlus.Net.Microservice.gRpc.Test/CodeDesignPlus.Net.Microservice.gRpc.Test.csproj

@@ -9,20 +9,20 @@
     <SonarQubeExclude>true</SonarQubeExclude>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.3">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <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="Grpc.Core.Testing" Version="2.46.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <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/unit/CodeDesignPlus.Net.Microservice.gRpc.Test/Services/OrderServiceTest.cs

@@ -4,13 +4,13 @@ public class OrderServiceTest
 {
     private readonly Mock<IMediator> _mediatorMock;
     private readonly Mock<IMapper> _mapperMock;
-    private readonly OrdersService _ordersService;
+    private readonly OrderService _ordersService;
 
     public OrderServiceTest()
     {
         _mediatorMock = new Mock<IMediator>();
         _mapperMock = new Mock<IMapper>();
-        _ordersService = new OrdersService(_mediatorMock.Object, _mapperMock.Object);
+        _ordersService = new OrderService(_mediatorMock.Object, _mapperMock.Object);
     }
 
     [Fact]

package/generators/microservice/templates/microservice/tools/vault/config-vault.ps1

@@ -154,7 +154,7 @@ vault write vault-database/config/db-ms-archetype `
 
 vault write vault-database/roles/ms-archetype-mongo-role `
     db_name=db-ms-archetype `
-    creation_statements="{ \""db\"": \""admin\"", \""roles\"": [{ \""role\"": \""readWrite\"", \""db\"": \""db-ms-archetype\"" }] }" `
+    creation_statements="{ """db""": """admin""", """roles""": [{ """role""": """readWrite""", """db""": """db-ms-archetype""" }] }" `
     default_ttl="1h" `
     max_ttl="24h"
 
@@ -173,6 +173,6 @@ vault write vault-rabbitmq/config/connection `
     password="password"
 
 vault write vault-rabbitmq/roles/ms-archetype-rabbitmq-role `
-    vhosts="{\""/\"":{\""write\"": \"".*\"", \""read\"": \"".*\"", \""configure\"": \"".*\""}}"
+    vhosts="{"""/""":{"""write""": """.*""", """read""": """.*""", """configure""": """.*"""}}"
 
 vault read vault-rabbitmq/creds/ms-archetype-rabbitmq-role

package/generators/microservice/templates/microservice/tools/vault/config-vault.sh

@@ -112,8 +112,7 @@ echo "${BLUE}6. Writing secrets...${NC}"
 vault kv put -mount=vault-keyvalue ms-archetype \
     Security:ClientId=a74cb192-598c-4757-95ae-b315793bbbca \
     Security:ValidAudiences:0=a74cb192-598c-4757-95ae-b315793bbbca \
-    Security:ValidAudiences:1=api://a74cb192-598c-4757-95ae-b315793bbbca \
-    Redis:Instances:Core:ConnectionString=localhost:6379
+    Security:ValidAudiences:1=api://a74cb192-598c-4757-95ae-b315793bbbca
     
 vault kv get -mount=vault-keyvalue ms-archetype
 

package/package.json

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

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

@@ -1,2 +0,0 @@
-{
-}

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>http</ActiveDebugProfile>
-    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
-    <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>

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

@@ -1,3 +0,0 @@
-{
-
-}

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>http</ActiveDebugProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>

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

@@ -1,3 +0,0 @@
-{
-  
-}