Merge pull request #859 from bacongobbler/fix-848

Fix domain event firing for channel deleted events
deislabs · Jun 13, 2022 · e83bda6 · e83bda6
2 parents e1fdbe6 + 2da2f18
commit e83bda6
Show file tree

Hide file tree

Showing 62 changed files with 336 additions and 346 deletions.
diff --git a/src/Application/Apps/Commands/CreateAppCommand.cs b/src/Application/Apps/Commands/CreateAppCommand.cs
@@ -1,5 +1,6 @@
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
 
@@ -31,6 +32,8 @@ public async Task<Guid> Handle(CreateAppCommand request, CancellationToken cance
             StorageId = request.StorageId
         };
 
+        entity.AddDomainEvent(new CreatedEvent<App>(entity));
+
         _context.Apps.Add(entity);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Apps/Commands/DeleteAppCommand.cs b/src/Application/Apps/Commands/DeleteAppCommand.cs
@@ -2,6 +2,7 @@
 using Hippo.Application.Common.Exceptions;
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -25,14 +26,17 @@ public DeleteAppCommandHandler(IApplicationDbContext context)
     public async Task<Unit> Handle(DeleteAppCommand request, CancellationToken cancellationToken)
     {
         var entity = await _context.Apps
-            .Where(l => l.Id == request.Id)
+            .Where(a => a.Id == request.Id)
+            .Include(a => a.Channels)
             .SingleOrDefaultAsync(cancellationToken);
 
         if (entity is null)
         {
             throw new NotFoundException(nameof(App), request.Id);
         }
 
+        entity.AddDomainEvent(new DeletedEvent<App>(entity));
+
         _context.Apps.Remove(entity);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Apps/Commands/PurgeAppsCommand.cs b/src/Application/Apps/Commands/PurgeAppsCommand.cs
@@ -21,10 +21,11 @@ public PurgeAppsCommandHandler(IApplicationDbContext context)
 
     public async Task<Unit> Handle(PurgeAppsCommand request, CancellationToken cancellationToken)
     {
-        foreach (App app in _context.Apps)
+        foreach (var entity in _context.Apps)
         {
-            app.DomainEvents.Add(new DeletedEvent<App>(app));
+            entity.AddDomainEvent(new DeletedEvent<App>(entity));
         }
+
         _context.Apps.RemoveRange(_context.Apps);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Apps/Commands/UpdateAppCommand.cs b/src/Application/Apps/Commands/UpdateAppCommand.cs
@@ -2,6 +2,7 @@
 using Hippo.Application.Common.Exceptions;
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 
 namespace Hippo.Application.Apps.Commands;
@@ -40,6 +41,8 @@ public async Task<Unit> Handle(UpdateAppCommand request, CancellationToken cance
         entity.Name = request.Name;
         entity.StorageId = request.StorageId;
 
+        entity.AddDomainEvent(new ModifiedEvent<App>(entity));
+
         await _context.SaveChangesAsync(cancellationToken);
 
         return Unit.Value;

diff --git a/src/Application/Apps/EventHandlers/AppCreatedEventHandler.cs b/src/Application/Apps/EventHandlers/AppCreatedEventHandler.cs
@@ -1,12 +1,11 @@
-using Hippo.Application.Common.Models;
 using Hippo.Core.Entities;
 using Hippo.Core.Events;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace Hippo.Application.Apps.EventHandlers;
 
-public class AppCreatedEventHandler : INotificationHandler<DomainEventNotification<CreatedEvent<App>>>
+public class AppCreatedEventHandler : INotificationHandler<CreatedEvent<App>>
 {
     private readonly ILogger<AppCreatedEventHandler> _logger;
 
@@ -15,11 +14,9 @@ public AppCreatedEventHandler(ILogger<AppCreatedEventHandler> logger)
         _logger = logger;
     }
 
-    public Task Handle(DomainEventNotification<CreatedEvent<App>> notification, CancellationToken cancellationToken)
+    public Task Handle(CreatedEvent<App> notification, CancellationToken cancellationToken)
     {
-        var domainEvent = notification.DomainEvent;
-
-        _logger.LogInformation("Hippo Domain Event: {DomainEvent}", domainEvent.GetType().Name);
+        _logger.LogInformation("Hippo Domain Event: {DomainEvent}", notification.GetType().Name);
 
         return Task.CompletedTask;
     }

diff --git a/src/Application/Apps/EventHandlers/AppDeletedEventHandler.cs b/src/Application/Apps/EventHandlers/AppDeletedEventHandler.cs
@@ -1,25 +1,40 @@
-using Hippo.Application.Common.Models;
+using Hippo.Application.Common.Exceptions;
+using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
 using Hippo.Core.Events;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace Hippo.Application.Apps.EventHandlers;
 
-public class AppDeletedEventHandler : INotificationHandler<DomainEventNotification<DeletedEvent<App>>>
+public class AppDeletedEventHandler : INotificationHandler<DeletedEvent<App>>
 {
     private readonly ILogger<AppDeletedEventHandler> _logger;
 
-    public AppDeletedEventHandler(ILogger<AppDeletedEventHandler> logger)
+    private readonly IJobService _jobService;
+
+    public AppDeletedEventHandler(ILogger<AppDeletedEventHandler> logger, IJobService jobService)
     {
         _logger = logger;
+        _jobService = jobService;
     }
 
-    public Task Handle(DomainEventNotification<DeletedEvent<App>> notification, CancellationToken cancellationToken)
+    public Task Handle(DeletedEvent<App> notification, CancellationToken cancellationToken)
     {
-        var domainEvent = notification.DomainEvent;
+        _logger.LogInformation($"Hippo Domain Event: {notification.GetType().Name}");
 
-        _logger.LogInformation("Hippo Domain Event: {DomainEvent}", domainEvent.GetType().Name);
+        foreach (var channel in notification.Entity.Channels)
+        {
+            try
+            {
+                _jobService.DeleteJob(jobName: channel.Id.ToString());
+            }
+            catch (JobFailedException e)
+            {
+                _logger.LogError(e.Message);
+                throw;
+            }
+        }
 
         return Task.CompletedTask;
     }

diff --git a/src/Application/Apps/EventHandlers/InitialRevisionImport.cs b/src/Application/Apps/EventHandlers/InitialRevisionImport.cs
@@ -1,4 +1,3 @@
-using Hippo.Application.Common.Models;
 using Hippo.Application.Revisions.Commands;
 using Hippo.Core.Entities;
 using Hippo.Core.Events;
@@ -7,7 +6,7 @@
 
 namespace Hippo.Application.Apps.EventHandlers;
 
-public class InitialRevisionImport : INotificationHandler<DomainEventNotification<CreatedEvent<App>>>
+public class InitialRevisionImport : INotificationHandler<CreatedEvent<App>>
 {
     private readonly ILogger<InitialRevisionImport> _logger;
     private readonly IMediator _mediator;
@@ -18,18 +17,14 @@ public InitialRevisionImport(ILogger<InitialRevisionImport> logger, IMediator me
         _mediator = mediator;
     }
 
-    public async Task Handle(DomainEventNotification<CreatedEvent<App>> notification, CancellationToken cancellationToken)
+    public async Task Handle(CreatedEvent<App> notification, CancellationToken cancellationToken)
     {
-        var domainEvent = notification.DomainEvent;
-        var app = domainEvent.Entity;
+        var app = notification.Entity;
 
-        var command = new ImportRevisionsCommand
-        {
-            AppId = app.Id,
-        };
+        var command = new ImportRevisionsCommand(app);
 
         await _mediator.Send(command, cancellationToken);
 
-        _logger.LogInformation("Hippo Domain Event: {DomainEvent}", domainEvent.GetType().Name);
+        _logger.LogInformation($"Hippo Domain Event: {notification.GetType().Name}");
     }
 }
diff --git a/src/Application/Certificates/Commands/CreateCertificateCommand.cs b/src/Application/Certificates/Commands/CreateCertificateCommand.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 
 namespace Hippo.Application.Certificates.Commands;
@@ -35,6 +36,8 @@ public async Task<Guid> Handle(CreateCertificateCommand request, CancellationTok
             PrivateKey = request.PrivateKey,
         };
 
+        entity.AddDomainEvent(new CreatedEvent<Certificate>(entity));
+
         _context.Certificates.Add(entity);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Certificates/Commands/DeleteCertificateCommand.cs b/src/Application/Certificates/Commands/DeleteCertificateCommand.cs
@@ -2,6 +2,7 @@
 using Hippo.Application.Common.Exceptions;
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -33,6 +34,8 @@ public async Task<Unit> Handle(DeleteCertificateCommand request, CancellationTok
             throw new NotFoundException(nameof(Certificate), request.Id);
         }
 
+        entity.AddDomainEvent(new DeletedEvent<Certificate>(entity));
+
         _context.Certificates.Remove(entity);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Certificates/Commands/PurgeCertificatesCommand.cs b/src/Application/Certificates/Commands/PurgeCertificatesCommand.cs
@@ -21,10 +21,11 @@ public PurgeCertificatesCommandHandler(IApplicationDbContext context)
 
     public async Task<Unit> Handle(PurgeCertificatesCommand request, CancellationToken cancellationToken)
     {
-        foreach (Certificate cert in _context.Certificates)
+        foreach (var entity in _context.Certificates)
         {
-            cert.DomainEvents.Add(new DeletedEvent<Certificate>(cert));
+            entity.AddDomainEvent(new DeletedEvent<Certificate>(entity));
         }
+
         _context.Certificates.RemoveRange(_context.Certificates);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Certificates/Commands/UpdateCertificateCommand.cs b/src/Application/Certificates/Commands/UpdateCertificateCommand.cs
@@ -2,6 +2,7 @@
 using Hippo.Application.Common.Exceptions;
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 
 namespace Hippo.Application.Certificates.Commands;
@@ -44,6 +45,8 @@ public async Task<Unit> Handle(UpdateCertificateCommand request, CancellationTok
         entity.PublicKey = request.PublicKey;
         entity.PrivateKey = request.PrivateKey;
 
+        entity.AddDomainEvent(new ModifiedEvent<Certificate>(entity));
+
         await _context.SaveChangesAsync(cancellationToken);
 
         return Unit.Value;

diff --git a/src/Application/Certificates/EventHandlers/CertificateCreatedEventHandler.cs b/src/Application/Certificates/EventHandlers/CertificateCreatedEventHandler.cs
@@ -1,12 +1,11 @@
-using Hippo.Application.Common.Models;
 using Hippo.Core.Entities;
 using Hippo.Core.Events;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace Hippo.Application.Certificates.EventHandlers;
 
-public class CertificateCreatedEventHandler : INotificationHandler<DomainEventNotification<CreatedEvent<Certificate>>>
+public class CertificateCreatedEventHandler : INotificationHandler<CreatedEvent<Certificate>>
 {
     private readonly ILogger<CertificateCreatedEventHandler> _logger;
 
@@ -15,11 +14,9 @@ public CertificateCreatedEventHandler(ILogger<CertificateCreatedEventHandler> lo
         _logger = logger;
     }
 
-    public Task Handle(DomainEventNotification<CreatedEvent<Certificate>> notification, CancellationToken cancellationToken)
+    public Task Handle(CreatedEvent<Certificate> notification, CancellationToken cancellationToken)
     {
-        var domainEvent = notification.DomainEvent;
-
-        _logger.LogInformation("Hippo Domain Event: {DomainEvent}", domainEvent.GetType().Name);
+        _logger.LogInformation($"Hippo Domain Event: {notification.GetType().Name}");
 
         return Task.CompletedTask;
     }

diff --git a/src/Application/Certificates/EventHandlers/CertificateDeletedEventHandler.cs b/src/Application/Certificates/EventHandlers/CertificateDeletedEventHandler.cs
@@ -1,12 +1,11 @@
-using Hippo.Application.Common.Models;
 using Hippo.Core.Entities;
 using Hippo.Core.Events;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace Hippo.Application.Certificates.EventHandlers;
 
-public class CertificateDeletedEventHandler : INotificationHandler<DomainEventNotification<DeletedEvent<Certificate>>>
+public class CertificateDeletedEventHandler : INotificationHandler<DeletedEvent<Certificate>>
 {
     private readonly ILogger<CertificateDeletedEventHandler> _logger;
 
@@ -15,11 +14,9 @@ public CertificateDeletedEventHandler(ILogger<CertificateDeletedEventHandler> lo
         _logger = logger;
     }
 
-    public Task Handle(DomainEventNotification<DeletedEvent<Certificate>> notification, CancellationToken cancellationToken)
+    public Task Handle(DeletedEvent<Certificate> notification, CancellationToken cancellationToken)
     {
-        var domainEvent = notification.DomainEvent;
-
-        _logger.LogInformation("Hippo Domain Event: {DomainEvent}", domainEvent.GetType().Name);
+        _logger.LogInformation($"Hippo Domain Event: {notification.GetType().Name}");
 
         return Task.CompletedTask;
     }

diff --git a/src/Application/Channels/Commands/CreateChannelCommand.cs b/src/Application/Channels/Commands/CreateChannelCommand.cs
@@ -5,6 +5,7 @@
 using Hippo.Application.Rules;
 using Hippo.Core.Entities;
 using Hippo.Core.Enums;
+using Hippo.Core.Events;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -82,6 +83,8 @@ public async Task<Guid> Handle(CreateChannelCommand request, CancellationToken c
 
         entity.ActiveRevision = await GetActiveRevision(request, entity, cancellationToken);
 
+        entity.AddDomainEvent(new CreatedEvent<Channel>(entity));
+
         _context.Channels.Add(entity);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Channels/Commands/DeleteChannelCommand.cs b/src/Application/Channels/Commands/DeleteChannelCommand.cs
@@ -2,6 +2,7 @@
 using Hippo.Application.Common.Exceptions;
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
+using Hippo.Core.Events;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -33,6 +34,8 @@ public async Task<Unit> Handle(DeleteChannelCommand request, CancellationToken c
             throw new NotFoundException(nameof(Channel), request.Id);
         }
 
+        entity.AddDomainEvent(new DeletedEvent<Channel>(entity));
+
         _context.Channels.Remove(entity);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Channels/Commands/PurgeChannelsCommand.cs b/src/Application/Channels/Commands/PurgeChannelsCommand.cs
@@ -21,10 +21,11 @@ public PurgeChannelsCommandHandler(IApplicationDbContext context)
 
     public async Task<Unit> Handle(PurgeChannelsCommand request, CancellationToken cancellationToken)
     {
-        foreach (Channel channel in _context.Channels)
+        foreach (var entity in _context.Channels)
         {
-            channel.DomainEvents.Add(new DeletedEvent<Channel>(channel));
+            entity.AddDomainEvent(new DeletedEvent<Channel>(entity));
         }
+
         _context.Channels.RemoveRange(_context.Channels);
 
         await _context.SaveChangesAsync(cancellationToken);

diff --git a/src/Application/Channels/Commands/UpdateChannelCommand.cs b/src/Application/Channels/Commands/UpdateChannelCommand.cs
@@ -3,6 +3,7 @@
 using Hippo.Application.Common.Interfaces;
 using Hippo.Core.Entities;
 using Hippo.Core.Enums;
+using Hippo.Core.Events;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -62,6 +63,8 @@ public async Task<Unit> Handle(UpdateChannelCommand request, CancellationToken c
             entity.RangeRule = "*";
         }
 
+        entity.AddDomainEvent(new ModifiedEvent<Channel>(entity));
+
         await _context.SaveChangesAsync(cancellationToken);
 
         return Unit.Value;