Merge pull request #5 from mt89vein/integration-tests

feat: add integration tests

Author: mt89vein

BookLibrary.Api/ApiModule.cs

@@ -1,8 +1,10 @@
-using BookLibrary.Api.Auth;
+using BookLibrary.Api.Auth;
 using BookLibrary.Api.ProblemDetails;
 using BookLibrary.Api.Swagger;
 using FluentValidation.AspNetCore;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.CookiePolicy;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.DependencyInjection;
@@ -35,6 +37,12 @@ public static void MapEndpoints(WebApplication app)
     /// </summary>
     private static void AddMockAuthentication(this WebApplicationBuilder builder)
     {
+        builder.Services.AddCookiePolicy(p =>
+        {
+            p.HttpOnly = HttpOnlyPolicy.Always;
+            p.Secure = CookieSecurePolicy.Always;
+        });
+
         builder.Services
             .AddAuthentication()
             .AddScheme<MockEmailAuthenticationOptions, MockEmailAuthenticationHandler>(

BookLibrary.Api/Auth/AccountController.cs

@@ -119,13 +119,7 @@ protected override Task HandleSignInAsync(ClaimsPrincipal user, AuthenticationPr
     {
         Context.Response.Cookies.Append(
             key: MockAuthenticationConstants.SESSION_COOKIE_NAME,
-            value: JsonSerializer.Serialize(user.Claims.Select(x => new MyClaim(x.Type, x.Value))),
-            new CookieOptions
-            {
-                HttpOnly = true,
-                Secure = true,
-                SameSite = SameSiteMode.Strict
-            });
+            value: JsonSerializer.Serialize(user.Claims.Select(x => new MyClaim(x.Type, x.Value))));
 
         return Task.CompletedTask;
     }

BookLibrary.Application/BookLibrary.Application.csproj

@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" />
+    <PackageReference Include="Microsoft.FeatureManagement" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>

BookLibrary.Application/FeatureFlags.cs

@@ -0,0 +1,12 @@
+namespace BookLibrary.Application;
+
+/// <summary>
+/// Application feature flags.
+/// </summary>
+public static class FeatureFlags
+{
+    /// <summary>
+    /// Is allowed to automatically apply migration on application startup.
+    /// </summary>
+    public const string AUTO_MIGRATIONS_ENABLED = "AutoMigrationsEnabled";
+}

BookLibrary.Application/Features/Books/BorrowBook/BorrowBookUseCase.cs

@@ -117,11 +117,12 @@ private async Task<Result<Book>> FetchBookAsync(BorrowBookCommand command, Cance
     {
         if (command.BookId.HasValue)
         {
+            var bookId = new BookId(command.BookId.Value);
             var bookById = await _ctx.Books
                 .AsTracking()
                 .TagWithFileMember()
                 .FirstOrDefaultAsync(
-                    x => x.Id == new BookId(command.BookId.Value),
+                    x => x.Id == bookId,
                     ct
                 );
 
@@ -130,13 +131,17 @@ private async Task<Result<Book>> FetchBookAsync(BorrowBookCommand command, Cance
                 : ErrorCodes.BookNotFound.ToDomainError();
         }
 
+        var isbn = new Isbn(command.Isbn!);
+        var publicationDate = command.PublicationDate.HasValue
+            ? new BookPublicationDate(command.PublicationDate.Value)
+            : null;
+
         var book = await _ctx.Books
             .AsTracking()
             .TagWithFileMember()
             .FirstOrDefaultAsync(
-                x => x.Isbn == new Isbn(command.Isbn!) &&
-                     (command.PublicationDate == null ||
-                      x.PublicationDate == new BookPublicationDate(command.PublicationDate.Value)) &&
+                x => x.Isbn == isbn &&
+                     (publicationDate == null || x.PublicationDate == publicationDate) &&
                      x.BorrowInfo == null,
                 ct
             );

BookLibrary.Host/Program.cs

@@ -39,6 +39,7 @@
     app.UseExceptionHandler();
     app.UseRouting();
 
+    app.UseCookiePolicy();
     app.UseAuthentication();
     app.UseAuthorization();
 
@@ -60,4 +61,6 @@
 finally
 {
     await Log.CloseAndFlushAsync();
-}
+}
+
+public class BookLibraryEntryPoint;

BookLibrary.Host/appsettings.Development.json

@@ -13,5 +13,8 @@
         "Microsoft.EntityFrameworkCore.Database.Command": "Information"
       }
     }
+  },
+  "FeatureManagement": {
+    "AutoMigrationsEnabled": true
   }
 }

BookLibrary.Host/appsettings.json

