chore: Remove unnecessary using statements and update namespaces in m…

…ultiple test and builder files
foxminchan · Sep 16, 2024 · f740c70 · f740c70
1 parent 12b9dc4
commit f740c70
Show file tree

Hide file tree

Showing 48 changed files with 89 additions and 114 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <AspireVersion>8.2.0</AspireVersion>
     <AspirantVersion>0.0.4</AspirantVersion>
-    <MicrosoftExtensionsVersion>8.8.0</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsVersion>8.9.1</MicrosoftExtensionsVersion>
     <AspnetVersion>8.0.8</AspnetVersion>
     <EfCoreVersion>8.0.8</EfCoreVersion>
     <XabarilVersion>8.0.1</XabarilVersion>
@@ -27,7 +27,7 @@
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireUnstablePackagesVersion)" />
     <PackageVersion Include="Aspire.StackExchange.Redis" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="$(AspireVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
     <!-- Aspirant -->
     <PackageVersion Include="Aspirant.Hosting" Version="$(AspirantVersion)" />

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -12,10 +12,10 @@
     "url": "git+https://github.com/foxminchan/BookWorm"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.4.0",
-    "@commitlint/config-conventional": "^19.2.2",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@types/bun": "latest",
-    "husky": "^9.1.5"
+    "husky": "^9.1.6"
   },
   "peerDependencies": {
     "typescript": "^5.5.3"

diff --git a/src/BookWorm.Basket/Grpc/BasketService.cs b/src/BookWorm.Basket/Grpc/BasketService.cs
@@ -1,5 +1,6 @@
 using BookWorm.Basket.Features;
 using BookWorm.Basket.Features.Get;
+using Google.Protobuf.WellKnownTypes;
 using GrpcBasketBase = BookWorm.Basket.Grpc.Basket.BasketBase;
 
 namespace BookWorm.Basket.Grpc;
@@ -8,21 +9,21 @@ public sealed class BasketService(ISender sender, IBookService bookService, ILog
     : GrpcBasketBase
 {
     [AllowAnonymous]
-    public override async Task<BasketResponse> GetBasket(BasketRequest request, ServerCallContext context)
+    public override async Task<BasketResponse> GetBasket(Empty request, ServerCallContext context)
     {
-        if (logger.IsEnabled(LogLevel.Debug))
-        {
-            logger.LogDebug("[{Service}] - - Begin grpc call {Method} with {BasketId}",
-                nameof(BasketService), nameof(GetBasket), request.BasketId);
-        }
-
         var userId = context.GetUserIdentity();
 
         if (string.IsNullOrEmpty(userId))
         {
             return new();
         }
 
+        if (logger.IsEnabled(LogLevel.Debug))
+        {
+            logger.LogDebug("[{Service}] - - Begin grpc call {Method} with {BasketId}",
+                nameof(BasketService), nameof(GetBasket), userId);
+        }
+
         var basket = await sender.Send(new GetBasketQuery());
 
         return basket.Value is not null ? await MapToBasketResponse(basket.Value) : new();

diff --git a/src/BookWorm.Basket/Protos/basket.proto b/src/BookWorm.Basket/Protos/basket.proto
@@ -1,15 +1,13 @@
 syntax = "proto3";
 
+import "google/protobuf/empty.proto";
+
 option csharp_namespace = "BookWorm.Basket.Grpc";
 
 package BasketApi;
 
 service Basket {
-    rpc GetBasket (BasketRequest) returns (BasketResponse);
-}
-
-message BasketRequest {
-    string basketId = 1;
+    rpc GetBasket (google.protobuf.Empty) returns (BasketResponse);
 }
 
 message BasketResponse {

diff --git a/src/BookWorm.Catalog/BookWorm.Catalog.csproj b/src/BookWorm.Catalog/BookWorm.Catalog.csproj
@@ -20,8 +20,11 @@
   <ItemGroup>
     <PackageReference Include="Polly" />
     <PackageReference Include="Polly.Extensions" />
-    <PackageReference Include="Pgvector.EntityFrameworkCore" />
     <PackageReference Include="Grpc.AspNetCore" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Pgvector.EntityFrameworkCore" />
     <PackageReference Include="EFCore.NamingConventions" />
     <PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" />
   </ItemGroup>

diff --git a/src/BookWorm.Catalog/Infrastructure/Ai/Extension.cs b/src/BookWorm.Catalog/Infrastructure/Ai/Extension.cs
@@ -10,7 +10,6 @@ public static IHostApplicationBuilder AddAi(this IHostApplicationBuilder builder
 
         builder.AddAzureOpenAIClient(ServiceName.OpenAi);
         builder.Services.AddOpenAITextEmbeddingGeneration(modelName);
-
         builder.Services.AddSingleton<IAiService, AiService>();
 
         return builder;

diff --git a/src/BookWorm.MailDev.Hosting/MailDevResource.cs b/src/BookWorm.MailDev.Hosting/MailDevResource.cs
@@ -1,5 +1,9 @@
 namespace BookWorm.MailDev.Hosting;
 
+/// <summary>
+///     https://github.com/davidfowl/Build2024AspireDemo/blob/main/AppHost/MailDev/MailDevResource.cs
+/// </summary>
+/// <param name="name"></param>
 public sealed class MailDevResource(string name) : ContainerResource(name), IResourceWithConnectionString
 {
     internal const string SmtpEndpointName = "smtp";

diff --git a/src/BookWorm.MailDev.Hosting/MailDevResourceBuilderExtensions.cs b/src/BookWorm.MailDev.Hosting/MailDevResourceBuilderExtensions.cs
@@ -1,5 +1,8 @@
 namespace BookWorm.MailDev.Hosting;
 
+/// <summary>
+///     https://github.com/davidfowl/Build2024AspireDemo/blob/main/AppHost/MailDev/MailDevResourceBuilderExtensions.cs
+/// </summary>
 public static class MailDevResourceBuilderExtensions
 {
     public static IResourceBuilder<MailDevResource> AddMailDev(

diff --git a/src/BookWorm.Ordering/Grpc/BasketService.cs b/src/BookWorm.Ordering/Grpc/BasketService.cs
@@ -14,7 +14,7 @@ public async Task<Basket> GetBasketAsync(Guid basketId, CancellationToken cancel
                 basketId);
         }
 
-        var response = await basketClient.GetBasketAsync(new() { BasketId = basketId.ToString() },
+        var response = await basketClient.GetBasketAsync(new(),
             cancellationToken: cancellationToken);
 
         return MapBasket(response);

diff --git a/src/BookWorm.ServiceDefaults/BookWorm.ServiceDefaults.csproj b/src/BookWorm.ServiceDefaults/BookWorm.ServiceDefaults.csproj
@@ -9,20 +9,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
     <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
+    <PackageReference Include="MongoDB.Bson" />
     <PackageReference Include="Swashbuckle.AspNetCore" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="MicroElements.Swashbuckle.FluentValidation" />
-    <PackageReference Include="MongoDB.Bson" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BookWorm.Shared/BookWorm.Shared.csproj b/src/BookWorm.Shared/BookWorm.Shared.csproj
@@ -5,16 +5,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Scrutor" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
-    <PackageReference Include="FluentValidation.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Scrutor" />
     <PackageReference Include="MassTransit.RabbitMQ" />
+    <PackageReference Include="FluentValidation.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj b/tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj
@@ -19,15 +19,15 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="ReportGenerator" />
     <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="ReportGenerator" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/BookWorm.Basket.UnitTests/Application/GetBasketHandlerTests.cs b/tests/BookWorm.Basket.UnitTests/Application/GetBasketHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Basket.Domain;
-using BookWorm.Basket.Features;
+using BookWorm.Basket.Features;
 using BookWorm.Basket.Features.Get;
 using BasketModel = BookWorm.Basket.Domain.Basket;
 

diff --git a/tests/BookWorm.Basket.UnitTests/Application/ReduceItemQuantityHandlerTests.cs b/tests/BookWorm.Basket.UnitTests/Application/ReduceItemQuantityHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Basket.Domain;
-using BookWorm.Basket.Features.ReduceItemQuantity;
+using BookWorm.Basket.Features.ReduceItemQuantity;
 using BasketModel = BookWorm.Basket.Domain.Basket;
 
 namespace BookWorm.Basket.UnitTests.Application;

diff --git a/tests/BookWorm.Basket.UnitTests/Application/RemoveItemHandlerTests.cs b/tests/BookWorm.Basket.UnitTests/Application/RemoveItemHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Basket.Domain;
-using BookWorm.Basket.Features.RemoveItem;
+using BookWorm.Basket.Features.RemoveItem;
 using BasketModel = BookWorm.Basket.Domain.Basket;
 
 namespace BookWorm.Basket.UnitTests.Application;

diff --git a/tests/BookWorm.Basket.UnitTests/BookWorm.Basket.UnitTests.csproj b/tests/BookWorm.Basket.UnitTests/BookWorm.Basket.UnitTests.csproj
@@ -6,8 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Xunit.Combinatorial" />
@@ -16,7 +14,9 @@
   <ItemGroup>
     <PackageReference Include="Moq" />
     <PackageReference Include="ReportGenerator" />
+    <PackageReference Include="coverlet.collector" />
     <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/BookWorm.Basket.UnitTests/Domain/BasketItemTests.cs b/tests/BookWorm.Basket.UnitTests/Domain/BasketItemTests.cs
@@ -1,6 +1,4 @@
-using BookWorm.Basket.Domain;
-
-namespace BookWorm.Basket.UnitTests.Domain;
+namespace BookWorm.Basket.UnitTests.Domain;
 
 public class BasketItemTests
 {

diff --git a/tests/BookWorm.Basket.UnitTests/Domain/BasketTests.cs b/tests/BookWorm.Basket.UnitTests/Domain/BasketTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Basket.Domain;
-using BasketModel = BookWorm.Basket.Domain.Basket;
+using BasketModel = BookWorm.Basket.Domain.Basket;
 
 namespace BookWorm.Basket.UnitTests.Domain;
 

diff --git a/tests/BookWorm.Basket.UnitTests/GlobalUsings.cs b/tests/BookWorm.Basket.UnitTests/GlobalUsings.cs
@@ -1,5 +1,10 @@
-global using Ardalis.GuardClauses;
+global using Ardalis.GuardClauses;
+global using BookWorm.Basket.Domain;
 global using BookWorm.Basket.Grpc;
 global using BookWorm.Basket.Infrastructure.Redis;
 global using BookWorm.Shared.Identity;
+global using Google.Protobuf.WellKnownTypes;
 global using Grpc.Core;
+global using MediatR;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.Extensions.Logging;
diff --git a/tests/BookWorm.Basket.UnitTests/Services/BasketServiceTests.cs b/tests/BookWorm.Basket.UnitTests/Services/BasketServiceTests.cs
@@ -1,9 +1,6 @@
 using BookWorm.Basket.Features;
 using BookWorm.Basket.Features.Get;
 using BookWorm.Basket.UnitTests.Helpers;
-using MediatR;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 
 namespace BookWorm.Basket.UnitTests.Services;
 
@@ -25,7 +22,6 @@ public BasketServiceTests()
     public async Task GetBasket_ShouldReturnBasketResponse_WhenBasketExists()
     {
         // Arrange
-        var basketId = Guid.NewGuid().ToString();
         var basket = new BasketDto(Guid.NewGuid(),
         [
             new(Guid.NewGuid(), "Dummy Book", 10, 15m, 12m)
@@ -41,7 +37,7 @@ public async Task GetBasket_ShouldReturnBasketResponse_WhenBasketExists()
             .Setup(x => x.GetBookAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(book);
 
-        var request = new BasketRequest { BasketId = basketId };
+        var request = new Empty();
         var context = TestServerCallContext.Create();
         context.SetUserState("__HttpContext", new DefaultHttpContext());
 
@@ -56,13 +52,11 @@ public async Task GetBasket_ShouldReturnBasketResponse_WhenBasketExists()
     public async Task GetBasket_ShouldReturnEmpty_WhenBasketNotFound()
     {
         // Arrange
-        var basketId = Guid.NewGuid().ToString();
-
         _senderMock
             .Setup(x => x.Send(It.IsAny<GetBasketQuery>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync((BasketDto?)null!);
 
-        var request = new BasketRequest { BasketId = basketId };
+        var request = new Empty();
         var context = TestServerCallContext.Create();
         context.SetUserState("__HttpContext", new DefaultHttpContext());
 

diff --git a/tests/BookWorm.Catalog.IntegrationTests/BookWorm.Catalog.IntegrationTests.csproj b/tests/BookWorm.Catalog.IntegrationTests/BookWorm.Catalog.IntegrationTests.csproj
@@ -18,15 +18,15 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="ReportGenerator" />
     <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="ReportGenerator" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Authors/CreateAuthorHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Authors/CreateAuthorHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Authors.Create;
+using BookWorm.Catalog.Features.Authors.Create;
 
 namespace BookWorm.Catalog.UnitTests.Application.Authors;
 

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Authors/DeleteAuthorHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Authors/DeleteAuthorHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Authors.Delete;
+using BookWorm.Catalog.Features.Authors.Delete;
 using BookWorm.Catalog.UnitTests.Builder;
 
 namespace BookWorm.Catalog.UnitTests.Application.Authors;

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Authors/ListAuthorsHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Authors/ListAuthorsHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Authors.List;
+using BookWorm.Catalog.Features.Authors.List;
 using BookWorm.Catalog.UnitTests.Builder;
 
 namespace BookWorm.Catalog.UnitTests.Application.Authors;

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Categories/CreateCategoryHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Categories/CreateCategoryHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Categories.Create;
+using BookWorm.Catalog.Features.Categories.Create;
 
 namespace BookWorm.Catalog.UnitTests.Application.Categories;
 

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Categories/ListCategoriesHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Categories/ListCategoriesHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Categories.List;
+using BookWorm.Catalog.Features.Categories.List;
 using BookWorm.Catalog.UnitTests.Builder;
 
 namespace BookWorm.Catalog.UnitTests.Application.Categories;

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Publishers/CreatePublisherHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Publishers/CreatePublisherHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Publishers.Create;
+using BookWorm.Catalog.Features.Publishers.Create;
 
 namespace BookWorm.Catalog.UnitTests.Application.Publishers;
 

diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Publishers/ListPublishersHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Publishers/ListPublishersHandlerTests.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Domain;
-using BookWorm.Catalog.Features.Publishers.List;
+using BookWorm.Catalog.Features.Publishers.List;
 using BookWorm.Catalog.UnitTests.Builder;
 
 namespace BookWorm.Catalog.UnitTests.Application.Publishers;

diff --git a/tests/BookWorm.Catalog.UnitTests/BookWorm.Catalog.UnitTests.csproj b/tests/BookWorm.Catalog.UnitTests/BookWorm.Catalog.UnitTests.csproj
@@ -6,8 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Xunit.Combinatorial" />
@@ -16,7 +14,9 @@
   <ItemGroup>
     <PackageReference Include="Moq" />
     <PackageReference Include="ReportGenerator" />
-    <PackageReference Include="FluentAssertions" />    
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>