From 81c8f608dcb4baed8f735c7cd700b5c79dfc75e8 Mon Sep 17 00:00:00 2001 From: hello Date: Sat, 15 Mar 2025 17:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=92=8C=E9=9B=86=E6=88=90=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HelloShop.sln | 7 -- .../DaprSidecarResourceBuilderExtensions.cs | 5 -- .../HelloShop.BasketService.csproj | 1 - src/HelloShop.BasketService/Program.cs | 4 +- .../Services/CustomerBasketService.cs | 11 ++- .../Platforms/Android/MainActivity.cs | 1 - .../Platforms/MacCatalyst/AppDelegate.cs | 1 - .../Platforms/iOS/AppDelegate.cs | 1 - .../DataSeeding/UserDataSeedingProvider.cs | 1 - .../20241123020852_InitialCreate.cs | 4 +- src/HelloShop.IdentityService/Program.cs | 2 +- .../Orders/CreateOrderCommandHandler.cs | 1 - ...tributedEventLogEntityTypeConfiguration.cs | 6 +- .../20241123020913_InitialCreate.cs | 4 +- .../20241123020927_InitialCreate.cs | 4 +- src/HelloShop.ProductService/Program.cs | 11 +++ .../DistributedLocks/DaprDistributedLock.cs | 5 -- .../DaprDistributedLockResult.cs | 5 -- .../DistributedLocks/IDistributedLock.cs | 6 -- .../IDistributedLockResult.cs | 6 -- .../AuthenticatedInterceptor.cs | 25 ------- .../BasketServiceIntegrationTest.cs | 69 ------------------- .../GreeterServiceIntegrationTest.cs | 25 ------- .../GrpcConstants.cs | 10 --- ...ackup.BasketService.FunctionalTests.csproj | 39 ----------- ...oShop.BasketService.FunctionalTests.csproj | 40 ----------- .../Services/BasketServiceTest.cs | 19 +++-- .../FirstWebApiIntegrationTest.cs | 47 +++++++------ .../Helpers/TestingAspireAppHost.cs | 31 +++++++++ .../BrandApiIntegrationTest.cs | 5 +- .../CustomWebApplicationFactory.cs | 33 ++++++--- .../FakeAccessTokenCreator.cs | 2 +- .../FakeDbContextFactory.cs | 2 +- .../ProductsControllerTest.cs | 2 +- 34 files changed, 135 insertions(+), 300 deletions(-) delete mode 100644 tests/HelloShop.BasketService.FunctionalTests/AuthenticatedInterceptor.cs delete mode 100644 tests/HelloShop.BasketService.FunctionalTests/BasketServiceIntegrationTest.cs delete mode 100644 tests/HelloShop.BasketService.FunctionalTests/GreeterServiceIntegrationTest.cs delete mode 100644 tests/HelloShop.BasketService.FunctionalTests/GrpcConstants.cs delete mode 100644 tests/HelloShop.BasketService.FunctionalTests/HelloShop - Backup.BasketService.FunctionalTests.csproj delete mode 100644 tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj create mode 100644 tests/HelloShop.FunctionalTests/Helpers/TestingAspireAppHost.cs rename tests/HelloShop.ProductService.FunctionalTests/{Utilities => Helpers}/CustomWebApplicationFactory.cs (54%) rename tests/HelloShop.ProductService.FunctionalTests/{Utilities => Helpers}/FakeAccessTokenCreator.cs (95%) rename tests/HelloShop.ProductService.UnitTests/{Utilities => Helpers}/FakeDbContextFactory.cs (91%) diff --git a/HelloShop.sln b/HelloShop.sln index 928b9b7..0e50d99 100644 --- a/HelloShop.sln +++ b/HelloShop.sln @@ -33,8 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.FunctionalTests", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.BasketService.UnitTests", "tests\HelloShop.BasketService.UnitTests\HelloShop.BasketService.UnitTests.csproj", "{BE88233A-D6EB-462B-B53C-B588A0BEFAFC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.BasketService.FunctionalTests", "tests\HelloShop.BasketService.FunctionalTests\HelloShop.BasketService.FunctionalTests.csproj", "{A0903D4D-EA4E-433A-AC5B-BE6ED4A5C958}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -95,10 +93,6 @@ Global {BE88233A-D6EB-462B-B53C-B588A0BEFAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE88233A-D6EB-462B-B53C-B588A0BEFAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE88233A-D6EB-462B-B53C-B588A0BEFAFC}.Release|Any CPU.Build.0 = Release|Any CPU - {A0903D4D-EA4E-433A-AC5B-BE6ED4A5C958}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0903D4D-EA4E-433A-AC5B-BE6ED4A5C958}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0903D4D-EA4E-433A-AC5B-BE6ED4A5C958}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0903D4D-EA4E-433A-AC5B-BE6ED4A5C958}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -117,7 +111,6 @@ Global {E58F82E2-2E48-459B-A40E-497F24FC6DC1} = {1AD03316-A743-4E9D-B3BC-FB9499D15141} {6BAA9747-E0D0-41B9-8A1B-88B777498C43} = {29BE158E-825E-48AB-A02D-4E537A5DC502} {BE88233A-D6EB-462B-B53C-B588A0BEFAFC} = {29BE158E-825E-48AB-A02D-4E537A5DC502} - {A0903D4D-EA4E-433A-AC5B-BE6ED4A5C958} = {29BE158E-825E-48AB-A02D-4E537A5DC502} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {845545A8-2006-46C3-ABD7-5BDF63F3858C} diff --git a/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs b/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs index 69882d2..781efe9 100644 --- a/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs +++ b/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs @@ -3,11 +3,6 @@ using CommunityToolkit.Aspire.Hosting.Dapr; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HelloShop.AppHost.Extensions { diff --git a/src/HelloShop.BasketService/HelloShop.BasketService.csproj b/src/HelloShop.BasketService/HelloShop.BasketService.csproj index 7e23340..354f23c 100644 --- a/src/HelloShop.BasketService/HelloShop.BasketService.csproj +++ b/src/HelloShop.BasketService/HelloShop.BasketService.csproj @@ -14,7 +14,6 @@ - diff --git a/src/HelloShop.BasketService/Program.cs b/src/HelloShop.BasketService/Program.cs index 2c04b56..db9f6a6 100644 --- a/src/HelloShop.BasketService/Program.cs +++ b/src/HelloShop.BasketService/Program.cs @@ -1,7 +1,6 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. -using Calzolari.Grpc.AspNetCore.Validation; using HelloShop.BasketService.DistributedEvents.EventHandling; using HelloShop.BasketService.DistributedEvents.Events; using HelloShop.BasketService.Repositories; @@ -31,7 +30,7 @@ builder.Services.AddHttpContextAccessor(); builder.AddRedisDistributedCache("cache"); builder.Services.AddSingleton(); -builder.Services.AddGrpc(options => options.EnableMessageValidation()).AddJsonTranscoding(); +builder.Services.AddGrpc().AddJsonTranscoding(); builder.Services.AddGrpcSwagger(); builder.Services.AddOpenApi(); @@ -40,7 +39,6 @@ builder.Services.AddCustomLocalization(); builder.Services.AddModelMapper().AddModelValidator(); builder.Services.AddLocalization().AddPermissionDefinitions(); builder.Services.AddAuthorization().AddRemotePermissionChecker().AddCustomAuthorization(); -builder.Services.AddGrpcValidation(); builder.Services.AddCors(); builder.AddDaprDistributedEventBus().AddSubscription(); diff --git a/src/HelloShop.BasketService/Services/CustomerBasketService.cs b/src/HelloShop.BasketService/Services/CustomerBasketService.cs index 5d7739d..6832ce3 100644 --- a/src/HelloShop.BasketService/Services/CustomerBasketService.cs +++ b/src/HelloShop.BasketService/Services/CustomerBasketService.cs @@ -2,6 +2,7 @@ // See the license file in the project root for more information. using AutoMapper; +using FluentValidation; using Google.Protobuf.WellKnownTypes; using Grpc.Core; using HelloShop.BasketService.Entities; @@ -18,7 +19,7 @@ using System.Security.Claims; namespace HelloShop.BasketService.Services { [Authorize] - public class CustomerBasketService(IBasketRepository repository, ILogger logger, IMapper mapper) : Basket.BasketBase + public class CustomerBasketService(IBasketRepository repository, ILogger logger, IMapper mapper, IValidator validator) : Basket.BasketBase { public override async Task GetBasket(Empty request, ServerCallContext context) { @@ -35,7 +36,7 @@ namespace HelloShop.BasketService.Services if (basket is not null) { - mapper.Map(basket); + return mapper.Map(basket); } return new(); @@ -43,6 +44,12 @@ namespace HelloShop.BasketService.Services public override async Task UpdateBasket(UpdateBasketRequest request, ServerCallContext context) { + var validationResult = await validator.ValidateAsync(request); + if (!validationResult.IsValid) + { + throw new RpcException(new Status(StatusCode.InvalidArgument, validationResult.ToString())); + } + string? nameIdentifier = context.GetHttpContext().User.FindFirst(ClaimTypes.NameIdentifier)?.Value; if (!int.TryParse(nameIdentifier, out int userId)) diff --git a/src/HelloShop.HybridApp/Platforms/Android/MainActivity.cs b/src/HelloShop.HybridApp/Platforms/Android/MainActivity.cs index b25c497..ec136df 100644 --- a/src/HelloShop.HybridApp/Platforms/Android/MainActivity.cs +++ b/src/HelloShop.HybridApp/Platforms/Android/MainActivity.cs @@ -3,7 +3,6 @@ using Android.App; using Android.Content.PM; -using Microsoft.Maui; namespace HelloShop.HybridApp { diff --git a/src/HelloShop.HybridApp/Platforms/MacCatalyst/AppDelegate.cs b/src/HelloShop.HybridApp/Platforms/MacCatalyst/AppDelegate.cs index c29aa58..b948df0 100644 --- a/src/HelloShop.HybridApp/Platforms/MacCatalyst/AppDelegate.cs +++ b/src/HelloShop.HybridApp/Platforms/MacCatalyst/AppDelegate.cs @@ -2,7 +2,6 @@ // See the license file in the project root for more information. using Foundation; -using Microsoft.Maui; namespace HelloShop.HybridApp { diff --git a/src/HelloShop.HybridApp/Platforms/iOS/AppDelegate.cs b/src/HelloShop.HybridApp/Platforms/iOS/AppDelegate.cs index c29aa58..b948df0 100644 --- a/src/HelloShop.HybridApp/Platforms/iOS/AppDelegate.cs +++ b/src/HelloShop.HybridApp/Platforms/iOS/AppDelegate.cs @@ -2,7 +2,6 @@ // See the license file in the project root for more information. using Foundation; -using Microsoft.Maui; namespace HelloShop.HybridApp { diff --git a/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs b/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs index 1e1d1de..80b2283 100644 --- a/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs +++ b/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs @@ -6,7 +6,6 @@ using HelloShop.IdentityService.Infrastructure; using HelloShop.ServiceDefaults.Infrastructure; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; namespace HelloShop.IdentityService.DataSeeding { diff --git a/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.cs b/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.cs index e4cb9c0..b576aa7 100644 --- a/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.cs +++ b/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.cs @@ -1,4 +1,6 @@ -using System; +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; diff --git a/src/HelloShop.IdentityService/Program.cs b/src/HelloShop.IdentityService/Program.cs index b0f000e..acbec42 100644 --- a/src/HelloShop.IdentityService/Program.cs +++ b/src/HelloShop.IdentityService/Program.cs @@ -23,7 +23,7 @@ builder.Services.AddControllers(); builder.Services.AddDbContext(options => { - options.UseNpgsql(builder.Configuration.GetConnectionString(DbConstants.ConnectionStringName),x=>x.MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName)); + options.UseNpgsql(builder.Configuration.GetConnectionString(DbConstants.ConnectionStringName), x => x.MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName)); }); builder.Services.AddIdentity(options => diff --git a/src/HelloShop.OrderingService/Commands/Orders/CreateOrderCommandHandler.cs b/src/HelloShop.OrderingService/Commands/Orders/CreateOrderCommandHandler.cs index 38e5b89..3c38c11 100644 --- a/src/HelloShop.OrderingService/Commands/Orders/CreateOrderCommandHandler.cs +++ b/src/HelloShop.OrderingService/Commands/Orders/CreateOrderCommandHandler.cs @@ -8,7 +8,6 @@ using HelloShop.OrderingService.Entities.Orders; using HelloShop.OrderingService.Infrastructure; using HelloShop.OrderingService.LocalEvents; using HelloShop.OrderingService.Services; -using HelloShop.ServiceDefaults.DistributedEvents.Abstractions; using MediatR; using Microsoft.EntityFrameworkCore; diff --git a/src/HelloShop.OrderingService/Infrastructure/EntityConfigurations/EventLogs/DistributedEventLogEntityTypeConfiguration.cs b/src/HelloShop.OrderingService/Infrastructure/EntityConfigurations/EventLogs/DistributedEventLogEntityTypeConfiguration.cs index a34e235..a9f3c94 100644 --- a/src/HelloShop.OrderingService/Infrastructure/EntityConfigurations/EventLogs/DistributedEventLogEntityTypeConfiguration.cs +++ b/src/HelloShop.OrderingService/Infrastructure/EntityConfigurations/EventLogs/DistributedEventLogEntityTypeConfiguration.cs @@ -2,10 +2,10 @@ // See the license file in the project root for more information. using HelloShop.OrderingService.Entities.EventLogs; -using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Microsoft.EntityFrameworkCore; -using System.Text.Json; using HelloShop.ServiceDefaults.DistributedEvents.Abstractions; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using System.Text.Json; namespace HelloShop.OrderingService.Infrastructure.EntityConfigurations.EventLogs { diff --git a/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.cs b/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.cs index 9fc75dd..ab6f2fd 100644 --- a/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.cs +++ b/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.cs @@ -1,4 +1,6 @@ -using System; +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; diff --git a/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.cs b/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.cs index 2d1faef..7f8be9a 100644 --- a/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.cs +++ b/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.cs @@ -1,4 +1,6 @@ -using System; +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; diff --git a/src/HelloShop.ProductService/Program.cs b/src/HelloShop.ProductService/Program.cs index 6afaf75..2e99bd4 100644 --- a/src/HelloShop.ProductService/Program.cs +++ b/src/HelloShop.ProductService/Program.cs @@ -8,6 +8,8 @@ using HelloShop.ServiceDefaults.DistributedEvents.DaprBuildingBlocks; using HelloShop.ServiceDefaults.DistributedLocks; using HelloShop.ServiceDefaults.Extensions; using Microsoft.EntityFrameworkCore; +using Microsoft.IdentityModel.Tokens; +using System.Text; var builder = WebApplication.CreateBuilder(args); @@ -17,6 +19,15 @@ builder.AddServiceDefaults(); builder.Services.AddControllers(); +const string issuerSigningKey = HelloShop.ServiceDefaults.Constants.IdentityConstants.IssuerSigningKey; + +builder.Services.AddAuthentication().AddJwtBearer(options => +{ + options.TokenValidationParameters.ValidateIssuer = false; + options.TokenValidationParameters.ValidateAudience = false; + options.TokenValidationParameters.IssuerSigningKey = new SymmetricSecurityKey(Encoding.Default.GetBytes(issuerSigningKey)); +}); + // Add extensions services to the container. builder.Services.AddDbContext(options => { diff --git a/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLock.cs b/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLock.cs index c47f94a..1fdbf45 100644 --- a/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLock.cs +++ b/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLock.cs @@ -2,12 +2,7 @@ // See the license file in the project root for more information. using Dapr.Client; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HelloShop.ServiceDefaults.DistributedLocks { diff --git a/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLockResult.cs b/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLockResult.cs index 2921a71..248a010 100644 --- a/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLockResult.cs +++ b/src/HelloShop.ServiceDefaults/DistributedLocks/DaprDistributedLockResult.cs @@ -2,11 +2,6 @@ // See the license file in the project root for more information. using Dapr.Client; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HelloShop.ServiceDefaults.DistributedLocks { diff --git a/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLock.cs b/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLock.cs index f441ce0..31a1a9d 100644 --- a/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLock.cs +++ b/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLock.cs @@ -1,12 +1,6 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace HelloShop.ServiceDefaults.DistributedLocks { public interface IDistributedLock diff --git a/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLockResult.cs b/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLockResult.cs index 1d6e9b3..d11e2a0 100644 --- a/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLockResult.cs +++ b/src/HelloShop.ServiceDefaults/DistributedLocks/IDistributedLockResult.cs @@ -1,12 +1,6 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace HelloShop.ServiceDefaults.DistributedLocks { public interface IDistributedLockResult : IAsyncDisposable { } diff --git a/tests/HelloShop.BasketService.FunctionalTests/AuthenticatedInterceptor.cs b/tests/HelloShop.BasketService.FunctionalTests/AuthenticatedInterceptor.cs deleted file mode 100644 index a0975b6..0000000 --- a/tests/HelloShop.BasketService.FunctionalTests/AuthenticatedInterceptor.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using Grpc.Core; -using Grpc.Core.Interceptors; -using Microsoft.Net.Http.Headers; - -namespace HelloShop.BasketService.FunctionalTests -{ - internal class AuthenticatedInterceptor : Interceptor - { - public override AsyncUnaryCall AsyncUnaryCall(TRequest request, ClientInterceptorContext context, AsyncUnaryCallContinuation continuation) - { - const string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiIxIiwidW5pcXVlX25hbWUiOiJhZG1pbiIsInJvbGVpZCI6IjEiLCJuYmYiOjE3MjA1NzY3NDYsImV4cCI6MTc0MjYwODc0NiwiaWF0IjoxNzIwNTc2NzQ2fQ.ju_D3zeGLKqJYVckbb8Y3yNkp40nOqRAJrdOsISs4d4"; - - Metadata headers = [new Metadata.Entry(HeaderNames.Authorization, $"Bearer {token}")]; - - var newOptions = context.Options.WithHeaders(headers); - - var newContext = new ClientInterceptorContext(context.Method, context.Host, newOptions); - - return base.AsyncUnaryCall(request, newContext, continuation); - } - } -} diff --git a/tests/HelloShop.BasketService.FunctionalTests/BasketServiceIntegrationTest.cs b/tests/HelloShop.BasketService.FunctionalTests/BasketServiceIntegrationTest.cs deleted file mode 100644 index 86b7900..0000000 --- a/tests/HelloShop.BasketService.FunctionalTests/BasketServiceIntegrationTest.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using Google.Protobuf.WellKnownTypes; -using Grpc.Core; -using Grpc.Core.Interceptors; -using Grpc.Net.Client; -using HelloShop.BasketService.Protos; - -namespace HelloShop.BasketService.FunctionalTests -{ - public class BasketServiceIntegrationTest - { - private readonly Basket.BasketClient _client; - - public BasketServiceIntegrationTest() - { - GrpcChannel channel = GrpcChannel.ForAddress(GrpcConstants.GrpcAddress); - CallInvoker invoker = channel.Intercept(new AuthenticatedInterceptor()); - _client = new Basket.BasketClient(invoker); - } - - [Fact] - public async Task GetBasketReturnsBasket() - { - // Arrange - var request = new Empty(); - - // Act - var reply = await _client.GetBasketAsync(request); - - // Assert - Assert.NotNull(reply); - } - - [Fact] - public async Task UpdateBasketReturnsBasketResponse() - { - // Arrange - var request = new UpdateBasketRequest - { - Items = - { - new BasketListItem { ProductId = 1, Quantity = 2 }, - new BasketListItem { ProductId = 2, Quantity = 3 } - } - }; - - // Act - var reply = await _client.UpdateBasketAsync(request); - - // Assert - Assert.Equal(2, reply.Items.Count); - } - - [Fact] - public async Task DeleteBasketReturnsEmpty() - { - // Arrange - var request = new Empty(); - - // Act - var reply = await _client.DeleteBasketAsync(request); - - // Assert - Assert.NotNull(reply); - } - } -} \ No newline at end of file diff --git a/tests/HelloShop.BasketService.FunctionalTests/GreeterServiceIntegrationTest.cs b/tests/HelloShop.BasketService.FunctionalTests/GreeterServiceIntegrationTest.cs deleted file mode 100644 index d7cc13a..0000000 --- a/tests/HelloShop.BasketService.FunctionalTests/GreeterServiceIntegrationTest.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using Grpc.Net.Client; -using HelloShop.BasketService.Protos; - -namespace HelloShop.BasketService.FunctionalTests -{ - public class GreeterServiceIntegrationTest - { - [Fact] - public async Task SayHelloReturnsHelloMessage() - { - // Arrange - using var channel = GrpcChannel.ForAddress(GrpcConstants.GrpcAddress); - var client = new Greeter.GreeterClient(channel); - - // Act - var reply = await client.SayHelloAsync(new HelloRequest { Name = "Greeter" }); - - // Assert - Assert.Equal("Hello Greeter", reply.Message); - } - } -} diff --git a/tests/HelloShop.BasketService.FunctionalTests/GrpcConstants.cs b/tests/HelloShop.BasketService.FunctionalTests/GrpcConstants.cs deleted file mode 100644 index 8e2abfa..0000000 --- a/tests/HelloShop.BasketService.FunctionalTests/GrpcConstants.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -namespace HelloShop.BasketService.FunctionalTests -{ - internal class GrpcConstants - { - public const string GrpcAddress = "http://localhost:8004"; - } -} diff --git a/tests/HelloShop.BasketService.FunctionalTests/HelloShop - Backup.BasketService.FunctionalTests.csproj b/tests/HelloShop.BasketService.FunctionalTests/HelloShop - Backup.BasketService.FunctionalTests.csproj deleted file mode 100644 index 510c478..0000000 --- a/tests/HelloShop.BasketService.FunctionalTests/HelloShop - Backup.BasketService.FunctionalTests.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - net8.0 - enable - enable - - false - true - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - Protos\basket.proto - - - Protos\greet.proto - - - - - - - - diff --git a/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj b/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj deleted file mode 100644 index 353a791..0000000 --- a/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - net9.0 - enable - enable - false - true - true - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - Protos\basket.proto - - - Protos\greet.proto - - - - - - \ No newline at end of file diff --git a/tests/HelloShop.BasketService.UnitTests/Services/BasketServiceTest.cs b/tests/HelloShop.BasketService.UnitTests/Services/BasketServiceTest.cs index 626cc39..2650de3 100644 --- a/tests/HelloShop.BasketService.UnitTests/Services/BasketServiceTest.cs +++ b/tests/HelloShop.BasketService.UnitTests/Services/BasketServiceTest.cs @@ -2,6 +2,8 @@ // See the license file in the project root for more information. using AutoMapper; +using FluentValidation; +using FluentValidation.Results; using Google.Protobuf.WellKnownTypes; using HelloShop.BasketService.AutoMapper; using HelloShop.BasketService.Entities; @@ -25,7 +27,8 @@ namespace HelloShop.BasketService.UnitTests.Services var basketRepositoryMock = new Mock(); var loggerMock = NullLogger.Instance; var mapperMock = new Mock(); - var service = new CustomerBasketService(basketRepositoryMock.Object, loggerMock, mapperMock.Object); + var validatorMock = new Mock>(); + var service = new CustomerBasketService(basketRepositoryMock.Object, loggerMock, mapperMock.Object, validatorMock.Object); TestServerCallContext serverCallContext = TestServerCallContext.Create(); @@ -50,11 +53,13 @@ namespace HelloShop.BasketService.UnitTests.Services var basketRepositoryMock = new Mock(); basketRepositoryMock.Setup(x => x.GetBasketAsync(It.IsAny(), It.IsAny())).ReturnsAsync(new CustomerBasket() { BuyerId = 1, Items = [new BasketItem { ProductId = 1, Quantity = 1 }] }); + var validatorMock = new Mock>(); + var logger = NullLogger.Instance; var mapper = new Mapper(new MapperConfiguration(cfg => cfg.AddProfile())); - var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper); + var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper, validatorMock.Object); TestServerCallContext serverCallContext = TestServerCallContext.Create(); @@ -82,7 +87,10 @@ namespace HelloShop.BasketService.UnitTests.Services var logger = NullLogger.Instance; var mapper = new Mapper(new MapperConfiguration(cfg => cfg.AddProfile())); - var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper); + var validatorMock = new Mock>(); + validatorMock.Setup(x => x.ValidateAsync(It.IsAny(), It.IsAny())).ReturnsAsync(new ValidationResult()); + + var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper, validatorMock.Object); TestServerCallContext serverCallContext = TestServerCallContext.Create(); @@ -112,7 +120,10 @@ namespace HelloShop.BasketService.UnitTests.Services var basketRepositoryMock = new Mock(); var logger = NullLogger.Instance; var mapper = new Mapper(new MapperConfiguration(cfg => cfg.AddProfile())); - var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper); + + var validatorMock = new Mock>(); + + var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper, validatorMock.Object); TestServerCallContext serverCallContext = TestServerCallContext.Create(); diff --git a/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs b/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs index f309595..588eeea 100644 --- a/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs +++ b/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs @@ -1,8 +1,10 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. -using Aspire.Hosting; +using Aspire.Hosting.ApplicationModel; +using HelloShop.FunctionalTests.Helpers; using Microsoft.AspNetCore.Authentication.BearerToken; +using Microsoft.Extensions.DependencyInjection; using System.Dynamic; using System.Net; using System.Net.Http.Headers; @@ -11,18 +13,24 @@ using System.Text.Json.Nodes; namespace HelloShop.FunctionalTests { - public class FirstWebApiIntegrationTest + public class FirstWebApiIntegrationTest(TestingAspireAppHost app) : IAsyncLifetime, IClassFixture { + public async Task InitializeAsync() + { + await app.StartAsync(); + } + + public async Task DisposeAsync() => await Task.CompletedTask; + [Fact] public async Task WebAppRootReturnsOkStatusCode() { // Arrange - IDistributedApplicationTestingBuilder appHost = await DistributedApplicationTestingBuilder.CreateAsync(); - await using DistributedApplication app = await appHost.BuildAsync(); - await app.StartAsync(); + var resourceNotificationService = app.Services.GetRequiredService(); // Act HttpClient httpClient = app.CreateHttpClient("webapp"); + await resourceNotificationService.WaitForResourceAsync("webapp", KnownResourceStates.Running).WaitAsync(TimeSpan.FromSeconds(30)); HttpResponseMessage response = await httpClient.GetAsync("/"); // Assert @@ -33,12 +41,11 @@ namespace HelloShop.FunctionalTests public async Task IdetityServiceAccountLoginReturnsSuccessStatusCode() { // Arrange - IDistributedApplicationTestingBuilder appHost = await DistributedApplicationTestingBuilder.CreateAsync(); - await using DistributedApplication app = await appHost.BuildAsync(); - await app.StartAsync(); + var resourceNotificationService = app.Services.GetRequiredService(); // Act HttpClient httpClient = app.CreateHttpClient("identityservice"); + await resourceNotificationService.WaitForResourceHealthyAsync("identityservice").WaitAsync(TimeSpan.FromSeconds(30)); HttpResponseMessage response = await httpClient.PostAsJsonAsync("api/Account/Login", new { UserName = "guest", @@ -53,12 +60,11 @@ namespace HelloShop.FunctionalTests public async Task IdetityServiceAccountLoginReturnsAccessToken() { // Arrange - IDistributedApplicationTestingBuilder appHost = await DistributedApplicationTestingBuilder.CreateAsync(); - await using DistributedApplication app = await appHost.BuildAsync(); - await app.StartAsync(); + var resourceNotificationService = app.Services.GetRequiredService(); // Act HttpClient httpClient = app.CreateHttpClient("identityservice"); + await resourceNotificationService.WaitForResourceHealthyAsync("identityservice").WaitAsync(TimeSpan.FromSeconds(30)); HttpResponseMessage response = await httpClient.PostAsJsonAsync("api/Account/Login", new { UserName = "guest", @@ -74,13 +80,11 @@ namespace HelloShop.FunctionalTests public async Task IdetityServiceAccountLoginReturnsTokenExpiresInSeconds() { // Arrange - IDistributedApplicationTestingBuilder appHost = await DistributedApplicationTestingBuilder.CreateAsync(); - await using DistributedApplication app = await appHost.BuildAsync(); - - await app.StartAsync(); + var resourceNotificationService = app.Services.GetRequiredService(); // Act HttpClient httpClient = app.CreateHttpClient("identityservice"); + await resourceNotificationService.WaitForResourceHealthyAsync("identityservice").WaitAsync(TimeSpan.FromSeconds(30)); HttpResponseMessage response = await httpClient.PostAsJsonAsync("api/Account/Login", new { UserName = "guest", @@ -97,13 +101,11 @@ namespace HelloShop.FunctionalTests public async Task ProductServiceGetProductReturnsProductDetails() { // Arrange - IDistributedApplicationTestingBuilder appHost = await DistributedApplicationTestingBuilder.CreateAsync(); - - await using DistributedApplication app = await appHost.BuildAsync(); - await app.StartAsync(); + var resourceNotificationService = app.Services.GetRequiredService(); // Act HttpClient identityServiceHttpClient = app.CreateHttpClient("identityservice"); + await resourceNotificationService.WaitForResourceHealthyAsync("identityservice").WaitAsync(TimeSpan.FromSeconds(30)); HttpResponseMessage loginResponse = await identityServiceHttpClient.PostAsJsonAsync("api/Account/Login", new { UserName = "admin", @@ -114,16 +116,17 @@ namespace HelloShop.FunctionalTests HttpClient productServiceHttpClient = app.CreateHttpClient("productservice"); productServiceHttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessTokenResponse?.AccessToken); + await resourceNotificationService.WaitForResourceHealthyAsync("productservice").WaitAsync(TimeSpan.FromSeconds(30)); HttpResponseMessage productDetailsResponse = await productServiceHttpClient.GetAsync("api/Products/1"); JsonNode? result = await productDetailsResponse.Content.ReadFromJsonAsync(); - string? productName = result?["Name"]?.GetValue(); + int? productId = result?["Id"]?.GetValue(); // Assert - Assert.NotNull(productName); - Assert.Equal("Product 1", productName); + Assert.NotNull(productId); + Assert.Equal(1, productId); } } } \ No newline at end of file diff --git a/tests/HelloShop.FunctionalTests/Helpers/TestingAspireAppHost.cs b/tests/HelloShop.FunctionalTests/Helpers/TestingAspireAppHost.cs new file mode 100644 index 0000000..b43c9af --- /dev/null +++ b/tests/HelloShop.FunctionalTests/Helpers/TestingAspireAppHost.cs @@ -0,0 +1,31 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + +using Aspire.Hosting; +using Microsoft.Extensions.DependencyInjection; + +namespace HelloShop.FunctionalTests.Helpers +{ + public class TestingAspireAppHost : DistributedApplicationFactory + { + private readonly TaskCompletionSource _serviceTcs = new(); + + public TestingAspireAppHost() : base(typeof(Projects.HelloShop_AppHost)) { } + + protected override void OnBuilderCreated(DistributedApplicationBuilder applicationBuilder) + { + applicationBuilder.Services.ConfigureHttpClientDefaults(clientBuilder => + { + clientBuilder.AddStandardResilienceHandler(); + }); + } + + protected override void OnBuilt(DistributedApplication application) + { + _serviceTcs.SetResult(application.Services); + } + + public IServiceProvider Services => _serviceTcs.Task.GetAwaiter().GetResult(); + } + +} diff --git a/tests/HelloShop.ProductService.FunctionalTests/BrandApiIntegrationTest.cs b/tests/HelloShop.ProductService.FunctionalTests/BrandApiIntegrationTest.cs index 794f8db..d8a6be2 100644 --- a/tests/HelloShop.ProductService.FunctionalTests/BrandApiIntegrationTest.cs +++ b/tests/HelloShop.ProductService.FunctionalTests/BrandApiIntegrationTest.cs @@ -1,7 +1,7 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. -using HelloShop.ProductService.FunctionalTests.Utilities; +using HelloShop.ProductService.FunctionalTests.Helpers; using HelloShop.ProductService.Models.Products; using System.Net; using System.Net.Http.Json; @@ -31,8 +31,11 @@ namespace HelloShop.ProductService.FunctionalTests // Act HttpResponseMessage response = await client.GetAsync("api/Brands/1"); + string responseContent = await response.Content.ReadAsStringAsync(); + BrandDetailsResponse? brandDetails = await response.Content.ReadFromJsonAsync(); + // Assert Assert.NotNull(brandDetails); Assert.Equal(1, brandDetails.Id); diff --git a/tests/HelloShop.ProductService.FunctionalTests/Utilities/CustomWebApplicationFactory.cs b/tests/HelloShop.ProductService.FunctionalTests/Helpers/CustomWebApplicationFactory.cs similarity index 54% rename from tests/HelloShop.ProductService.FunctionalTests/Utilities/CustomWebApplicationFactory.cs rename to tests/HelloShop.ProductService.FunctionalTests/Helpers/CustomWebApplicationFactory.cs index e6a0a55..9587aa1 100644 --- a/tests/HelloShop.ProductService.FunctionalTests/Utilities/CustomWebApplicationFactory.cs +++ b/tests/HelloShop.ProductService.FunctionalTests/Helpers/CustomWebApplicationFactory.cs @@ -7,40 +7,54 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Diagnostics; +using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using System.Data.Common; using System.Net.Http.Headers; -namespace HelloShop.ProductService.FunctionalTests.Utilities +namespace HelloShop.ProductService.FunctionalTests.Helpers { public class CustomWebApplicationFactory : WebApplicationFactory where TProgram : class { protected override void ConfigureWebHost(IWebHostBuilder builder) { - builder.ConfigureServices(services => + builder.ConfigureServices(static services => { - ServiceDescriptor? dbContextDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(DbContextOptions)); - + var dbContextDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(DbContextOptions)); if (dbContextDescriptor != null) { services.Remove(dbContextDescriptor); } - // Create open SqliteConnection so EF won't automatically close it. - services.AddSingleton(container => + var dbConnectionDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(DbConnection)); + if (dbConnectionDescriptor != null) { - DbConnection connection = new SqliteConnection("DataSource=:memory:"); + services.Remove(dbConnectionDescriptor); + } + + var optionsConfigurationDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(IDbContextOptionsConfiguration)); + if (optionsConfigurationDescriptor != null) + { + services.Remove(optionsConfigurationDescriptor); + } + + // Create open SqliteConnection so EF won't automatically close it. + services.AddSingleton(container => + { + var connection = new SqliteConnection("DataSource=file::memory:?cache=shared"); connection.Open(); return connection; }); - services.AddDbContext((container, options) => + services.AddDbContextPool((container, options) => { var connection = container.GetRequiredService(); - options.UseSqlite(connection); + options.UseSqlite(connection).UseSnakeCaseNamingConvention(); + options.ConfigureWarnings(warnings => warnings.Ignore(RelationalEventId.PendingModelChangesWarning)); }); services.Replace(ServiceDescriptor.Transient()); @@ -52,7 +66,6 @@ namespace HelloShop.ProductService.FunctionalTests.Utilities protected override void ConfigureClient(HttpClient client) { client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", FakeAccessTokenCreator.Create()); - base.ConfigureClient(client); } } diff --git a/tests/HelloShop.ProductService.FunctionalTests/Utilities/FakeAccessTokenCreator.cs b/tests/HelloShop.ProductService.FunctionalTests/Helpers/FakeAccessTokenCreator.cs similarity index 95% rename from tests/HelloShop.ProductService.FunctionalTests/Utilities/FakeAccessTokenCreator.cs rename to tests/HelloShop.ProductService.FunctionalTests/Helpers/FakeAccessTokenCreator.cs index ccb5c97..27f051b 100644 --- a/tests/HelloShop.ProductService.FunctionalTests/Utilities/FakeAccessTokenCreator.cs +++ b/tests/HelloShop.ProductService.FunctionalTests/Helpers/FakeAccessTokenCreator.cs @@ -7,7 +7,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Text; -namespace HelloShop.ProductService.FunctionalTests.Utilities +namespace HelloShop.ProductService.FunctionalTests.Helpers { public class FakeAccessTokenCreator { diff --git a/tests/HelloShop.ProductService.UnitTests/Utilities/FakeDbContextFactory.cs b/tests/HelloShop.ProductService.UnitTests/Helpers/FakeDbContextFactory.cs similarity index 91% rename from tests/HelloShop.ProductService.UnitTests/Utilities/FakeDbContextFactory.cs rename to tests/HelloShop.ProductService.UnitTests/Helpers/FakeDbContextFactory.cs index da99e87..4002314 100644 --- a/tests/HelloShop.ProductService.UnitTests/Utilities/FakeDbContextFactory.cs +++ b/tests/HelloShop.ProductService.UnitTests/Helpers/FakeDbContextFactory.cs @@ -4,7 +4,7 @@ using HelloShop.ProductService.Infrastructure; using Microsoft.EntityFrameworkCore; -namespace HelloShop.ProductService.UnitTests.Utilities +namespace HelloShop.ProductService.UnitTests.Helpers { public class FakeDbContextFactory : IDbContextFactory { diff --git a/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs b/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs index 5f2638b..afc1e48 100644 --- a/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs +++ b/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs @@ -7,7 +7,7 @@ using HelloShop.ProductService.Controllers; using HelloShop.ProductService.Entities.Products; using HelloShop.ProductService.Infrastructure; using HelloShop.ProductService.Models.Products; -using HelloShop.ProductService.UnitTests.Utilities; +using HelloShop.ProductService.UnitTests.Helpers; using Microsoft.AspNetCore.Mvc; namespace HelloShop.ProductService.UnitTests