diff --git a/Directory.Packages.props b/Directory.Packages.props index 64ce427..d3d14df 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ true 8.2.0 0.0.4 - 8.8.0 + 8.9.1 8.0.8 8.0.8 8.0.1 @@ -27,7 +27,7 @@ - + diff --git a/bun.lockb b/bun.lockb index 07262a9..989faff 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 2f16e45..458a109 100644 --- 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 index f3c2f52..7a41629 100644 --- 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,14 +9,8 @@ public sealed class BasketService(ISender sender, IBookService bookService, ILog : GrpcBasketBase { [AllowAnonymous] - public override async Task GetBasket(BasketRequest request, ServerCallContext context) + public override async Task 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)) @@ -23,6 +18,12 @@ public override async Task GetBasket(BasketRequest request, Serv 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 index 2188c8d..c1a618c 100644 --- 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 index 4fe2fae..fd780e8 100644 --- a/src/BookWorm.Catalog/BookWorm.Catalog.csproj +++ b/src/BookWorm.Catalog/BookWorm.Catalog.csproj @@ -20,8 +20,11 @@ - + + + + diff --git a/src/BookWorm.Catalog/Infrastructure/Ai/Extension.cs b/src/BookWorm.Catalog/Infrastructure/Ai/Extension.cs index 29954b5..e2f99a0 100644 --- 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(); return builder; diff --git a/src/BookWorm.MailDev.Hosting/MailDevResource.cs b/src/BookWorm.MailDev.Hosting/MailDevResource.cs index da8d2e2..9964c80 100644 --- a/src/BookWorm.MailDev.Hosting/MailDevResource.cs +++ b/src/BookWorm.MailDev.Hosting/MailDevResource.cs @@ -1,5 +1,9 @@ namespace BookWorm.MailDev.Hosting; +/// +/// https://github.com/davidfowl/Build2024AspireDemo/blob/main/AppHost/MailDev/MailDevResource.cs +/// +/// 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 index 9845edd..5cd53c9 100644 --- a/src/BookWorm.MailDev.Hosting/MailDevResourceBuilderExtensions.cs +++ b/src/BookWorm.MailDev.Hosting/MailDevResourceBuilderExtensions.cs @@ -1,5 +1,8 @@ namespace BookWorm.MailDev.Hosting; +/// +/// https://github.com/davidfowl/Build2024AspireDemo/blob/main/AppHost/MailDev/MailDevResourceBuilderExtensions.cs +/// public static class MailDevResourceBuilderExtensions { public static IResourceBuilder AddMailDev( diff --git a/src/BookWorm.Ordering/Grpc/BasketService.cs b/src/BookWorm.Ordering/Grpc/BasketService.cs index 97a2346..4299fc2 100644 --- a/src/BookWorm.Ordering/Grpc/BasketService.cs +++ b/src/BookWorm.Ordering/Grpc/BasketService.cs @@ -14,7 +14,7 @@ public async Task 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 index ec85216..6bdc6cf 100644 --- a/src/BookWorm.ServiceDefaults/BookWorm.ServiceDefaults.csproj +++ b/src/BookWorm.ServiceDefaults/BookWorm.ServiceDefaults.csproj @@ -9,20 +9,18 @@ - - + - + - - + diff --git a/src/BookWorm.Shared/BookWorm.Shared.csproj b/src/BookWorm.Shared/BookWorm.Shared.csproj index 8e4c9b9..c905f00 100644 --- a/src/BookWorm.Shared/BookWorm.Shared.csproj +++ b/src/BookWorm.Shared/BookWorm.Shared.csproj @@ -5,16 +5,16 @@ - - + + diff --git a/tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj b/tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj index e826644..08a6cb7 100644 --- a/tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj +++ b/tests/BookWorm.Basket.IntegrationTests/BookWorm.Basket.IntegrationTests.csproj @@ -19,15 +19,15 @@ + - - - + + diff --git a/tests/BookWorm.Basket.UnitTests/Application/GetBasketHandlerTests.cs b/tests/BookWorm.Basket.UnitTests/Application/GetBasketHandlerTests.cs index 47bb22f..e4835f7 100644 --- 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 index 6aff7d6..84241f5 100644 --- 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 index 1557c34..d129f15 100644 --- 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 index b6cd72d..1d5da1c 100644 --- a/tests/BookWorm.Basket.UnitTests/BookWorm.Basket.UnitTests.csproj +++ b/tests/BookWorm.Basket.UnitTests/BookWorm.Basket.UnitTests.csproj @@ -6,8 +6,6 @@ - - @@ -16,7 +14,9 @@ + + diff --git a/tests/BookWorm.Basket.UnitTests/Domain/BasketItemTests.cs b/tests/BookWorm.Basket.UnitTests/Domain/BasketItemTests.cs index fb2be84..da9443c 100644 --- 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 index 6edf691..43121d9 100644 --- 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 index f4a4634..bc66985 100644 --- 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 index 69b4fe7..04310df 100644 --- 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(), It.IsAny())) .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(), It.IsAny())) .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 index 123890c..1c633f5 100644 --- a/tests/BookWorm.Catalog.IntegrationTests/BookWorm.Catalog.IntegrationTests.csproj +++ b/tests/BookWorm.Catalog.IntegrationTests/BookWorm.Catalog.IntegrationTests.csproj @@ -18,15 +18,15 @@ + - - - + + diff --git a/tests/BookWorm.Catalog.UnitTests/Application/Authors/CreateAuthorHandlerTests.cs b/tests/BookWorm.Catalog.UnitTests/Application/Authors/CreateAuthorHandlerTests.cs index 4af3029..d327f9a 100644 --- 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 index fa6566a..d257e36 100644 --- 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 index 292ac26..d7647aa 100644 --- 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 index cea75df..76d8340 100644 --- 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 index e4ba926..df506c8 100644 --- 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 index ba907d3..0882e08 100644 --- 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 index 95e7d1a..1a5e938 100644 --- 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 index 145d725..eaa174e 100644 --- a/tests/BookWorm.Catalog.UnitTests/BookWorm.Catalog.UnitTests.csproj +++ b/tests/BookWorm.Catalog.UnitTests/BookWorm.Catalog.UnitTests.csproj @@ -6,8 +6,6 @@ - - @@ -16,7 +14,9 @@ - + + + diff --git a/tests/BookWorm.Catalog.UnitTests/Builder/AuthorBuilder.cs b/tests/BookWorm.Catalog.UnitTests/Builder/AuthorBuilder.cs index 1f5cbfa..6f4d0dd 100644 --- a/tests/BookWorm.Catalog.UnitTests/Builder/AuthorBuilder.cs +++ b/tests/BookWorm.Catalog.UnitTests/Builder/AuthorBuilder.cs @@ -1,6 +1,4 @@ -using BookWorm.Catalog.Domain; - -namespace BookWorm.Catalog.UnitTests.Builder; +namespace BookWorm.Catalog.UnitTests.Builder; public static class AuthorBuilder { diff --git a/tests/BookWorm.Catalog.UnitTests/Builder/CategoryBuilder.cs b/tests/BookWorm.Catalog.UnitTests/Builder/CategoryBuilder.cs index 1a0db22..a5ceef3 100644 --- a/tests/BookWorm.Catalog.UnitTests/Builder/CategoryBuilder.cs +++ b/tests/BookWorm.Catalog.UnitTests/Builder/CategoryBuilder.cs @@ -1,6 +1,4 @@ -using BookWorm.Catalog.Domain; - -namespace BookWorm.Catalog.UnitTests.Builder; +namespace BookWorm.Catalog.UnitTests.Builder; public static class CategoryBuilder { diff --git a/tests/BookWorm.Catalog.UnitTests/Builder/PublisherBuilder.cs b/tests/BookWorm.Catalog.UnitTests/Builder/PublisherBuilder.cs index 2d65c66..1f1f939 100644 --- a/tests/BookWorm.Catalog.UnitTests/Builder/PublisherBuilder.cs +++ b/tests/BookWorm.Catalog.UnitTests/Builder/PublisherBuilder.cs @@ -1,6 +1,4 @@ -using BookWorm.Catalog.Domain; - -namespace BookWorm.Catalog.UnitTests.Builder; +namespace BookWorm.Catalog.UnitTests.Builder; public static class PublisherBuilder { diff --git a/tests/BookWorm.Catalog.UnitTests/Domain/AuthorAggregatorTests.cs b/tests/BookWorm.Catalog.UnitTests/Domain/AuthorAggregatorTests.cs index c0cd28b..cfb9366 100644 --- a/tests/BookWorm.Catalog.UnitTests/Domain/AuthorAggregatorTests.cs +++ b/tests/BookWorm.Catalog.UnitTests/Domain/AuthorAggregatorTests.cs @@ -1,6 +1,4 @@ -using BookWorm.Catalog.Domain; - -namespace BookWorm.Catalog.UnitTests.Domain; +namespace BookWorm.Catalog.UnitTests.Domain; public sealed class AuthorAggregatorTests { diff --git a/tests/BookWorm.Catalog.UnitTests/Domain/CategoryAggregatorTests.cs b/tests/BookWorm.Catalog.UnitTests/Domain/CategoryAggregatorTests.cs index 00af0d1..d27b0e0 100644 --- a/tests/BookWorm.Catalog.UnitTests/Domain/CategoryAggregatorTests.cs +++ b/tests/BookWorm.Catalog.UnitTests/Domain/CategoryAggregatorTests.cs @@ -1,6 +1,4 @@ -using BookWorm.Catalog.Domain; - -namespace BookWorm.Catalog.UnitTests.Domain; +namespace BookWorm.Catalog.UnitTests.Domain; public sealed class CategoryAggregatorTests { diff --git a/tests/BookWorm.Catalog.UnitTests/Domain/PublisherAggregatorTests.cs b/tests/BookWorm.Catalog.UnitTests/Domain/PublisherAggregatorTests.cs index 6050ed4..86be9ee 100644 --- a/tests/BookWorm.Catalog.UnitTests/Domain/PublisherAggregatorTests.cs +++ b/tests/BookWorm.Catalog.UnitTests/Domain/PublisherAggregatorTests.cs @@ -1,6 +1,4 @@ -using BookWorm.Catalog.Domain; - -namespace BookWorm.Catalog.UnitTests.Domain; +namespace BookWorm.Catalog.UnitTests.Domain; public sealed class PublisherAggregatorTests { diff --git a/tests/BookWorm.Catalog.UnitTests/GlobalUsings.cs b/tests/BookWorm.Catalog.UnitTests/GlobalUsings.cs index 962494b..879cf71 100644 --- a/tests/BookWorm.Catalog.UnitTests/GlobalUsings.cs +++ b/tests/BookWorm.Catalog.UnitTests/GlobalUsings.cs @@ -1,8 +1,10 @@ global using Ardalis.GuardClauses; global using Ardalis.Result; +global using BookWorm.Catalog.Domain; global using BookWorm.Catalog.Infrastructure.Ai; global using BookWorm.Catalog.Infrastructure.Blob; global using BookWorm.Core.SharedKernel; +global using MediatR; global using Microsoft.AspNetCore.Http; global using Microsoft.Extensions.Logging; global using Pgvector; diff --git a/tests/BookWorm.Catalog.UnitTests/Services/BookServiceTests.cs b/tests/BookWorm.Catalog.UnitTests/Services/BookServiceTests.cs index 8823e07..14a66e3 100644 --- a/tests/BookWorm.Catalog.UnitTests/Services/BookServiceTests.cs +++ b/tests/BookWorm.Catalog.UnitTests/Services/BookServiceTests.cs @@ -2,7 +2,6 @@ using BookWorm.Catalog.Grpc; using BookWorm.Catalog.UnitTests.Builder; using BookWorm.Catalog.UnitTests.Helpers; -using MediatR; using Book = BookWorm.Catalog.Domain.BookAggregate.Book; namespace BookWorm.Catalog.UnitTests.Services; diff --git a/tests/BookWorm.Ordering.IntegrationTests/BookWorm.Ordering.IntegrationTests.csproj b/tests/BookWorm.Ordering.IntegrationTests/BookWorm.Ordering.IntegrationTests.csproj index af80888..f13d927 100644 --- a/tests/BookWorm.Ordering.IntegrationTests/BookWorm.Ordering.IntegrationTests.csproj +++ b/tests/BookWorm.Ordering.IntegrationTests/BookWorm.Ordering.IntegrationTests.csproj @@ -18,15 +18,15 @@ + - - - + + diff --git a/tests/BookWorm.Ordering.UnitTests/BookWorm.Ordering.UnitTests.csproj b/tests/BookWorm.Ordering.UnitTests/BookWorm.Ordering.UnitTests.csproj index 059df43..5178fbc 100644 --- a/tests/BookWorm.Ordering.UnitTests/BookWorm.Ordering.UnitTests.csproj +++ b/tests/BookWorm.Ordering.UnitTests/BookWorm.Ordering.UnitTests.csproj @@ -6,8 +6,6 @@ - - @@ -16,7 +14,9 @@ + + diff --git a/tests/BookWorm.Rating.IntegrationTests/BookWorm.Rating.IntegrationTests.csproj b/tests/BookWorm.Rating.IntegrationTests/BookWorm.Rating.IntegrationTests.csproj index 43236b1..6c35393 100644 --- a/tests/BookWorm.Rating.IntegrationTests/BookWorm.Rating.IntegrationTests.csproj +++ b/tests/BookWorm.Rating.IntegrationTests/BookWorm.Rating.IntegrationTests.csproj @@ -19,15 +19,15 @@ + - - - + + diff --git a/tests/BookWorm.Rating.UnitTests/Application/CreateFeedbackHandlerTests.cs b/tests/BookWorm.Rating.UnitTests/Application/CreateFeedbackHandlerTests.cs index 90dde47..2527557 100644 --- a/tests/BookWorm.Rating.UnitTests/Application/CreateFeedbackHandlerTests.cs +++ b/tests/BookWorm.Rating.UnitTests/Application/CreateFeedbackHandlerTests.cs @@ -1,6 +1,4 @@ -using BookWorm.Contracts; -using BookWorm.Rating.Domain; -using BookWorm.Rating.Features.Create; +using BookWorm.Rating.Features.Create; namespace BookWorm.Rating.UnitTests.Application; diff --git a/tests/BookWorm.Rating.UnitTests/Application/DeleteFeedbackHandlerTests.cs b/tests/BookWorm.Rating.UnitTests/Application/DeleteFeedbackHandlerTests.cs index d348ac0..6d5a89e 100644 --- a/tests/BookWorm.Rating.UnitTests/Application/DeleteFeedbackHandlerTests.cs +++ b/tests/BookWorm.Rating.UnitTests/Application/DeleteFeedbackHandlerTests.cs @@ -1,6 +1,4 @@ -using BookWorm.Contracts; -using BookWorm.Rating.Domain; -using BookWorm.Rating.Features.Delete; +using BookWorm.Rating.Features.Delete; namespace BookWorm.Rating.UnitTests.Application; diff --git a/tests/BookWorm.Rating.UnitTests/Application/HideFeedbackHandlerTests.cs b/tests/BookWorm.Rating.UnitTests/Application/HideFeedbackHandlerTests.cs index d4d3565..0c5f718 100644 --- a/tests/BookWorm.Rating.UnitTests/Application/HideFeedbackHandlerTests.cs +++ b/tests/BookWorm.Rating.UnitTests/Application/HideFeedbackHandlerTests.cs @@ -1,5 +1,4 @@ -using BookWorm.Rating.Domain; -using BookWorm.Rating.Features.Hide; +using BookWorm.Rating.Features.Hide; namespace BookWorm.Rating.UnitTests.Application; diff --git a/tests/BookWorm.Rating.UnitTests/Application/ListFeedbackHandlerTests.cs b/tests/BookWorm.Rating.UnitTests/Application/ListFeedbackHandlerTests.cs index 66513d2..e3ce82c 100644 --- a/tests/BookWorm.Rating.UnitTests/Application/ListFeedbackHandlerTests.cs +++ b/tests/BookWorm.Rating.UnitTests/Application/ListFeedbackHandlerTests.cs @@ -1,5 +1,4 @@ -using BookWorm.Rating.Domain; -using BookWorm.Rating.Features.List; +using BookWorm.Rating.Features.List; namespace BookWorm.Rating.UnitTests.Application; diff --git a/tests/BookWorm.Rating.UnitTests/BookWorm.Rating.UnitTests.csproj b/tests/BookWorm.Rating.UnitTests/BookWorm.Rating.UnitTests.csproj index 0f244a7..1154d16 100644 --- a/tests/BookWorm.Rating.UnitTests/BookWorm.Rating.UnitTests.csproj +++ b/tests/BookWorm.Rating.UnitTests/BookWorm.Rating.UnitTests.csproj @@ -6,8 +6,6 @@ - - @@ -16,7 +14,9 @@ + + diff --git a/tests/BookWorm.Rating.UnitTests/Domain/FeedbackTests.cs b/tests/BookWorm.Rating.UnitTests/Domain/FeedbackTests.cs index c558ebe..59480c5 100644 --- a/tests/BookWorm.Rating.UnitTests/Domain/FeedbackTests.cs +++ b/tests/BookWorm.Rating.UnitTests/Domain/FeedbackTests.cs @@ -1,6 +1,4 @@ -using BookWorm.Rating.Domain; - -namespace BookWorm.Rating.UnitTests.Domain; +namespace BookWorm.Rating.UnitTests.Domain; public sealed class FeedbackTests { diff --git a/tests/BookWorm.Rating.UnitTests/GlobalUsings.cs b/tests/BookWorm.Rating.UnitTests/GlobalUsings.cs index 63c0b39..2323497 100644 --- a/tests/BookWorm.Rating.UnitTests/GlobalUsings.cs +++ b/tests/BookWorm.Rating.UnitTests/GlobalUsings.cs @@ -1,4 +1,6 @@ global using Ardalis.GuardClauses; +global using BookWorm.Contracts; +global using BookWorm.Rating.Domain; global using BookWorm.Rating.Repositories; global using BookWorm.Shared.Identity; global using MassTransit;