WIP

Author: aritchie

src/Shiny.Extensions.EntityFramework/EntityFrameworkExtensions.cs

@@ -30,30 +30,30 @@ public static DbContextOptionsBuilder UseAuditing(this DbContextOptionsBuilder b
     }
 
 
-    public static IServiceCollection AddDbContextQueryLogging<T>(this IServiceCollection services, TimeSpan minLogDuration) where T : class, IContextInfoProvider
-    {
-        services.AddScoped<T>();
-        services.AddScoped(sp =>
-        {
-            var contextInfo = sp.GetRequiredService<T>();
-            return new QueryLogDbCommandInterceptor(contextInfo, minLogDuration);
-        });
-        return services;
-    }
-
-
-    public static IServiceCollection AddDbContextQueryLogging(
-        this IServiceCollection services,
-        IContextInfoProvider contextProvider,
-        TimeSpan minLogDuration
-    ) => services.AddScoped(_ => new QueryLogDbCommandInterceptor(contextProvider, minLogDuration));
-    
-    
-    public static void UseQueryLogging(this DbContextOptionsBuilder builder, IServiceProvider scope)
-    {
-        var interceptor = scope.GetRequiredService<QueryLogDbCommandInterceptor>();
-        builder.AddInterceptors(interceptor);
-    } 
+    // public static IServiceCollection AddDbContextQueryLogging<T>(this IServiceCollection services, TimeSpan minLogDuration) where T : class, IContextInfoProvider
+    // {
+    //     services.AddScoped<T>();
+    //     services.AddScoped(sp =>
+    //     {
+    //         var contextInfo = sp.GetRequiredService<T>();
+    //         return new QueryLogDbCommandInterceptor(contextInfo, minLogDuration);
+    //     });
+    //     return services;
+    // }
+    //
+    //
+    // public static IServiceCollection AddDbContextQueryLogging(
+    //     this IServiceCollection services,
+    //     IContextInfoProvider contextProvider,
+    //     TimeSpan minLogDuration
+    // ) => services.AddScoped(_ => new QueryLogDbCommandInterceptor(contextProvider, minLogDuration));
+    //
+    //
+    // public static void UseQueryLogging(this DbContextOptionsBuilder builder, IServiceProvider scope)
+    // {
+    //     var interceptor = scope.GetRequiredService<QueryLogDbCommandInterceptor>();
+    //     builder.AddInterceptors(interceptor);
+    // } 
 
 
     public static ModelConfigurationBuilder SetDefaultStringLength(this ModelConfigurationBuilder configurationBuilder, int length = 50, bool unicode = true)

src/Shiny.Extensions.EntityFramework/QueryLog/QueryLogDbCommandInterceptor.cs

@@ -43,6 +43,7 @@ protected void TryLog(DbCommand command, CommandExecutedEventData eventData)
             };
             try
             {
+                // TODO: may cause a loop due to nonexecutequery
                 // TODO: cannot audit seeding/migrations data
                 eventData.Context!.Add(log);
                 eventData.Context.SaveChanges();

tests/Shiny.Extensions.EntityFramework.Tests/EfTests.cs

@@ -16,12 +16,12 @@ public EfTests()
 
         var services = new ServiceCollection();
         services.AddDbContextAuditing(this.contextProvider);
-        services.AddDbContextQueryLogging(this.contextProvider, TimeSpan.Zero);
+        // services.AddDbContextQueryLogging(this.contextProvider, TimeSpan.Zero);
 
         services.AddDbContext<TestDbContext>((sp, opts) => opts
             .UseNpgsql(new NpgsqlDataSourceBuilder("User ID=sa;Password=Blargh911!;Host=localhost;Port=5432;Database=AuditUnitTests;Pooling=true;Connection Lifetime=30;").Build())
             .UseAuditing(sp)
-            .UseQueryLogging(sp)
+            // .UseQueryLogging(sp)
             // .UseSqlite("Data Source=test.db")
         );
         this.serviceProvider = services.BuildServiceProvider();