Pull EF Core references out of Web into Infrastructure

Fixes #601

src/Clean.Architecture.Infrastructure/Data/AppDbContext.cs

@@ -2,9 +2,18 @@
 using Ardalis.SharedKernel;
 using Clean.Architecture.Core.ContributorAggregate;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Clean.Architecture.Infrastructure.Data;
 
+public static class AppDbContextExtensions
+{
+  public static void AddApplicationDbContext(this IServiceCollection services, string connectionString)
+  {
+    services.AddDbContext<AppDbContext>(options =>
+         options.UseSqlite(connectionString));
+  }
+}
 public class AppDbContext : DbContext
 {
   private readonly IDomainEventDispatcher? _dispatcher;

src/Clean.Architecture.Web/SeedData.cs → src/Clean.Architecture.Infrastructure/Data/SeedData.cs

@@ -1,13 +1,13 @@
 using Clean.Architecture.Core.ContributorAggregate;
-using Clean.Architecture.Infrastructure.Data;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
-namespace Clean.Architecture.Web;
+namespace Clean.Architecture.Infrastructure.Data;
 
 public static class SeedData
 {
-  public static readonly Contributor Contributor1 = new ("Ardalis");
-  public static readonly Contributor Contributor2 = new ("Snowfrog");
+  public static readonly Contributor Contributor1 = new("Ardalis");
+  public static readonly Contributor Contributor2 = new("Snowfrog");
 
   public static void Initialize(IServiceProvider serviceProvider)
   {

src/Clean.Architecture.Web/Program.cs

@@ -4,12 +4,10 @@
 using Clean.Architecture.Core;
 using Clean.Architecture.Infrastructure;
 using Clean.Architecture.Infrastructure.Data;
-using Clean.Architecture.Web;
 using FastEndpoints;
 using FastEndpoints.Swagger;
-using FastEndpoints.ApiExplorer;
 using Serilog;
-using Microsoft.EntityFrameworkCore;
+using Ardalis.GuardClauses;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -24,25 +22,15 @@
 });
 
 string? connectionString = builder.Configuration.GetConnectionString("SqliteConnection");
-builder.Services.AddDbContext<AppDbContext>(options =>
-          options.UseSqlite(connectionString));
+Guard.Against.Null(connectionString);
+builder.Services.AddApplicationDbContext(connectionString);
 
 builder.Services.AddFastEndpoints();
-//builder.Services.AddFastEndpointsApiExplorer();
 builder.Services.SwaggerDocument(o =>
 {
   o.ShortSchemaNames = true;
 });
 
-//builder.Services.AddSwaggerGen(c =>
-//{
-//  c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
-//  c.EnableAnnotations();
-//  string xmlCommentFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "swagger-docs.xml");
-//  c.IncludeXmlComments(xmlCommentFilePath);
-//  c.OperationFilter<FastEndpointsOperationFilter>();
-//});
-
 // add list services for diagnostic purposes - see https://github.com/ardalis/AspNetCoreStartupServices
 builder.Services.Configure<ServiceConfig>(config =>
 {
@@ -76,9 +64,6 @@
 
 app.UseHttpsRedirection();
 
-// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.), specifying the Swagger JSON endpoint.
-//app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"));
-
 // Seed Database
 using (var scope = app.Services.CreateScope())
 {

tests/Clean.Architecture.FunctionalTests/ApiEndpoints/ContributorGetById.cs

@@ -1,5 +1,5 @@
 using Ardalis.HttpClientTestExtensions;
-using Clean.Architecture.Web;
+using Clean.Architecture.Infrastructure.Data;
 using Clean.Architecture.Web.ContributorEndpoints;
 using Clean.Architecture.Web.Endpoints.ContributorEndpoints;
 using Xunit;

tests/Clean.Architecture.FunctionalTests/ApiEndpoints/ContributorList.cs

@@ -1,5 +1,5 @@
 using Ardalis.HttpClientTestExtensions;
-using Clean.Architecture.Web;
+using Clean.Architecture.Infrastructure.Data;
 using Clean.Architecture.Web.Endpoints.ContributorEndpoints;
 using Xunit;
 

tests/Clean.Architecture.FunctionalTests/CustomWebApplicationFactory.cs

@@ -1,7 +1,6 @@
 using Clean.Architecture.Infrastructure.Data;
 using Clean.Architecture.Infrastructure.Data.Queries;
 using Clean.Architecture.UseCases.Contributors.List;
-using Clean.Architecture.Web;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.EntityFrameworkCore;