重构单元测试和集成测试

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}

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
 {

src/HelloShop.BasketService/HelloShop.BasketService.csproj

@@ -14,7 +14,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.1.0" />
-    <PackageReference Include="Calzolari.Grpc.AspNetCore.Validation" Version="8.1.0" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.70.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.Swagger" Version="0.9.3" />

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<IBasketRepository, DistributedCacheBasketRepository>();
 
-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<OrderStartedDistributedEvent, OrderStartedDistributedEventHandler>();

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<CustomerBasketService> logger, IMapper mapper) : Basket.BasketBase
+    public class CustomerBasketService(IBasketRepository repository, ILogger<CustomerBasketService> logger, IMapper mapper, IValidator<UpdateBasketRequest> validator) : Basket.BasketBase
     {
         public override async Task<CustomerBasketResponse> GetBasket(Empty request, ServerCallContext context)
         {
@@ -35,7 +36,7 @@ namespace HelloShop.BasketService.Services
 
             if (basket is not null)
             {
-                mapper.Map<CustomerBasketResponse>(basket);
+                return mapper.Map<CustomerBasketResponse>(basket);
             }
 
             return new();
@@ -43,6 +44,12 @@ namespace HelloShop.BasketService.Services
 
         public override async Task<CustomerBasketResponse> 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))

src/HelloShop.HybridApp/Platforms/Android/MainActivity.cs

@@ -3,7 +3,6 @@
 
 using Android.App;
 using Android.Content.PM;
-using Microsoft.Maui;
 
 namespace HelloShop.HybridApp
 {

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
 {

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
 {

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
 {

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;
 

src/HelloShop.IdentityService/Program.cs

@@ -23,7 +23,7 @@ builder.Services.AddControllers();
 
 builder.Services.AddDbContext<IdentityServiceDbContext>(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<User, Role>(options =>

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;
 

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
 {

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;
 

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;
 

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<ProductServiceDbContext>(options =>
 {

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
 {

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
 {

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

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 { }

tests/HelloShop.BasketService.FunctionalTests/AuthenticatedInterceptor.cs

@@ -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<TResponse> AsyncUnaryCall<TRequest, TResponse>(TRequest request, ClientInterceptorContext<TRequest, TResponse> context, AsyncUnaryCallContinuation<TRequest, TResponse> 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<TRequest, TResponse>(context.Method, context.Host, newOptions);
-
-            return base.AsyncUnaryCall(request, newContext, continuation);
-        }
-    }
-}

tests/HelloShop.BasketService.FunctionalTests/BasketServiceIntegrationTest.cs

@@ -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);
-        }
-    }
-}

tests/HelloShop.BasketService.FunctionalTests/GreeterServiceIntegrationTest.cs

@@ -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);
-        }
-    }
-}

tests/HelloShop.BasketService.FunctionalTests/GrpcConstants.cs

@@ -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";
-    }
-}

tests/HelloShop.BasketService.FunctionalTests/HelloShop - Backup.BasketService.FunctionalTests.csproj

@@ -1,39 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.21.5" />
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.49.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.49.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="8.0.7" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Protobuf Include="..\..\src\HelloShop.BasketService\Protos\basket.proto" GrpcServices="Client">
-      <Link>Protos\basket.proto</Link>
-    </Protobuf>
-    <Protobuf Include="..\..\src\HelloShop.BasketService\Protos\greet.proto" GrpcServices="Client">
-      <Link>Protos\greet.proto</Link>
-    </Protobuf>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-</Project>

tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj

@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <IncludeHttpRuleProtos>true</IncludeHttpRuleProtos>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Google.Protobuf" Version="3.30.1" />
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.70.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.71.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="9.0.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Protobuf Include="..\..\src\HelloShop.BasketService\Protos\basket.proto" GrpcServices="Client">
-      <Link>Protos\basket.proto</Link>
-    </Protobuf>
-    <Protobuf Include="..\..\src\HelloShop.BasketService\Protos\greet.proto" GrpcServices="Client">
-      <Link>Protos\greet.proto</Link>
-    </Protobuf>
-  </ItemGroup>
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-</Project>

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<IBasketRepository>();
             var loggerMock = NullLogger<CustomerBasketService>.Instance;
             var mapperMock = new Mock<IMapper>();
-            var service = new CustomerBasketService(basketRepositoryMock.Object, loggerMock, mapperMock.Object);
+            var validatorMock = new Mock<IValidator<UpdateBasketRequest>>();
+            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<IBasketRepository>();
             basketRepositoryMock.Setup(x => x.GetBasketAsync(It.IsAny<int>(), It.IsAny<CancellationToken>())).ReturnsAsync(new CustomerBasket() { BuyerId = 1, Items = [new BasketItem { ProductId = 1, Quantity = 1 }] });
 
