[FA-misc] Mass transit overhaul, needs testing and review

FictionArchive.Service.UserNovelDataService/Services/EventHandlers/ChapterCreatedEventConsumer.cs

@@ -1,25 +1,27 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
 using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 
 namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
 
-public class ChapterCreatedEventHandler : IIntegrationEventHandler<ChapterCreatedEvent>
+public class ChapterCreatedEventConsumer : IConsumer<ChapterCreatedEvent>
 {
     private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<ChapterCreatedEventHandler> _logger;
+    private readonly ILogger<ChapterCreatedEventConsumer> _logger;
 
-    public ChapterCreatedEventHandler(
+    public ChapterCreatedEventConsumer(
         UserNovelDataServiceDbContext dbContext,
-        ILogger<ChapterCreatedEventHandler> logger)
+        ILogger<ChapterCreatedEventConsumer> logger)
     {
         _dbContext = dbContext;
         _logger = logger;
     }
 
-    public async Task Handle(ChapterCreatedEvent @event)
+    public async Task Consume(ConsumeContext<ChapterCreatedEvent> context)
     {
+        var @event = context.Message;
+
         // Ensure novel exists
         var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
         if (!novelExists)

FictionArchive.Service.UserNovelDataService/Services/EventHandlers/NovelCreatedEventConsumer.cs

@@ -1,25 +1,27 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
 using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 
 namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
 
-public class NovelCreatedEventHandler : IIntegrationEventHandler<NovelCreatedEvent>
+public class NovelCreatedEventConsumer : IConsumer<NovelCreatedEvent>
 {
     private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<NovelCreatedEventHandler> _logger;
+    private readonly ILogger<NovelCreatedEventConsumer> _logger;
 
-    public NovelCreatedEventHandler(
+    public NovelCreatedEventConsumer(
         UserNovelDataServiceDbContext dbContext,
-        ILogger<NovelCreatedEventHandler> logger)
+        ILogger<NovelCreatedEventConsumer> logger)
     {
         _dbContext = dbContext;
         _logger = logger;
     }
 
-    public async Task Handle(NovelCreatedEvent @event)
+    public async Task Consume(ConsumeContext<NovelCreatedEvent> context)
     {
+        var @event = context.Message;
+
         var exists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
         if (exists)
         {

FictionArchive.Service.UserNovelDataService/Services/EventHandlers/UserInvitedEventConsumer.cs

@@ -1,25 +1,27 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
 using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 
 namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
 
-public class UserInvitedEventHandler : IIntegrationEventHandler<UserInvitedEvent>
+public class UserInvitedEventConsumer : IConsumer<UserInvitedEvent>
 {
     private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<UserInvitedEventHandler> _logger;
+    private readonly ILogger<UserInvitedEventConsumer> _logger;
 
-    public UserInvitedEventHandler(
+    public UserInvitedEventConsumer(
         UserNovelDataServiceDbContext dbContext,
-        ILogger<UserInvitedEventHandler> logger)
+        ILogger<UserInvitedEventConsumer> logger)
     {
         _dbContext = dbContext;
         _logger = logger;
     }
 
-    public async Task Handle(UserInvitedEvent @event)
+    public async Task Consume(ConsumeContext<UserInvitedEvent> context)
     {
+        var @event = context.Message;
+
         var exists = await _dbContext.Users.AnyAsync(u => u.Id == @event.InvitedUserId);
         if (exists)
         {