cleanup audits

Author: iammukeshm

src/framework/Auditing/Auditing.Core/Abstractions/IAuditService.cs

@@ -3,5 +3,5 @@
 namespace FSH.Framework.Auditing.Core.Abstractions;
 public interface IAuditService
 {
-    Task<List<AuditTrail>> GetUserTrailsAsync(Guid userId);
+    Task<List<Trail>> GetUserTrailsAsync(Guid userId);
 }

src/framework/Auditing/Auditing.Core/Abstractions/IAuditingDbContext.cs

@@ -4,6 +4,6 @@
 namespace FSH.Framework.Auditing.Core.Abstractions;
 public interface IAuditingDbContext
 {
-    DbSet<AuditTrail> AuditTrails { get; }
+    DbSet<Trail> Trails { get; }
     Task<int> SaveChangesAsync(CancellationToken cancellationToken);
 }

src/framework/Auditing/Auditing.Core/Dtos/AuditTrail.cs renamed to src/framework/Auditing/Auditing.Core/Dtos/Trail.cs

@@ -5,7 +5,7 @@
 
 namespace FSH.Framework.Auditing.Core.Dtos;
 
-public class AuditTrail
+public class Trail
 {
     public Guid Id { get; set; }
     public Guid UserId { get; set; }

src/framework/Auditing/Auditing.Core/Events/AuditPublishedEvent.cs

@@ -5,9 +5,9 @@ namespace FSH.Framework.Auditing.Core.Events;
 
 public class AuditPublishedEvent : INotification
 {
-    public IReadOnlyCollection<AuditTrail> Trails { get; }
+    public IReadOnlyCollection<Trail> Trails { get; }
 
-    public AuditPublishedEvent(IReadOnlyCollection<AuditTrail> trails)
+    public AuditPublishedEvent(IReadOnlyCollection<Trail> trails)
     {
         Trails = trails;
     }

src/framework/Auditing/Auditing.Endpoints/AuditingModule.cs

@@ -35,7 +35,7 @@ public static IEndpointRouteBuilder MapAuditingEndpoints(this IEndpointRouteBuil
             .WithApiVersionSet(apiVersionSet);
 
         // v1 endpoints
-        GetUserAudits.MapEndpoint(group);
+        GetUserTrails.MapEndpoint(group);
 
         return endpoints;
     }

src/framework/Auditing/Auditing.Endpoints/v1/GetUserAudits.cs renamed to src/framework/Auditing/Auditing.Endpoints/v1/GetUserTrails.cs

@@ -9,10 +9,10 @@
 
 namespace FSH.Framework.Auditing.Endpoints.v1;
 
-public static class GetUserAudits
+public static class GetUserTrails
 {
     public sealed record Query(Guid UserId) : IQuery<Response>;
-    public sealed record Response(IReadOnlyList<AuditTrail> AuditTrails);
+    public sealed record Response(IReadOnlyList<Trail> AuditTrails);
     public sealed class Validator : AbstractValidator<Query>
     {
         public Validator()
@@ -22,15 +22,15 @@ public Validator()
     }
     public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder endpoints)
     {
-        return endpoints.MapGet("/auditing/users/{userId:guid}/trails", async (
+        return endpoints.MapGet("/users/{userId:guid}/trails", async (
             Guid id,
             IQueryDispatcher dispatcher,
             CancellationToken cancellationToken) =>
         {
             var result = await dispatcher.SendAsync<Query, Response>(new Query(id), cancellationToken);
             return TypedResults.Ok(result);
         })
-        .WithName(nameof(GetUserAudits))
+        .WithName(nameof(GetUserTrails))
         .WithSummary("Get user's audit trail details")
         .RequirePermission("Permissions.AuditTrails.View")
         .WithDescription("Get user's audit trail details.");

src/framework/Auditing/Auditing.Infrastructure/Data/AuditingConfiguration.cs

@@ -4,12 +4,12 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FSH.Framework.Auditing.Infrastructure.Data;
-public class AuditTrailConfig : IEntityTypeConfiguration<AuditTrail>
+public class TrailConfig : IEntityTypeConfiguration<Trail>
 {
-    public void Configure(EntityTypeBuilder<AuditTrail> builder)
+    public void Configure(EntityTypeBuilder<Trail> builder)
     {
         builder
-            .ToTable("AuditTrails", AuditingConstants.SchemaName)
+            .ToTable("Trails", AuditingConstants.SchemaName)
             .IsMultiTenant();
 
         builder.HasKey(a => a.Id);

src/framework/Auditing/Auditing.Infrastructure/Data/AuditingDbContext.cs

@@ -5,7 +5,7 @@
 namespace FSH.Framework.Auditing.Infrastructure.Data;
 public class AuditingDbContext : DbContext, IAuditingDbContext
 {
-    public DbSet<AuditTrail> AuditTrails { get; set; }
+    public DbSet<Trail> Trails { get; set; }
 
     public AuditingDbContext(DbContextOptions<AuditingDbContext> options) : base(options) { }
 

src/framework/Auditing/Auditing.Infrastructure/Handlers/AuditPublishedEventHandler.cs

@@ -21,7 +21,7 @@ public async Task Handle(AuditPublishedEvent notification, CancellationToken can
 
         try
         {
-            await context.AuditTrails.AddRangeAsync(notification.Trails, cancellationToken);
+            await context.Trails.AddRangeAsync(notification.Trails, cancellationToken);
             await context.SaveChangesAsync(cancellationToken);
             logger.LogInformation("Persisted {Count} audit trail(s).", notification.Trails.Count);
         }

src/framework/Auditing/Auditing.Infrastructure/Interceptors/AuditInterceptor.cs

@@ -4,13 +4,13 @@
 using FSH.Framework.Core.Domain;
 using FSH.Framework.Core.Domain.Contracts;
 using FSH.Framework.Core.ExecutionContext;
-using MediatR;
+using FSH.Framework.Core.Messaging.Events;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace FSH.Framework.Auditing.Infrastructure.Interceptors;
-public class AuditInterceptor(ICurrentUser currentUser, TimeProvider timeProvider, IPublisher publisher) : SaveChangesInterceptor
+public class AuditInterceptor(ICurrentUser currentUser, TimeProvider timeProvider, IEventPublisher publisher) : SaveChangesInterceptor
 {
     public override ValueTask<int> SavedChangesAsync(SaveChangesCompletedEventData eventData, int result, CancellationToken cancellationToken = default)
     {
@@ -25,20 +25,20 @@ public override Task SaveChangesFailedAsync(DbContextErrorEventData eventData, C
     public override async ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEventData eventData, InterceptionResult<int> result, CancellationToken cancellationToken = default)
     {
         UpdateEntities(eventData.Context);
-        await PublishAuditTrailsAsync(eventData);
+        await PublishAuditTrailsAsync(eventData, cancellationToken);
         return await base.SavingChangesAsync(eventData, result, cancellationToken);
     }
 
-    private async Task PublishAuditTrailsAsync(DbContextEventData eventData)
+    private async Task PublishAuditTrailsAsync(DbContextEventData eventData, CancellationToken cancellationToken)
     {
         if (eventData.Context == null) return;
         eventData.Context.ChangeTracker.DetectChanges();
-        var trails = new List<AuditTrail>();
+        var trails = new List<Trail>();
         var utcNow = timeProvider.GetUtcNow();
         foreach (var entry in eventData.Context.ChangeTracker.Entries<IAuditable>().Where(x => x.State is EntityState.Added or EntityState.Deleted or EntityState.Modified).ToList())
         {
             var userId = currentUser.GetUserId();
-            var audit = new AuditTrail()
+            var audit = new Trail()
             {
                 Id = Guid.NewGuid(),
                 EntityName = entry.Entity.GetType().Name,
@@ -100,7 +100,7 @@ private async Task PublishAuditTrailsAsync(DbContextEventData eventData)
             trails.Add(audit);
         }
         if (trails.Count == 0) return;
-        await publisher.Publish(new AuditPublishedEvent(trails));
+        await publisher.PublishAsync(new AuditPublishedEvent(trails), cancellationToken);
     }
 
     public void UpdateEntities(DbContext? context)

src/framework/Auditing/Auditing.Infrastructure/Services/AuditService.cs

@@ -5,9 +5,9 @@
 namespace FSH.Framework.Auditing.Infrastructure.Services;
 public class AuditService(IAuditingDbContext context) : IAuditService
 {
-    public async Task<List<AuditTrail>> GetUserTrailsAsync(Guid userId)
+    public async Task<List<Trail>> GetUserTrailsAsync(Guid userId)
     {
-        var trails = await context.AuditTrails
+        var trails = await context.Trails
            .Where(a => a.UserId == userId)
            .OrderByDescending(a => a.DateTime)
            .Take(250)