@@ -10,5 +10,8 @@
       }
     }
   },
+  "FeatureManagement": {
+    "AutoMigrationsEnabled": false
+  },
   "AllowedHosts": "*"
 }

BookLibrary.Infrastructure/EntityFramework/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using BookLibrary.Application.Infrastructure;
+using BookLibrary.Application.Infrastructure;
 using BookLibrary.Infrastructure.ValueConverters;
 using EntityFramework.Exceptions.PostgreSQL;
 using Microsoft.EntityFrameworkCore;
@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Npgsql;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 
 namespace BookLibrary.Infrastructure.EntityFramework;
 
@@ -20,8 +21,6 @@ internal static class ServiceCollectionExtensions
     /// <returns>Service registrator.</returns>
     public static IServiceCollection AddEntityFramework(this IServiceCollection services)
     {
-        NpgsqlDataSource? npgsqlDataSource = null; // should be singleton
-
         services
             .AddTransient<IConfigureOptions<ApplicationContextSettings>, ConfigureApplicationContextSettings>()
             .AddOptions<ApplicationContextSettings>()
@@ -44,24 +43,43 @@ public static IServiceCollection AddEntityFramework(this IServiceCollection serv
                         .EnableSensitiveDataLogging();
                 }
 
-                options.ConfigureWarnings(w => w.Ignore(CoreEventId.FirstWithoutOrderByAndFilterWarning));
-
-                npgsqlDataSource ??= new NpgsqlDataSourceBuilder(config.Value.ConnectionString)
-                    .EnableDynamicJson()
-                    .BuildMultiHost()
-                    .WithTargetSession(TargetSessionAttributes.Primary);
-
                 options
+                    .ConfigureWarnings(w => w.Ignore(CoreEventId.FirstWithoutOrderByAndFilterWarning))
                     .ReplaceService<IValueConverterSelector, ValueObjectsConverterSelectorByConvention>()
                     .UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking)
-                    .UseNpgsql(npgsqlDataSource, builder =>
-                    {
-                        builder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
-                        builder.MigrationsAssembly(typeof(ApplicationContext).Assembly.GetName().Name);
-                        builder.MigrationsHistoryTable("__EFMigrationHistory", ApplicationContext.DefaultScheme);
-                    })
                     .UseSnakeCaseNamingConvention()
                     .UseExceptionProcessor();
+
+                var accessor = sp.GetService<NpgsqlDataSourceAccessor>();
+
+                if (accessor is not null)
+                {
+                    options.UseNpgsql(accessor.NpgsqlDataSource, b =>
+                    {
+                        b.ConfigureNpgsql();
+                    });
+                }
+                else
+                {
+                    options.UseNpgsql(config.Value.ConnectionString, b =>
+                    {
+                        b.ConfigureNpgsql();
+                        b.ConfigureDataSource(ds => ds
+                            .EnableDynamicJson()
+                            .BuildMultiHost()
+                            .WithTargetSession(TargetSessionAttributes.Primary)
+                        );
+                    });
+                }
             });
     }
-}
+
+    private static void ConfigureNpgsql(this NpgsqlDbContextOptionsBuilder b)
+    {
+        b.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+        b.MigrationsAssembly(typeof(ApplicationContext).Assembly.GetName().Name);
+        b.MigrationsHistoryTable("__EFMigrationHistory", ApplicationContext.DefaultScheme);
+    }
+}
+
+public sealed record NpgsqlDataSourceAccessor(NpgsqlDataSource NpgsqlDataSource);

BookLibrary.Infrastructure/Extensions/HostExtensions.cs

@@ -1,6 +1,8 @@
+using BookLibrary.Application;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.FeatureManagement;
 using System.Diagnostics.CodeAnalysis;
 
 namespace BookLibrary.Infrastructure;
@@ -20,9 +22,14 @@ public static async Task MigrateAsync(this IHost host, CancellationToken ct = de
     {
         ArgumentNullException.ThrowIfNull(host);
 
-        using var scope = host.Services.CreateScope();
-        await using var ctx = scope.ServiceProvider.GetRequiredService<ApplicationContext>();
+        var featureManager = host.Services.GetRequiredService<IFeatureManager>();
 
-        await ctx.Database.MigrateAsync(ct);
+        if (await featureManager.IsEnabledAsync(FeatureFlags.AUTO_MIGRATIONS_ENABLED))
+        {
+            using var scope = host.Services.CreateScope();
+            await using var ctx = scope.ServiceProvider.GetRequiredService<ApplicationContext>();
+
+            await ctx.Database.MigrateAsync(ct);
+        }
     }
 }