updated

Author: TheTrigger

F2.Repository.Demo/Startup.cs

@@ -1,11 +1,11 @@
+using F2.Repository.Demo.Mapper;
+using F2.Repository.Demo.Models;
+using F2.Repository.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using F2.Repository.Demo.Mapper;
-using F2.Repository.Demo.Models;
-using F2.Repository.Extensions;
 
 namespace F2.Repository.Demo;
 
@@ -16,10 +16,10 @@ public class Startup(IConfiguration configuration)
     // This method gets called by the runtime. Use this method to add services to the container.
     public void ConfigureServices(IServiceCollection services)
     {
-        services.AddHostedService<HostedDbMigrationService<LibraryContext>>();
+        services.AddDatabaseMigration<LibraryContext>();
 
         var connectionString = _configuration.GetConnectionString("Demo");
-        services.AddDbContext<LibraryContext>(config => config.UseNpgsql(connectionString));
+        services.AddDbContextFactory<LibraryContext>(config => config.UseNpgsql(connectionString));
         services.AddDatabaseScope<LibraryDbScope>();
 
         // https://github.com/AutoMapper/AutoMapper.Extensions.Microsoft.DependencyInjection
@@ -30,8 +30,6 @@ public void ConfigureServices(IServiceCollection services)
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
     public static void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
-        //app.UseDatabaseMigration<LibraryContext>(); // relational databases only
-
         app.UseRouting();
         app.UseEndpoints(endpoints => endpoints.MapControllers());
     }

F2.Repository/Abstracts/RepositoryBase.cs

@@ -36,16 +36,28 @@ public virtual EntityEntry<TEntity> Update(TEntity entity)
 	}
 
 	/// <summary>
-	/// <inheritdoc cref="Microsoft.EntityFrameworkCore.DbSet{TEntity}.Remove(TEntity)"/>
+    /// Marks multiple entities for deletion in the current context.
+    /// Untracked entities are automatically attached to the context.
 	/// </summary>
-	public virtual EntityEntry<TEntity> Remove(TEntity entity)
+    /// <param name="entities">Array of entities to remove</param>
+    /// <exception cref="ArgumentNullException">When entities array is null</exception>
+    public virtual void RemoveRange(params TEntity[] entities)
 	{
-		if (_context.Entry(entity).State == EntityState.Detached)
+        ArgumentNullException.ThrowIfNull(entities);
+
+        if (!entities.Any())
 		{
-			Set.Attach(entity);
+            return;
 		}
 
-		return Set.Remove(entity);
+        // Filter and attach detached entities
+        var detachedEntities = entities
+            .Where(e => _context.Entry(e).State == EntityState.Detached)
+            .ToArray();
+
+        if (detachedEntities.Any())
+        {
+            Set.AttachRange(detachedEntities);
 	}
 
 	public virtual void RemoveRange(params TEntity[] entities)

F2.Repository/Extensions/HostedDbMigrationService.cs

@@ -2,6 +2,17 @@
 
 namespace F2.Repository.Extensions;
 
+public static class DatabaseMigrationExtensions
+{
+    public static IServiceCollection AddDatabaseMigration<TContext>(this IServiceCollection services)
+        where TContext : DbContext
+    {
+        services.AddHostedService<HostedDbMigrationService<TContext>>();
+
+        return services;
+    }
+}
+
 public class HostedDbMigrationService<TContext> : IHostedService
     where TContext : DbContext
 {

F2.Repository/F2.Repository.csproj

@@ -20,7 +20,6 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<TargetFramework>net8.0</TargetFramework>
 		<Title>F2.Repository</Title>
-		<UserSecretsId>320f5e09-36cb-4c5b-8f02-72cbf1003ad1</UserSecretsId>
 		<Version>8.0.12</Version>
 		<OutputType>Library</OutputType>
 		<IsPackable>true</IsPackable>