Merge pull request #11 from PandaTechAM/development

updated nuggets

Author: HaikAsatryan

src/SharedKernel.Postgres/AuditTrail/AuditTrailDecryption.cs

@@ -1,12 +1,10 @@
-using System.Reflection;
-using AuditTrail.Abstractions;
-using AuditTrail.Extensions;
+using EFCore.Audit.Extensions;
+using EFCore.AuditBase.Extensions;
 using EFCore.PostgresExtensions.Extensions;
 using EntityFramework.Exceptions.PostgreSQL;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using SharedKernel.Postgres.AuditTrail;
 
 namespace SharedKernel.Postgres.Extensions;
 
@@ -16,40 +14,52 @@ public static WebApplicationBuilder AddPostgresContext<TContext>(this WebApplica
       string connectionString)
       where TContext : DbContext
    {
-      builder.Services.AddDbContextPool<TContext>(options =>
+      builder.Services.AddDbContext<TContext>(options =>
       {
          options
-            .UseNpgsql(connectionString)
-            .UseQueryLocks()
-            .UseSnakeCaseNamingConvention()
-            .UseExceptionProcessor();
+            .AddStandardOptions(connectionString);
       });
 
       builder.AddPostgresHealthCheck(connectionString);
 
       return builder;
    }
 
-   public static WebApplicationBuilder AddPostgresContextWithAuditTrail<TContext, TPermission, TConsumer>(
-      this WebApplicationBuilder builder,
-      string connectionString,
-      params Assembly[] assemblies)
+   public static WebApplicationBuilder AddPostgresContextPool<TContext>(this WebApplicationBuilder builder,
+      string connectionString)
       where TContext : DbContext
-      where TConsumer : class, IAuditTrailConsumer<TPermission, TContext>
+   {
+      builder.Services.AddDbContextPool<TContext>(options =>
+      {
+         options.AddStandardOptions(connectionString);
+      });
 
+      builder.AddPostgresHealthCheck(connectionString);
+
+      return builder;
+   }
+
+   public static WebApplicationBuilder AddPostgresContextWithAuditTrail<TContext>(this WebApplicationBuilder builder,
+      string connectionString) where TContext : DbContext
    {
-      builder.Services.AddAuditTrail<TPermission, TConsumer, AuditTrailDecryption, TContext>(assemblies,
-         s => s.AutoOpenTransaction = true);
+      builder.Services.AddDbContext<TContext>((sp, options) =>
+      {
+         options.AddStandardOptions(connectionString)
+                .AddAuditTrailInterceptors(sp);
+      });
+
+      builder.AddPostgresHealthCheck(connectionString);
 
+      return builder;
+   }
 
+   public static WebApplicationBuilder AddPostgresContextPoolWithAuditTrail<TContext>(this WebApplicationBuilder builder,
+      string connectionString) where TContext : DbContext
+   {
       builder.Services.AddDbContextPool<TContext>((sp, options) =>
       {
-         options
-            .UseNpgsql(connectionString)
-            .UseQueryLocks()
-            .UseSnakeCaseNamingConvention()
-            .UseExceptionProcessor()
-            .UseAuditTrail<TPermission, TContext>(sp);
+         options.AddStandardOptions(connectionString)
+                .AddAuditTrailInterceptors(sp);
       });
 
       builder.AddPostgresHealthCheck(connectionString);
@@ -65,4 +75,15 @@ public static WebApplication MigrateDatabase<TContext>(this WebApplication app)
       dbContext.Database.Migrate();
       return app;
    }
+
+   private static DbContextOptionsBuilder AddStandardOptions(this DbContextOptionsBuilder optionsBuilder,
+      string connectionString)
+   {
+      return optionsBuilder
+             .UseNpgsql(connectionString)
+             .UseQueryLocks()
+             .UseAuditBaseValidatorInterceptor()
+             .UseSnakeCaseNamingConvention()
+             .UseExceptionProcessor();
+   }
 }

src/SharedKernel.Postgres/Extensions/WebAppExtensions.cs

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.7</Version>
+        <Version>1.0.8</Version>
         <PackageId>Pandatech.SharedKernel.Postgres</PackageId>
         <Title>Pandatech.SharedKernel.Postgres</Title>
         <PackageTags>Pandatech; PostgreSQL; Entity Framework Core; EF Core; Health Checks; Exception Handling; Database Migration; .NET; ASP.NET Core; Shared Kernel</PackageTags>
@@ -29,9 +29,9 @@
         <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
         <PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
-        <PackageReference Include="Pandatech.AuditTrail" Version="2.0.0" />
         <PackageReference Include="Pandatech.Crypto" Version="4.1.1" />
-        <PackageReference Include="Pandatech.EFCore.AuditBase" Version="2.0.0" />
+        <PackageReference Include="Pandatech.EFCore.Audit" Version="1.0.0" />
+        <PackageReference Include="Pandatech.EFCore.AuditBase" Version="3.0.0" />
         <PackageReference Include="Pandatech.EFCore.PostgresExtensions" Version="4.0.0" />
         <PackageReference Include="PandaTech.FileExporter" Version="4.0.0" />
         <PackageReference Include="PandaTech.FluentImporter" Version="3.0.0" />