+            var validatorMock = new Mock<IValidator<UpdateBasketRequest>>();
+
             var logger = NullLogger<CustomerBasketService>.Instance;
 
             var mapper = new Mapper(new MapperConfiguration(cfg => cfg.AddProfile<BasketsMapConfiguration>()));
 
-            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<CustomerBasketService>.Instance;
             var mapper = new Mapper(new MapperConfiguration(cfg => cfg.AddProfile<BasketsMapConfiguration>()));
 
-            var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper);
+            var validatorMock = new Mock<IValidator<UpdateBasketRequest>>();
+            validatorMock.Setup(x => x.ValidateAsync(It.IsAny<UpdateBasketRequest>(), It.IsAny<CancellationToken>())).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<IBasketRepository>();
             var logger = NullLogger<CustomerBasketService>.Instance;
             var mapper = new Mapper(new MapperConfiguration(cfg => cfg.AddProfile<BasketsMapConfiguration>()));
-            var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper);
+
+            var validatorMock = new Mock<IValidator<UpdateBasketRequest>>();
+
+            var service = new CustomerBasketService(basketRepositoryMock.Object, logger, mapper, validatorMock.Object);
 
             TestServerCallContext serverCallContext = TestServerCallContext.Create();
 

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<TestingAspireAppHost>
     {
+        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<Projects.HelloShop_AppHost>();
+            var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
-            await using DistributedApplication app = await appHost.BuildAsync();
-            await app.StartAsync();
 
             // 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<Projects.HelloShop_AppHost>();
+            var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
-            await using DistributedApplication app = await appHost.BuildAsync();
-            await app.StartAsync();
 
             // 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<Projects.HelloShop_AppHost>();
+            var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
-            await using DistributedApplication app = await appHost.BuildAsync();
-            await app.StartAsync();
 
             // 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<Projects.HelloShop_AppHost>();
+            var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
-            await using DistributedApplication app = await appHost.BuildAsync();
-
-            await app.StartAsync();
 
             // 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<Projects.HelloShop_AppHost>();
+            var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
-
-            await using DistributedApplication app = await appHost.BuildAsync();
-            await app.StartAsync();
 
             // 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<JsonNode>();
 
-            string? productName = result?["Name"]?.GetValue<string>();
+            int? productId = result?["Id"]?.GetValue<int?>();
 
             // Assert
-            Assert.NotNull(productName);
+            Assert.NotNull(productId);
-            Assert.Equal("Product 1", productName);
+            Assert.Equal(1, productId);
         }
     }
 }

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<IServiceProvider> _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();
+    }
+
+}

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<BrandDetailsResponse>();
 
+
             // Assert
             Assert.NotNull(brandDetails);
             Assert.Equal(1, brandDetails.Id);

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<TProgram> : WebApplicationFactory<TProgram> 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<ProductServiceDbContext>));
+                var dbContextDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(DbContextOptions<ProductServiceDbContext>));
-
                 if (dbContextDescriptor != null)
                 {
                     services.Remove(dbContextDescriptor);
                 }
 
-                // Create open SqliteConnection so EF won't automatically close it.
+                var dbConnectionDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(DbConnection));
-                services.AddSingleton(container =>
+                if (dbConnectionDescriptor != null)
                 {
-                    DbConnection connection = new SqliteConnection("DataSource=:memory:");
+                    services.Remove(dbConnectionDescriptor);
+                }
+
+                var optionsConfigurationDescriptor = services.SingleOrDefault(d => d.ServiceType == typeof(IDbContextOptionsConfiguration<ProductServiceDbContext>));
+                if (optionsConfigurationDescriptor != null)
+                {
+                    services.Remove(optionsConfigurationDescriptor);
+                }
+
+                // Create open SqliteConnection so EF won't automatically close it.
+                services.AddSingleton<DbConnection>(container =>
+                {
+                    var connection = new SqliteConnection("DataSource=file::memory:?cache=shared");
                     connection.Open();
 
                     return connection;
                 });
 
-                services.AddDbContext<ProductServiceDbContext>((container, options) =>
+                services.AddDbContextPool<ProductServiceDbContext>((container, options) =>
                 {
                     var connection = container.GetRequiredService<DbConnection>();
-                    options.UseSqlite(connection);
+                    options.UseSqlite(connection).UseSnakeCaseNamingConvention();
+                    options.ConfigureWarnings(warnings => warnings.Ignore(RelationalEventId.PendingModelChangesWarning));
                 });
 
                 services.Replace(ServiceDescriptor.Transient<IPermissionChecker, FakePermissionChecker>());
@@ -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);
         }
     }

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
     {

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<ProductServiceDbContext>
     {

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