[FA-misc] Saga seems to work, fixed a UserNovelDataService bug

Reviewed-on: #61

FictionArchive.Service.AuthenticationService/Controllers/AuthenticationWebhookController.cs

@@ -1,36 +0,0 @@
-using FictionArchive.Service.AuthenticationService.Models.Requests;
-using FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace FictionArchive.Service.AuthenticationService.Controllers
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    public class AuthenticationWebhookController : ControllerBase
-    {
-        private readonly IEventBus _eventBus;
-
-        public AuthenticationWebhookController(IEventBus eventBus)
-        {
-            _eventBus = eventBus;
-        }
-
-        [HttpPost(nameof(UserRegistered))]
-        public async Task<ActionResult> UserRegistered([FromBody] UserRegisteredWebhookPayload payload)
-        {
-            var authUserAddedEvent = new AuthUserAddedEvent
-            {
-                OAuthProviderId = payload.OAuthProviderId,
-                InviterOAuthProviderId = payload.InviterOAuthProviderId,
-                EventUserEmail = payload.EventUserEmail,
-                EventUserUsername = payload.EventUserUsername
-            };
-
-            await _eventBus.Publish(authUserAddedEvent);
-
-            return Ok();
-        }
-    }
-}

FictionArchive.Service.AuthenticationService/Dockerfile

@@ -1,23 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-USER $APP_UID
-WORKDIR /app
-EXPOSE 8080
-EXPOSE 8081
-
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /src
-COPY ["FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj", "FictionArchive.Service.AuthenticationService/"]
-RUN dotnet restore "FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj"
-COPY . .
-WORKDIR "/src/FictionArchive.Service.AuthenticationService"
-RUN dotnet build "./FictionArchive.Service.AuthenticationService.csproj" -c $BUILD_CONFIGURATION -o /app/build
-
-FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./FictionArchive.Service.AuthenticationService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "FictionArchive.Service.AuthenticationService.dll"]

FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj

@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Include="..\.dockerignore">
-        <Link>.dockerignore</Link>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\FictionArchive.Service.Shared\FictionArchive.Service.Shared.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Controllers\" />
-    </ItemGroup>
-
-</Project>

FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.http

@@ -1,6 +0,0 @@
-@FictionArchive.Service.AuthenticationService_HostAddress = http://localhost:5091
-
-GET {{FictionArchive.Service.AuthenticationService_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###

FictionArchive.Service.AuthenticationService/Models/IntegrationEvents/AuthUserAddedEvent.cs

@@ -1,16 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
-
-public class AuthUserAddedEvent : IIntegrationEvent
-{
-    public string OAuthProviderId { get; set; }
-    
-    public string InviterOAuthProviderId { get; set; }
-
-    // The email of the user that created the event
-    public string EventUserEmail { get; set; }
-
-    // The username of the user that created the event
-    public string EventUserUsername { get; set; }
-}

FictionArchive.Service.AuthenticationService/Models/Requests/UserRegisteredWebhookPayload.cs

@@ -1,17 +0,0 @@
-namespace FictionArchive.Service.AuthenticationService.Models.Requests;
-
-public class UserRegisteredWebhookPayload
-{
-    // The body of the notification message
-    public string Body { get; set; }
-    
-    public string OAuthProviderId { get; set; }
-    
-    public string InviterOAuthProviderId { get; set; }
-
-    // The email of the user that created the event
-    public string EventUserEmail { get; set; }
-
-    // The username of the user that created the event
-    public string EventUserUsername { get; set; }
-}

FictionArchive.Service.AuthenticationService/Program.cs

@@ -1,49 +0,0 @@
-using FictionArchive.Service.Shared;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-namespace FictionArchive.Service.AuthenticationService;
-
-public class Program
-{
-    public static void Main(string[] args)
-    {
-        var builder = WebApplication.CreateBuilder(args);
-
-        // Add services to the container.
-
-        builder.Services.AddControllers();
-        // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-        builder.Services.AddEndpointsApiExplorer();
-        builder.Services.AddSwaggerGen();
-
-        #region Event Bus
-
-        builder.Services.AddRabbitMQ(opt =>
-        {
-            builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-        });
-        
-        #endregion
-
-        builder.Services.AddHealthChecks();
-        
-        var app = builder.Build();
-
-        // Configure the HTTP request pipeline.
-        if (app.Environment.IsDevelopment())
-        {
-            app.UseSwagger();
-            app.UseSwaggerUI();
-        }
-
-        app.UseHttpsRedirection();
-
-        app.MapHealthChecks("/healthz");
-        
-        app.UseAuthorization();
-        
-        app.MapControllers();
-
-        app.Run();
-    }
-}

FictionArchive.Service.AuthenticationService/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:23522",
-      "sslPort": 44397
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5091",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7223;http://localhost:5091",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

FictionArchive.Service.AuthenticationService/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

FictionArchive.Service.AuthenticationService/appsettings.json

@@ -1,13 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "RabbitMQ": {
-    "ConnectionString": "amqp://localhost",
-    "ClientIdentifier": "AuthenticationService"
-  },
-  "AllowedHosts": "*"
-}

FictionArchive.Service.FileService/Consumers/FileUploadRequestCreatedConsumer.cs

@@ -0,0 +1,75 @@
+using Amazon.S3;
+using Amazon.S3.Model;
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.FileService.Models;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace FictionArchive.Service.FileService.Consumers;
+
+public class FileUploadRequestCreatedConsumer : IConsumer<IFileUploadRequestCreated>
+{
+    private readonly ILogger<FileUploadRequestCreatedConsumer> _logger;
+    private readonly AmazonS3Client _amazonS3Client;
+    private readonly IPublishEndpoint _publishEndpoint;
+    private readonly S3Configuration _s3Configuration;
+    private readonly ProxyConfiguration _proxyConfiguration;
+
+    public FileUploadRequestCreatedConsumer(
+        ILogger<FileUploadRequestCreatedConsumer> logger,
+        AmazonS3Client amazonS3Client,
+        IPublishEndpoint publishEndpoint,
+        IOptions<S3Configuration> s3Configuration,
+        IOptions<ProxyConfiguration> proxyConfiguration)
+    {
+        _logger = logger;
+        _amazonS3Client = amazonS3Client;
+        _publishEndpoint = publishEndpoint;
+        _s3Configuration = s3Configuration.Value;
+        _proxyConfiguration = proxyConfiguration.Value;
+    }
+
+    public async Task Consume(ConsumeContext<IFileUploadRequestCreated> context)
+    {
+        var message = context.Message;
+
+        var putObjectRequest = new PutObjectRequest
+        {
+            BucketName = _s3Configuration.Bucket,
+            Key = message.FilePath
+        };
+
+        using var memoryStream = new MemoryStream(message.FileData);
+        putObjectRequest.InputStream = memoryStream;
+
+        var s3Response = await _amazonS3Client.PutObjectAsync(putObjectRequest);
+
+        if (s3Response.HttpStatusCode != System.Net.HttpStatusCode.OK)
+        {
+            _logger.LogError("Failed to upload file {FilePath} to S3", message.FilePath);
+
+            await _publishEndpoint.Publish<IFileUploadRequestStatusUpdate>(
+                new FileUploadRequestStatusUpdate(
+                    ImportId: message.ImportId,
+                    RequestId: message.RequestId,
+                    Status: RequestStatus.Failed,
+                    FileAccessUrl: null,
+                    ErrorMessage: "An error occurred while uploading file to S3."));
+            return;
+        }
+
+        var fileAccessUrl = _proxyConfiguration.BaseUrl + "/" + message.FilePath;
+
+        _logger.LogInformation("Successfully uploaded file {FilePath} to S3", message.FilePath);
+
+        await _publishEndpoint.Publish<IFileUploadRequestStatusUpdate>(
+            new FileUploadRequestStatusUpdate(
+                ImportId: message.ImportId,
+                RequestId: message.RequestId,
+                Status: RequestStatus.Success,
+                FileAccessUrl: fileAccessUrl,
+                ErrorMessage: null));
+    }
+}

FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs

@@ -1,10 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.FileService.Models.IntegrationEvents;
-
-public class FileUploadRequestCreatedEvent : IIntegrationEvent
-{
-    public Guid RequestId { get; set; }
-    public string FilePath { get; set; }
-    public byte[] FileData { get; set; }
-}

FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs

@@ -1,22 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.FileService.Models.IntegrationEvents;
-
-public class FileUploadRequestStatusUpdateEvent : IIntegrationEvent
-{
-    public Guid RequestId { get; set; }
-    public RequestStatus Status { get; set; }
-    
-    #region Success
-    
-    public string? FileAccessUrl { get; set; }
-    
-    #endregion
-    
-    #region Failure
-    
-    public string? ErrorMessage { get; set; }
-    
-    #endregion
-}

FictionArchive.Service.FileService/Program.cs

@@ -1,11 +1,9 @@
 using Amazon.Runtime;
 using Amazon.S3;
 using FictionArchive.Common.Extensions;
+using FictionArchive.Service.FileService.Consumers;
 using FictionArchive.Service.FileService.Models;
-using FictionArchive.Service.FileService.Models.IntegrationEvents;
-using FictionArchive.Service.FileService.Services.EventHandlers;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using Microsoft.Extensions.Options;
 
 namespace FictionArchive.Service.FileService;
@@ -24,14 +22,15 @@ public class Program
 
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
+
+        builder.Services.AddFictionArchiveMassTransit(
+            builder.Configuration,
+            x =>
+            {
+                x.AddConsumer<FileUploadRequestCreatedConsumer>();
+            });
 
-        builder.Services.AddRabbitMQ(opt =>
-        {
-            builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-        })
-        .Subscribe<FileUploadRequestCreatedEvent, FileUploadRequestCreatedEventHandler>();
-        
         #endregion
         
         // Add authentication with cookie support

FictionArchive.Service.FileService/Services/EventHandlers/FileUploadRequestCreatedEventHandler.cs

@@ -1,58 +0,0 @@
-using Amazon.S3;
-using Amazon.S3.Model;
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.FileService.Models;
-using FictionArchive.Service.FileService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-using Microsoft.Extensions.Options;
-
-namespace FictionArchive.Service.FileService.Services.EventHandlers;
-
-public class FileUploadRequestCreatedEventHandler : IIntegrationEventHandler<FileUploadRequestCreatedEvent>
-{
-    private readonly ILogger<FileUploadRequestCreatedEventHandler> _logger;
-    private readonly AmazonS3Client _amazonS3Client;
-    private readonly IEventBus _eventBus;
-    private readonly S3Configuration _s3Configuration;
-    private readonly ProxyConfiguration _proxyConfiguration;
-
-    public FileUploadRequestCreatedEventHandler(ILogger<FileUploadRequestCreatedEventHandler> logger, AmazonS3Client amazonS3Client, IEventBus eventBus, IOptions<S3Configuration> s3Configuration, IOptions<ProxyConfiguration> proxyConfiguration)
-    {
-        _logger = logger;
-        _amazonS3Client = amazonS3Client;
-        _eventBus = eventBus;
-        _proxyConfiguration = proxyConfiguration.Value;
-        _s3Configuration = s3Configuration.Value;
-    }
-
-    public async Task Handle(FileUploadRequestCreatedEvent @event)
-    {
-        var putObjectRequest = new PutObjectRequest();
-        putObjectRequest.BucketName = _s3Configuration.Bucket;
-        putObjectRequest.Key = @event.FilePath;
-        putObjectRequest.UseChunkEncoding = false; // Needed to avoid an error with Garage
-        
-        using MemoryStream memoryStream = new MemoryStream(@event.FileData);
-        putObjectRequest.InputStream = memoryStream;
-
-        var s3Response = await _amazonS3Client.PutObjectAsync(putObjectRequest);
-        if (s3Response.HttpStatusCode != System.Net.HttpStatusCode.OK)
-        {
-            _logger.LogError("An error occurred while uploading file to S3. Response code: {responsecode}", s3Response.HttpStatusCode);
-            await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
-            {
-                RequestId = @event.RequestId,
-                Status = RequestStatus.Failed,
-                ErrorMessage = "An error occurred while uploading file to S3."
-            });
-            return;
-        }
-
-        await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
-        {
-            Status = RequestStatus.Success,
-            RequestId = @event.RequestId,
-            FileAccessUrl = _proxyConfiguration.BaseUrl + "/" + @event.FilePath
-        });
-    }
-}

FictionArchive.Service.FileService/appsettings.json

@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning"
     }
   },
   "ProxyConfiguration": {

FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj

@@ -9,8 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="MassTransit" Version="8.5.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NodaTime.Testing" Version="3.3.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

FictionArchive.Service.NovelService.Tests/NovelUpdateServiceTests.cs

@@ -1,5 +1,4 @@
 using FictionArchive.Common.Enums;
-using FictionArchive.Service.FileService.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Configuration;
 using FictionArchive.Service.NovelService.Models.Enums;
 using FictionArchive.Service.NovelService.Models.Images;
@@ -8,12 +7,14 @@ using FictionArchive.Service.NovelService.Models.Novels;
 using FictionArchive.Service.NovelService.Models.SourceAdapters;
 using FictionArchive.Service.NovelService.Services;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using FluentAssertions;
 using HtmlAgilityPack;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using NodaTime;
 using NSubstitute;
 using Xunit;
 
@@ -72,7 +73,7 @@ public class NovelUpdateServiceTests
     private static NovelUpdateService CreateService(
         NovelServiceDbContext dbContext,
         ISourceAdapter adapter,
-        IEventBus eventBus,
+        IPublishEndpoint publishEndpoint,
         string pendingImageUrl = "https://pending/placeholder.jpg")
     {
         var options = Options.Create(new NovelUpdateServiceConfiguration
@@ -80,7 +81,10 @@ public class NovelUpdateServiceTests
             PendingImageUrl = pendingImageUrl
         });
 
-        return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, eventBus, options);
+        var clock = Substitute.For<IClock>();
+        clock.GetCurrentInstant().Returns(Instant.FromUnixTimeSeconds(0));
+
+        return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, publishEndpoint, options, clock);
     }
 
     [Fact]
@@ -102,16 +106,18 @@ public class NovelUpdateServiceTests
             ImageData = new List<ImageData> { image1, image2 }
         }));
 
-        var publishedEvents = new List<FileUploadRequestCreatedEvent>();
+        var publishedEvents = new List<IFileUploadRequestCreated>();
-        var eventBus = Substitute.For<IEventBus>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
-        eventBus.Publish(Arg.Do<FileUploadRequestCreatedEvent>(publishedEvents.Add)).Returns(Task.CompletedTask);
+        publishEndpoint.Publish(Arg.Do<IFileUploadRequestCreated>(e => publishedEvents.Add(e)), Arg.Any<CancellationToken>())
-        eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
+            .Returns(Task.CompletedTask);
 
         var pendingImageUrl = "https://pending/placeholder.jpg";
-        var service = CreateService(dbContext, adapter, eventBus, pendingImageUrl);
+        var service = CreateService(dbContext, adapter, publishEndpoint, pendingImageUrl);
 
-        var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
+        var importId = Guid.NewGuid();
+        var (updatedChapter, imageCount) = await service.PullChapterContents(importId, novel.Id, volume.Id, chapter.Order);
 
+        imageCount.Should().Be(2);
         updatedChapter.Images.Should().HaveCount(2);
         updatedChapter.Images.Select(i => i.OriginalPath).Should().BeEquivalentTo(new[] { image1.Url, image2.Url });
         updatedChapter.Images.All(i => i.Id != Guid.Empty).Should().BeTrue();
@@ -128,9 +134,10 @@ public class NovelUpdateServiceTests
             .BeEquivalentTo(updatedChapter.Images.Select(img => img.Id.ToString()));
 
         publishedEvents.Should().HaveCount(2);
+        publishedEvents.Should().OnlyContain(e => e.ImportId == importId);
         publishedEvents.Select(e => e.RequestId).Should().BeEquivalentTo(updatedChapter.Images.Select(i => i.Id));
         publishedEvents.Select(e => e.FileData).Should().BeEquivalentTo(new[] { image1.Data, image2.Data });
-        publishedEvents.Should().OnlyContain(e => e.FilePath.StartsWith($"{novel.Id}/Images/Chapter-{updatedChapter.Id}/"));
+        publishedEvents.Should().OnlyContain(e => e.FilePath.StartsWith($"Novels/{novel.Id}/Images/Chapter-{updatedChapter.Id}/"));
     }
 
     [Fact]
@@ -151,14 +158,14 @@ public class NovelUpdateServiceTests
             ImageData = new List<ImageData> { image }
         }));
 
-        var eventBus = Substitute.For<IEventBus>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
-        eventBus.Publish(Arg.Any<FileUploadRequestCreatedEvent>()).Returns(Task.CompletedTask);
-        eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
 
-        var service = CreateService(dbContext, adapter, eventBus);
+        var service = CreateService(dbContext, adapter, publishEndpoint);
 
-        var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
+        var importId = Guid.NewGuid();
+        var (updatedChapter, imageCount) = await service.PullChapterContents(importId, novel.Id, volume.Id, chapter.Order);
 
+        imageCount.Should().Be(1);
         var storedHtml = updatedChapter.Body.Texts.Single().Text;
         var doc = new HtmlDocument();
         doc.LoadHtml(storedHtml);
@@ -186,8 +193,8 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
-        var service = CreateService(dbContext, adapter, eventBus);
+        var service = CreateService(dbContext, adapter, publishEndpoint);
 
         var newUrl = "https://cdn.example.com/uploaded/cover.jpg";
 
@@ -228,8 +235,8 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
-        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+        var service = CreateService(dbContext, adapter, publishEndpoint, pendingUrl);
 
         var newUrl = "https://cdn.example.com/uploaded/image.jpg";
 
@@ -277,8 +284,8 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
-        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+        var service = CreateService(dbContext, adapter, publishEndpoint, pendingUrl);
 
         var newUrl = "https://cdn.example.com/uploaded/img1.jpg";
 

FictionArchive.Service.NovelService.Tests/Sagas/NovelImportSagaTests.cs

@@ -0,0 +1,95 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.NovelService.Sagas;
+using FictionArchive.Service.Shared.Contracts.Events;
+using FluentAssertions;
+using MassTransit;
+using MassTransit.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using NodaTime;
+using NodaTime.Testing;
+using Xunit;
+
+namespace FictionArchive.Service.NovelService.Tests.Sagas;
+
+public class NovelImportSagaTests
+{
+    private readonly FakeClock _clock = new(Instant.FromUtc(2026, 1, 27, 12, 0, 0));
+
+    [Fact]
+    public async Task Should_transition_to_importing_on_import_requested()
+    {
+        await using var provider = CreateTestProvider();
+        var harness = provider.GetRequiredService<ITestHarness>();
+        await harness.Start();
+
+        var importId = Guid.NewGuid();
+        await harness.Bus.Publish<INovelImportRequested>(new NovelImportRequested(importId, "https://example.com/novel"));
+
+        var sagaHarness = harness.GetSagaStateMachineHarness<NovelImportSaga, NovelImportSagaState>();
+        (await sagaHarness.Exists(importId, x => x.Importing)).HasValue.Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task Should_transition_to_completed_when_no_chapters()
+    {
+        await using var provider = CreateTestProvider();
+        var harness = provider.GetRequiredService<ITestHarness>();
+        await harness.Start();
+
+        var importId = Guid.NewGuid();
+        await harness.Bus.Publish<INovelImportRequested>(new NovelImportRequested(importId, "https://example.com/novel"));
+        await harness.Bus.Publish<INovelMetadataImported>(new NovelMetadataImported(importId, 1, 0));
+
+        var sagaHarness = harness.GetSagaStateMachineHarness<NovelImportSaga, NovelImportSagaState>();
+        (await sagaHarness.Exists(importId, x => x.Completed)).HasValue.Should().BeTrue();
+
+        (await harness.Published.Any<INovelImportCompleted>(x =>
+            x.Context.Message.ImportId == importId && x.Context.Message.Success)).Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task Should_transition_to_processing_when_chapters_pending()
+    {
+        await using var provider = CreateTestProvider();
+        var harness = provider.GetRequiredService<ITestHarness>();
+        await harness.Start();
+
+        var importId = Guid.NewGuid();
+        await harness.Bus.Publish<INovelImportRequested>(new NovelImportRequested(importId, "https://example.com/novel"));
+        await harness.Bus.Publish<INovelMetadataImported>(new NovelMetadataImported(importId, 1, 2));
+
+        var sagaHarness = harness.GetSagaStateMachineHarness<NovelImportSaga, NovelImportSagaState>();
+        (await sagaHarness.Exists(importId, x => x.Processing)).HasValue.Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task Should_complete_when_all_chapters_pulled_and_images_uploaded()
+    {
+        await using var provider = CreateTestProvider();
+        var harness = provider.GetRequiredService<ITestHarness>();
+        await harness.Start();
+
+        var importId = Guid.NewGuid();
+        await harness.Bus.Publish<INovelImportRequested>(new NovelImportRequested(importId, "https://example.com/novel"));
+        await harness.Bus.Publish<INovelMetadataImported>(new NovelMetadataImported(importId, 1, 2));
+        await harness.Bus.Publish<IChapterPullCompleted>(new ChapterPullCompleted(importId, 1, 1));
+        await harness.Bus.Publish<IChapterPullCompleted>(new ChapterPullCompleted(importId, 2, 0));
+        await harness.Bus.Publish<IFileUploadRequestStatusUpdate>(new FileUploadRequestStatusUpdate(
+            importId, Guid.NewGuid(), RequestStatus.Success, "https://cdn.example.com/image.jpg", null));
+
+        var sagaHarness = harness.GetSagaStateMachineHarness<NovelImportSaga, NovelImportSagaState>();
+        (await sagaHarness.Exists(importId, x => x.Completed)).HasValue.Should().BeTrue();
+    }
+
+    private ServiceProvider CreateTestProvider()
+    {
+        return new ServiceCollection()
+            .AddSingleton<IClock>(_clock)
+            .AddMassTransitTestHarness(cfg =>
+            {
+                cfg.AddSagaStateMachine<NovelImportSaga, NovelImportSagaState>()
+                    .InMemoryRepository();
+            })
+            .BuildServiceProvider(true);
+    }
+}

FictionArchive.Service.NovelService/Consumers/ChapterPullRequestedConsumer.cs

@@ -0,0 +1,37 @@
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class ChapterPullRequestedConsumer : IConsumer<IChapterPullRequested>
+{
+    private readonly ILogger<ChapterPullRequestedConsumer> _logger;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public ChapterPullRequestedConsumer(
+        ILogger<ChapterPullRequestedConsumer> logger,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<IChapterPullRequested> context)
+    {
+        var message = context.Message;
+
+        var (chapter, imageCount) = await _novelUpdateService.PullChapterContents(
+            message.ImportId,
+            message.NovelId,
+            message.VolumeId,
+            message.ChapterOrder);
+
+        await context.Publish<IChapterPullCompleted>(new ChapterPullCompleted(
+            message.ImportId,
+            chapter.Id,
+            imageCount
+        ));
+    }
+}

FictionArchive.Service.NovelService/Consumers/FileUploadRequestStatusUpdateConsumer.cs

@@ -0,0 +1,47 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class FileUploadRequestStatusUpdateConsumer : IConsumer<IFileUploadRequestStatusUpdate>
+{
+    private readonly ILogger<FileUploadRequestStatusUpdateConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public FileUploadRequestStatusUpdateConsumer(
+        ILogger<FileUploadRequestStatusUpdateConsumer> logger,
+        NovelServiceDbContext dbContext,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<IFileUploadRequestStatusUpdate> context)
+    {
+        var message = context.Message;
+
+        var image = await _dbContext.Images.FindAsync(message.RequestId);
+        if (image == null)
+        {
+            // Not a request we care about.
+            return;
+        }
+
+        if (message.Status == RequestStatus.Failed)
+        {
+            _logger.LogError("Image upload failed for image with id {imageId}", image.Id);
+            return;
+        }
+        else if (message.Status == RequestStatus.Success)
+        {
+            _logger.LogInformation("Image upload succeeded for image with id {imageId}", image.Id);
+            await _novelUpdateService.UpdateImage(image.Id, message.FileAccessUrl);
+        }
+    }
+}

FictionArchive.Service.NovelService/Consumers/NovelImportCompletedConsumer.cs

@@ -0,0 +1,43 @@
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class NovelImportCompletedConsumer : IConsumer<INovelImportCompleted>
+{
+    private readonly ILogger<NovelImportCompletedConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+
+    public NovelImportCompletedConsumer(
+        ILogger<NovelImportCompletedConsumer> logger,
+        NovelServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<INovelImportCompleted> context)
+    {
+        var message = context.Message;
+
+        _logger.LogInformation(
+            "Novel import {ImportId} completed. Success: {Success}, NovelId: {NovelId}, Error: {Error}",
+            message.ImportId,
+            message.Success,
+            message.NovelId,
+            message.ErrorMessage);
+
+        // Remove from ActiveImports to allow future imports
+        var activeImport = await _dbContext.ActiveImports
+            .FirstOrDefaultAsync(a => a.ImportId == message.ImportId);
+
+        if (activeImport != null)
+        {
+            _dbContext.ActiveImports.Remove(activeImport);
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}

FictionArchive.Service.NovelService/Consumers/NovelImportRequestedConsumer.cs

@@ -0,0 +1,29 @@
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class NovelImportRequestedConsumer : IConsumer<INovelImportRequested>
+{
+    private readonly ILogger<NovelImportRequestedConsumer> _logger;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public NovelImportRequestedConsumer(
+        ILogger<NovelImportRequestedConsumer> logger,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<INovelImportRequested> context)
+    {
+        var message = context.Message;
+        _logger.LogInformation("Starting novel import for {NovelUrl} with ImportId {ImportId}",
+            message.NovelUrl, message.ImportId);
+
+        await _novelUpdateService.ImportNovel(message.ImportId, message.NovelUrl);
+    }
+}

FictionArchive.Service.NovelService/Consumers/TranslationRequestCompletedConsumer.cs

@@ -0,0 +1,48 @@
+using FictionArchive.Service.NovelService.Models.Localization;
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class TranslationRequestCompletedConsumer : IConsumer<ITranslationRequestCompleted>
+{
+    private readonly ILogger<TranslationRequestCompletedConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+
+    public TranslationRequestCompletedConsumer(
+        ILogger<TranslationRequestCompletedConsumer> logger,
+        NovelServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<ITranslationRequestCompleted> context)
+    {
+        var message = context.Message;
+
+        var localizationRequest = await _dbContext.LocalizationRequests
+            .Include(r => r.KeyRequestedForTranslation)
+            .ThenInclude(lk => lk.Texts)
+            .FirstOrDefaultAsync(lk => lk.Id == message.TranslationRequestId);
+
+        if (localizationRequest == null)
+        {
+            // Not one of our requests, discard it
+            return;
+        }
+
+        localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText
+        {
+            Language = localizationRequest.TranslateTo,
+            Text = message.TranslatedText,
+            TranslationEngine = localizationRequest.Engine
+        });
+
+        _dbContext.LocalizationRequests.Remove(localizationRequest);
+        await _dbContext.SaveChangesAsync();
+    }
+}

FictionArchive.Service.NovelService/Contracts/ChapterCreated.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record ChapterCreated(
+    uint ChapterId,
+    uint NovelId,
+    uint VolumeId,
+    uint VolumeOrder,
+    uint ChapterOrder,
+    string ChapterTitle) : IChapterCreated;

FictionArchive.Service.NovelService/Contracts/NovelCreated.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record NovelCreated(
+    uint NovelId,
+    string Title,
+    Language OriginalLanguage,
+    string Source,
+    string AuthorName) : INovelCreated;

FictionArchive.Service.NovelService/Contracts/TranslationRequestCreated.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record TranslationRequestCreated(
+    Guid TranslationRequestId,
+    Language From,
+    Language To,
+    string Body,
+    string TranslationEngineKey) : ITranslationRequestCreated;

FictionArchive.Service.NovelService/FictionArchive.Service.NovelService.csproj

@@ -10,11 +10,12 @@
     <ItemGroup>
         <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="15.1.11" />
         <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
+        <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.5.7" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     </ItemGroup>
 
     <ItemGroup>

FictionArchive.Service.NovelService/GraphQL/Mutation.cs

@@ -1,11 +1,11 @@
+using FictionArchive.Service.NovelService.Contracts;
 using FictionArchive.Service.NovelService.Models.Enums;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Localization;
 using FictionArchive.Service.NovelService.Models.Novels;
 using FictionArchive.Service.NovelService.Models.SourceAdapters;
 using FictionArchive.Service.NovelService.Services;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using HotChocolate.Authorization;
 using HotChocolate.Types;
 using Microsoft.EntityFrameworkCore;
@@ -14,20 +14,22 @@ namespace FictionArchive.Service.NovelService.GraphQL;
 
 public class Mutation
 {
+    [Error<InvalidOperationException>]
     [Authorize]
-    public async Task<NovelUpdateRequestedEvent> ImportNovel(string novelUrl, NovelUpdateService service)
+    public async Task<NovelImportRequested> ImportNovel(string novelUrl, NovelUpdateService service)
     {
         return await service.QueueNovelImport(novelUrl);
     }
 
     [Authorize]
-    public async Task<ChapterPullRequestedEvent> FetchChapterContents(
+    public async Task<ChapterPullRequested> FetchChapterContents(
+        Guid importId,
         uint novelId,
         uint volumeId,
         uint chapterOrder,
         NovelUpdateService service)
     {
-        return await service.QueueChapterPull(novelId, volumeId, chapterOrder);
+        return await service.QueueChapterPull(importId, novelId, volumeId, chapterOrder);
     }
 
     [Error<KeyNotFoundException>]

FictionArchive.Service.NovelService/Migrations/20260127161500_AddNovelImportSaga.Designer.cs

@@ -0,0 +1,673 @@
+// <auto-generated />
+using System;
+using FictionArchive.Service.NovelService.Services;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FictionArchive.Service.NovelService.Migrations
+{
+    [DbContext(typeof(NovelServiceDbContext))]
+    [Migration("20260127161500_AddNovelImportSaga")]
+    partial class AddNovelImportSaga
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.11")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.ActiveImport", b =>
+                {
+                    b.Property<Guid>("ImportId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("NovelUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("StartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("ImportId");
+
+                    b.HasIndex("NovelUrl")
+                        .IsUnique();
+
+                    b.ToTable("ActiveImports");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Images.Image", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<long?>("ChapterId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NewPath")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OriginalPath")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChapterId");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LocalizationKeys");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Localization.LocalizationRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long>("EngineId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("KeyRequestedForTranslationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("TranslateTo")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EngineId");
+
+                    b.HasIndex("KeyRequestedForTranslationId");
+
+                    b.ToTable("LocalizationRequests");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Localization.LocalizationText", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Language")
+                        .HasColumnType("integer");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid?>("LocalizationKeyId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long?>("TranslationEngineId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LocalizationKeyId");
+
+                    b.HasIndex("TranslationEngineId");
+
+                    b.ToTable("LocalizationText");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Chapter", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Guid>("BodyId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("NameId")
+                        .HasColumnType("uuid");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("Revision")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.Property<long>("VolumeId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BodyId");
+
+                    b.HasIndex("NameId");
+
+                    b.HasIndex("VolumeId", "Order")
+                        .IsUnique();
+
+                    b.ToTable("Chapter");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Novel", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<long>("AuthorId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("CoverImageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("DescriptionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExternalId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("NameId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("RawLanguage")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("RawStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("SourceId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int?>("StatusOverride")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorId");
+
+                    b.HasIndex("CoverImageId");
+
+                    b.HasIndex("DescriptionId");
+
+                    b.HasIndex("NameId");
+
+                    b.HasIndex("SourceId");
+
+                    b.HasIndex("ExternalId", "SourceId")
+                        .IsUnique();
+
+                    b.ToTable("Novels");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.NovelTag", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("DisplayNameId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long?>("SourceId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("TagType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayNameId");
+
+                    b.HasIndex("SourceId");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Person", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ExternalUrl")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("NameId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NameId");
+
+                    b.ToTable("Person");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Source", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sources");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.TranslationEngine", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TranslationEngines");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Volume", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("NameId")
+                        .HasColumnType("uuid");
+
+                    b.Property<long>("NovelId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NameId");
+
+                    b.HasIndex("NovelId", "Order")
+                        .IsUnique();
+
+                    b.ToTable("Volume");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Sagas.NovelImportSagaState", b =>
+                {
+                    b.Property<Guid>("CorrelationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant?>("CompletedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("CompletedChapters")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CompletedImages")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ExpectedChapters")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ExpectedImages")
+                        .HasColumnType("integer");
+
+                    b.Property<long?>("NovelId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("NovelUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("StartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("CorrelationId");
+
+                    b.HasIndex("CurrentState");
+
+                    b.HasIndex("NovelUrl");
+
+                    b.ToTable("NovelImportSagaStates");
+                });
+
+            modelBuilder.Entity("NovelNovelTag", b =>
+                {
+                    b.Property<long>("NovelsId")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("TagsId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("NovelsId", "TagsId");
+
+                    b.HasIndex("TagsId");
+
+                    b.ToTable("NovelNovelTag");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Images.Image", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Chapter", "Chapter")
+                        .WithMany("Images")
+                        .HasForeignKey("ChapterId");
+
+                    b.Navigation("Chapter");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Localization.LocalizationRequest", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.TranslationEngine", "Engine")
+                        .WithMany()
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "KeyRequestedForTranslation")
+                        .WithMany()
+                        .HasForeignKey("KeyRequestedForTranslationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Engine");
+
+                    b.Navigation("KeyRequestedForTranslation");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Localization.LocalizationText", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", null)
+                        .WithMany("Texts")
+                        .HasForeignKey("LocalizationKeyId");
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.TranslationEngine", "TranslationEngine")
+                        .WithMany()
+                        .HasForeignKey("TranslationEngineId");
+
+                    b.Navigation("TranslationEngine");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Chapter", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "Body")
+                        .WithMany()
+                        .HasForeignKey("BodyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "Name")
+                        .WithMany()
+                        .HasForeignKey("NameId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Volume", "Volume")
+                        .WithMany("Chapters")
+                        .HasForeignKey("VolumeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Body");
+
+                    b.Navigation("Name");
+
+                    b.Navigation("Volume");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Novel", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Person", "Author")
+                        .WithMany()
+                        .HasForeignKey("AuthorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Images.Image", "CoverImage")
+                        .WithMany()
+                        .HasForeignKey("CoverImageId");
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "Description")
+                        .WithMany()
+                        .HasForeignKey("DescriptionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "Name")
+                        .WithMany()
+                        .HasForeignKey("NameId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Source", "Source")
+                        .WithMany()
+                        .HasForeignKey("SourceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Author");
+
+                    b.Navigation("CoverImage");
+
+                    b.Navigation("Description");
+
+                    b.Navigation("Name");
+
+                    b.Navigation("Source");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.NovelTag", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "DisplayName")
+                        .WithMany()
+                        .HasForeignKey("DisplayNameId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Source", "Source")
+                        .WithMany()
+                        .HasForeignKey("SourceId");
+
+                    b.Navigation("DisplayName");
+
+                    b.Navigation("Source");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Person", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "Name")
+                        .WithMany()
+                        .HasForeignKey("NameId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Name");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Volume", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", "Name")
+                        .WithMany()
+                        .HasForeignKey("NameId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Novel", "Novel")
+                        .WithMany("Volumes")
+                        .HasForeignKey("NovelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Name");
+
+                    b.Navigation("Novel");
+                });
+
+            modelBuilder.Entity("NovelNovelTag", b =>
+                {
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Novel", null)
+                        .WithMany()
+                        .HasForeignKey("NovelsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.NovelTag", null)
+                        .WithMany()
+                        .HasForeignKey("TagsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Localization.LocalizationKey", b =>
+                {
+                    b.Navigation("Texts");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Chapter", b =>
+                {
+                    b.Navigation("Images");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Novel", b =>
+                {
+                    b.Navigation("Volumes");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Volume", b =>
+                {
+                    b.Navigation("Chapters");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FictionArchive.Service.NovelService/Migrations/20260127161500_AddNovelImportSaga.cs

@@ -0,0 +1,76 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using NodaTime;
+
+#nullable disable
+
+namespace FictionArchive.Service.NovelService.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddNovelImportSaga : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ActiveImports",
+                columns: table => new
+                {
+                    ImportId = table.Column<Guid>(type: "uuid", nullable: false),
+                    NovelUrl = table.Column<string>(type: "text", nullable: false),
+                    StartedAt = table.Column<Instant>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ActiveImports", x => x.ImportId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "NovelImportSagaStates",
+                columns: table => new
+                {
+                    CorrelationId = table.Column<Guid>(type: "uuid", nullable: false),
+                    CurrentState = table.Column<string>(type: "text", nullable: false),
+                    NovelUrl = table.Column<string>(type: "text", nullable: false),
+                    NovelId = table.Column<long>(type: "bigint", nullable: true),
+                    ExpectedChapters = table.Column<int>(type: "integer", nullable: false),
+                    CompletedChapters = table.Column<int>(type: "integer", nullable: false),
+                    ExpectedImages = table.Column<int>(type: "integer", nullable: false),
+                    CompletedImages = table.Column<int>(type: "integer", nullable: false),
+                    StartedAt = table.Column<Instant>(type: "timestamp with time zone", nullable: false),
+                    CompletedAt = table.Column<Instant>(type: "timestamp with time zone", nullable: true),
+                    ErrorMessage = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_NovelImportSagaStates", x => x.CorrelationId);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ActiveImports_NovelUrl",
+                table: "ActiveImports",
+                column: "NovelUrl",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NovelImportSagaStates_CurrentState",
+                table: "NovelImportSagaStates",
+                column: "CurrentState");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NovelImportSagaStates_NovelUrl",
+                table: "NovelImportSagaStates",
+                column: "NovelUrl");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ActiveImports");
+
+            migrationBuilder.DropTable(
+                name: "NovelImportSagaStates");
+        }
+    }
+}

FictionArchive.Service.NovelService/Migrations/NovelServiceDbContextModelSnapshot.cs

@@ -23,6 +23,27 @@ namespace FictionArchive.Service.NovelService.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.ActiveImport", b =>
+                {
+                    b.Property<Guid>("ImportId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("NovelUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("StartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("ImportId");
+
+                    b.HasIndex("NovelUrl")
+                        .IsUnique();
+
+                    b.ToTable("ActiveImports");
+                });
+
             modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Images.Image", b =>
                 {
                     b.Property<Guid>("Id")
@@ -391,6 +412,53 @@ namespace FictionArchive.Service.NovelService.Migrations
                     b.ToTable("Volume");
                 });
 
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Sagas.NovelImportSagaState", b =>
+                {
+                    b.Property<Guid>("CorrelationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant?>("CompletedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("CompletedChapters")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CompletedImages")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ExpectedChapters")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ExpectedImages")
+                        .HasColumnType("integer");
+
+                    b.Property<long?>("NovelId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("NovelUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("StartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("CorrelationId");
+
+                    b.HasIndex("CurrentState");
+
+                    b.HasIndex("NovelUrl");
+
+                    b.ToTable("NovelImportSagaStates");
+                });
+
             modelBuilder.Entity("NovelNovelTag", b =>
                 {
                     b.Property<long>("NovelsId")

FictionArchive.Service.NovelService/Models/ActiveImport.cs

@@ -0,0 +1,10 @@
+using NodaTime;
+
+namespace FictionArchive.Service.NovelService.Models;
+
+public class ActiveImport
+{
+    public Guid ImportId { get; set; }
+    public required string NovelUrl { get; set; }
+    public Instant StartedAt { get; set; }
+}

FictionArchive.Service.NovelService/Models/IntegrationEvents/ChapterCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class ChapterCreatedEvent : IIntegrationEvent
-{
-    public required uint ChapterId { get; init; }
-    public required uint NovelId { get; init; }
-    public required uint VolumeId { get; init; }
-    public required int VolumeOrder { get; init; }
-    public required uint ChapterOrder { get; init; }
-    public required string ChapterTitle { get; init; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/ChapterPullRequestedEvent.cs

@@ -1,10 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class ChapterPullRequestedEvent : IIntegrationEvent
-{
-    public uint NovelId { get; set; }
-    public uint VolumeId { get; set; }
-    public uint ChapterOrder { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs

@@ -1,10 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.FileService.IntegrationEvents;
-
-public class FileUploadRequestCreatedEvent : IIntegrationEvent
-{
-    public Guid RequestId { get; set; }
-    public string FilePath { get; set; }
-    public byte[] FileData { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs

@@ -1,22 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class FileUploadRequestStatusUpdateEvent : IIntegrationEvent
-{
-    public Guid RequestId { get; set; }
-    public RequestStatus Status { get; set; }
-    
-    #region Success
-    
-    public string? FileAccessUrl { get; set; }
-    
-    #endregion
-    
-    #region Failure
-    
-    public string? ErrorMessage { get; set; }
-    
-    #endregion
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/NovelCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class NovelCreatedEvent : IIntegrationEvent
-{
-    public required uint NovelId { get; init; }
-    public required string Title { get; init; }
-    public required Language OriginalLanguage { get; init; }
-    public required string Source { get; init; }
-    public required string AuthorName { get; init; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/NovelUpdateRequestedEvent.cs

@@ -1,8 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class NovelUpdateRequestedEvent : IIntegrationEvent
-{
-    public string NovelUrl { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/TranslationRequestCompletedEvent.cs

@@ -1,17 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class TranslationRequestCompletedEvent : IIntegrationEvent
-{
-    /// <summary>
-    /// Maps this event back to a triggering request.
-    /// </summary>
-    public Guid? TranslationRequestId { get; set; }
-    
-    /// <summary>
-    /// The resulting text.
-    /// </summary>
-    public string? TranslatedText { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/TranslationRequestCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class TranslationRequestCreatedEvent : IIntegrationEvent
-{
-    public Guid TranslationRequestId { get; set; }
-    public Language From { get; set; }
-    public Language To { get; set; }
-    public string Body { get; set; }
-    public string TranslationEngineKey { get; set; }
-}

FictionArchive.Service.NovelService/Program.cs

@@ -1,16 +1,17 @@
 using FictionArchive.Common.Extensions;
+using FictionArchive.Service.NovelService.Consumers;
 using FictionArchive.Service.NovelService.GraphQL;
 using FictionArchive.Service.NovelService.Models.Configuration;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
+using FictionArchive.Service.NovelService.Sagas;
 using FictionArchive.Service.NovelService.Services;
-using FictionArchive.Service.NovelService.Services.EventHandlers;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
 using FictionArchive.Service.NovelService.Services.SourceAdapters.Novelpia;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.Shared.Services.GraphQL;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
+using NodaTime;
 
 namespace FictionArchive.Service.NovelService;
 
@@ -25,18 +26,28 @@ public class Program
         
         builder.Services.AddMemoryCache();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(
-            {
+                builder.Configuration,
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
+                x =>
-            })
+                {
-                .Subscribe<TranslationRequestCompletedEvent, TranslationRequestCompletedEventHandler>()
+                    x.AddConsumer<TranslationRequestCompletedConsumer>();
-                .Subscribe<NovelUpdateRequestedEvent, NovelUpdateRequestedEventHandler>()
+                    x.AddConsumer<FileUploadRequestStatusUpdateConsumer>();
-                .Subscribe<ChapterPullRequestedEvent, ChapterPullRequestedEventHandler>()
+                    x.AddConsumer<ChapterPullRequestedConsumer>();
-                .Subscribe<FileUploadRequestStatusUpdateEvent, FileUploadRequestStatusUpdateEventHandler>();
+                    x.AddConsumer<NovelImportRequestedConsumer>();
+                    x.AddConsumer<NovelImportCompletedConsumer>();
+
+                    x.AddSagaStateMachine<NovelImportSaga, NovelImportSagaState>()
+                        .EntityFrameworkRepository(r =>
+                        {
+                            r.ConcurrencyMode = ConcurrencyMode.Optimistic;
+                            r.ExistingDbContext<NovelServiceDbContext>();
+                            r.UsePostgres();
+                        });
+                });
         }
 
         #endregion
@@ -73,9 +84,12 @@ public class Program
 
         builder.Services.Configure<NovelUpdateServiceConfiguration>(builder.Configuration.GetSection("UpdateService"));
         builder.Services.AddTransient<NovelUpdateService>();
-        
+
         #endregion
-        
+
+        // Register IClock for saga and service use
+        builder.Services.AddSingleton<IClock>(SystemClock.Instance);
+
         builder.Services.AddHealthChecks();
 
         // Authentication & Authorization

FictionArchive.Service.NovelService/Sagas/NovelImportSaga.cs

@@ -0,0 +1,135 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using NodaTime;
+
+namespace FictionArchive.Service.NovelService.Sagas;
+
+public class NovelImportSaga : MassTransitStateMachine<NovelImportSagaState>
+{
+    public State Importing { get; private set; } = null!;
+    public State Processing { get; private set; } = null!;
+    public State Completed { get; private set; } = null!;
+    public State Failed { get; private set; } = null!;
+
+    public Event<INovelImportRequested> NovelImportRequested { get; private set; } = null!;
+    public Event<INovelMetadataImported> NovelMetadataImported { get; private set; } = null!;
+    public Event<IChapterPullCompleted> ChapterPullCompleted { get; private set; } = null!;
+    public Event<IFileUploadRequestStatusUpdate> FileUploadStatusUpdate { get; private set; } = null!;
+    public Event<Fault<IChapterPullRequested>> ChapterPullFaulted { get; private set; } = null!;
+    public Event<Fault<IFileUploadRequestCreated>> FileUploadFaulted { get; private set; } = null!;
+
+    private readonly IClock _clock;
+
+    public NovelImportSaga(IClock clock)
+    {
+        _clock = clock;
+
+        InstanceState(x => x.CurrentState);
+
+        Event(() => NovelImportRequested, x => x.CorrelateById(ctx => ctx.Message.ImportId));
+        Event(() => NovelMetadataImported, x => x.CorrelateById(ctx => ctx.Message.ImportId));
+        Event(() => ChapterPullCompleted, x => x.CorrelateById(ctx => ctx.Message.ImportId));
+        Event(() => FileUploadStatusUpdate, x =>
+        {
+            x.CorrelateById(ctx => ctx.Message.ImportId ?? Guid.Empty);
+            x.OnMissingInstance(m => m.Discard());
+        });
+        Event(() => ChapterPullFaulted, x => x.CorrelateById(ctx => ctx.Message.Message.ImportId));
+        Event(() => FileUploadFaulted, x =>
+        {
+            x.CorrelateById(ctx => ctx.Message.Message.ImportId ?? Guid.Empty);
+            x.OnMissingInstance(m => m.Discard());
+        });
+
+        Initially(
+            When(NovelImportRequested)
+                .Then(ctx =>
+                {
+                    ctx.Saga.NovelUrl = ctx.Message.NovelUrl;
+                    ctx.Saga.StartedAt = _clock.GetCurrentInstant();
+                })
+                .TransitionTo(Importing)
+        );
+
+        During(Importing,
+            When(NovelMetadataImported)
+                .Then(ctx =>
+                {
+                    ctx.Saga.NovelId = ctx.Message.NovelId;
+                    ctx.Saga.ExpectedChapters = ctx.Message.ChaptersPendingPull;
+                })
+                .IfElse(
+                    ctx => ctx.Saga.ExpectedChapters == 0,
+                    thenBinder => thenBinder
+                        .Then(ctx => ctx.Saga.CompletedAt = _clock.GetCurrentInstant())
+                        .TransitionTo(Completed)
+                        .PublishAsync(ctx => ctx.Init<INovelImportCompleted>(new NovelImportCompleted(
+                            ctx.Saga.CorrelationId,
+                            ctx.Saga.NovelId,
+                            true,
+                            null))),
+                    elseBinder => elseBinder.TransitionTo(Processing)
+                )
+        );
+
+        During(Processing,
+            When(ChapterPullCompleted)
+                .Then(ctx =>
+                {
+                    ctx.Saga.CompletedChapters++;
+                    ctx.Saga.ExpectedImages += ctx.Message.ImagesQueued;
+                })
+                .If(ctx => IsComplete(ctx.Saga), ctx => ctx
+                    .Then(c => c.Saga.CompletedAt = _clock.GetCurrentInstant())
+                    .TransitionTo(Completed)
+                    .PublishAsync(c => c.Init<INovelImportCompleted>(new NovelImportCompleted(
+                        c.Saga.CorrelationId,
+                        c.Saga.NovelId,
+                        true,
+                        null)))),
+
+            When(FileUploadStatusUpdate)
+                .Then(ctx => ctx.Saga.CompletedImages++)
+                .If(ctx => IsComplete(ctx.Saga), ctx => ctx
+                    .Then(c => c.Saga.CompletedAt = _clock.GetCurrentInstant())
+                    .TransitionTo(Completed)
+                    .PublishAsync(c => c.Init<INovelImportCompleted>(new NovelImportCompleted(
+                        c.Saga.CorrelationId,
+                        c.Saga.NovelId,
+                        true,
+                        null)))),
+
+            When(ChapterPullFaulted)
+                .Then(ctx =>
+                {
+                    ctx.Saga.ErrorMessage = ctx.Message.Exceptions.FirstOrDefault()?.Message;
+                    ctx.Saga.CompletedAt = _clock.GetCurrentInstant();
+                })
+                .TransitionTo(Failed)
+                .PublishAsync(ctx => ctx.Init<INovelImportCompleted>(new NovelImportCompleted(
+                    ctx.Saga.CorrelationId,
+                    ctx.Saga.NovelId,
+                    false,
+                    ctx.Saga.ErrorMessage))),
+
+            When(FileUploadFaulted)
+                .Then(ctx =>
+                {
+                    ctx.Saga.ErrorMessage = ctx.Message.Exceptions.FirstOrDefault()?.Message;
+                    ctx.Saga.CompletedAt = _clock.GetCurrentInstant();
+                })
+                .TransitionTo(Failed)
+                .PublishAsync(ctx => ctx.Init<INovelImportCompleted>(new NovelImportCompleted(
+                    ctx.Saga.CorrelationId,
+                    ctx.Saga.NovelId,
+                    false,
+                    ctx.Saga.ErrorMessage)))
+        );
+
+        SetCompletedWhenFinalized();
+    }
+
+    private static bool IsComplete(NovelImportSagaState saga) =>
+        saga.CompletedChapters >= saga.ExpectedChapters &&
+        saga.CompletedImages >= saga.ExpectedImages;
+}

FictionArchive.Service.NovelService/Sagas/NovelImportSagaState.cs

@@ -0,0 +1,29 @@
+using MassTransit;
+using NodaTime;
+
+namespace FictionArchive.Service.NovelService.Sagas;
+
+public class NovelImportSagaState : SagaStateMachineInstance
+{
+    public Guid CorrelationId { get; set; }
+    public string CurrentState { get; set; } = null!;
+
+    // Identity
+    public string NovelUrl { get; set; } = null!;
+    public uint? NovelId { get; set; }
+
+    // Chapter tracking
+    public int ExpectedChapters { get; set; }
+    public int CompletedChapters { get; set; }
+
+    // Image tracking
+    public int ExpectedImages { get; set; }
+    public int CompletedImages { get; set; }
+
+    // Timestamps
+    public Instant StartedAt { get; set; }
+    public Instant? CompletedAt { get; set; }
+
+    // Error info
+    public string? ErrorMessage { get; set; }
+}

FictionArchive.Service.NovelService/Services/EventHandlers/ChapterPullRequestedEventHandler.cs

@@ -1,19 +0,0 @@
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class ChapterPullRequestedEventHandler : IIntegrationEventHandler<ChapterPullRequestedEvent>
-{
-    private readonly NovelUpdateService _novelUpdateService;
-
-    public ChapterPullRequestedEventHandler(NovelUpdateService novelUpdateService)
-    {
-        _novelUpdateService = novelUpdateService;
-    }
-
-    public async Task Handle(ChapterPullRequestedEvent @event)
-    {
-        await _novelUpdateService.PullChapterContents(@event.NovelId, @event.VolumeId, @event.ChapterOrder);
-    }
-}

FictionArchive.Service.NovelService/Services/EventHandlers/FileUploadRequestStatusUpdateEventHandler.cs

@@ -1,39 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class FileUploadRequestStatusUpdateEventHandler : IIntegrationEventHandler<FileUploadRequestStatusUpdateEvent>
-{
-    private readonly ILogger<FileUploadRequestStatusUpdateEventHandler> _logger;
-    private readonly NovelServiceDbContext _context;
-    private readonly NovelUpdateService _novelUpdateService;
-
-    public FileUploadRequestStatusUpdateEventHandler(ILogger<FileUploadRequestStatusUpdateEventHandler> logger, NovelServiceDbContext context, NovelUpdateService novelUpdateService)
-    {
-        _logger = logger;
-        _context = context;
-        _novelUpdateService = novelUpdateService;
-    }
-
-    public async Task Handle(FileUploadRequestStatusUpdateEvent @event)
-    {
-        var image = await _context.Images.FindAsync(@event.RequestId);
-        if (image == null)
-        {
-            // Not a request we care about.
-            return;
-        }
-        if (@event.Status == RequestStatus.Failed)
-        {
-            _logger.LogError("Image upload failed for image with id {imageId}", image.Id);
-            return;
-        }
-        else if (@event.Status == RequestStatus.Success)
-        {
-            _logger.LogInformation("Image upload succeeded for image with id {imageId}", image.Id);
-            await _novelUpdateService.UpdateImage(image.Id, @event.FileAccessUrl);
-        }
-    }
-}

FictionArchive.Service.NovelService/Services/EventHandlers/NovelUpdateRequestedEventHandler.cs

@@ -1,23 +0,0 @@
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class NovelUpdateRequestedEventHandler : IIntegrationEventHandler<NovelUpdateRequestedEvent>
-{
-    private readonly ILogger<NovelUpdateRequestedEventHandler> _logger;
-    private readonly IEventBus _eventBus;
-    private readonly NovelUpdateService _novelUpdateService;
-
-    public NovelUpdateRequestedEventHandler(ILogger<NovelUpdateRequestedEventHandler> logger, IEventBus eventBus, NovelUpdateService novelUpdateService)
-    {
-        _logger = logger;
-        _eventBus = eventBus;
-        _novelUpdateService = novelUpdateService;
-    }
-
-    public async Task Handle(NovelUpdateRequestedEvent @event)
-    {
-        await _novelUpdateService.ImportNovel(@event.NovelUrl);
-    }
-}

FictionArchive.Service.NovelService/Services/EventHandlers/TranslationRequestCompletedEventHandler.cs

@@ -1,39 +0,0 @@
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.NovelService.Models.Localization;
-using FictionArchive.Service.Shared.Services.EventBus;
-using Microsoft.EntityFrameworkCore;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class TranslationRequestCompletedEventHandler : IIntegrationEventHandler<TranslationRequestCompletedEvent>
-{
-    private readonly ILogger<TranslationRequestCompletedEventHandler> _logger;
-    private readonly NovelServiceDbContext _dbContext;
-
-    public TranslationRequestCompletedEventHandler(ILogger<TranslationRequestCompletedEventHandler> logger, NovelServiceDbContext dbContext)
-    {
-        _logger = logger;
-        _dbContext = dbContext;
-    }
-
-    public async Task Handle(TranslationRequestCompletedEvent @event)
-    {
-        var localizationRequest = await _dbContext.LocalizationRequests.Include(r => r.KeyRequestedForTranslation)
-            .ThenInclude(lk => lk.Texts)
-            .FirstOrDefaultAsync(lk => lk.Id == @event.TranslationRequestId);
-        if (localizationRequest == null)
-        {
-            // Not one of our requests, discard it
-            return;
-        }
-        
-        localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText()
-        {
-            Language = localizationRequest.TranslateTo,
-            Text = @event.TranslatedText,
-            TranslationEngine = localizationRequest.Engine
-        });
-        _dbContext.LocalizationRequests.Remove(localizationRequest);
-        await _dbContext.SaveChangesAsync();
-    }
-}

FictionArchive.Service.NovelService/Services/NovelServiceDbContext.cs

@@ -1,6 +1,8 @@
+using FictionArchive.Service.NovelService.Models;
 using FictionArchive.Service.NovelService.Models.Images;
 using FictionArchive.Service.NovelService.Models.Localization;
 using FictionArchive.Service.NovelService.Models.Novels;
+using FictionArchive.Service.NovelService.Sagas;
 using FictionArchive.Service.Shared.Services.Database;
 using Microsoft.EntityFrameworkCore;
 
@@ -18,6 +20,8 @@ public class NovelServiceDbContext(DbContextOptions options, ILogger<NovelServic
     public DbSet<LocalizationKey> LocalizationKeys { get; set; }
     public DbSet<LocalizationRequest> LocalizationRequests { get; set; }
     public DbSet<Image> Images { get; set; }
+    public DbSet<ActiveImport> ActiveImports { get; set; }
+    public DbSet<NovelImportSagaState> NovelImportSagaStates { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
@@ -36,5 +40,18 @@ public class NovelServiceDbContext(DbContextOptions options, ILogger<NovelServic
         modelBuilder.Entity<Chapter>()
             .HasIndex("VolumeId", "Order")
             .IsUnique();
+
+        modelBuilder.Entity<ActiveImport>(entity =>
+        {
+            entity.HasKey(e => e.ImportId);
+            entity.HasIndex(e => e.NovelUrl).IsUnique();
+        });
+
+        modelBuilder.Entity<NovelImportSagaState>(entity =>
+        {
+            entity.HasKey(e => e.CorrelationId);
+            entity.HasIndex(e => e.NovelUrl);
+            entity.HasIndex(e => e.CurrentState);
+        });
     }
 }

FictionArchive.Service.NovelService/Services/NovelUpdateService.cs

@@ -1,17 +1,19 @@
 using FictionArchive.Common.Enums;
-using FictionArchive.Service.FileService.IntegrationEvents;
+using FictionArchive.Service.NovelService.Contracts;
+using FictionArchive.Service.NovelService.Models;
 using FictionArchive.Service.NovelService.Models.Configuration;
 using FictionArchive.Service.NovelService.Models.Enums;
 using FictionArchive.Service.NovelService.Models.Images;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Localization;
 using FictionArchive.Service.NovelService.Models.Novels;
 using FictionArchive.Service.NovelService.Models.SourceAdapters;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using HtmlAgilityPack;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
+using NodaTime;
 
 namespace FictionArchive.Service.NovelService.Services;
 
@@ -20,16 +22,18 @@ public class NovelUpdateService
     private readonly NovelServiceDbContext _dbContext;
     private readonly ILogger<NovelUpdateService> _logger;
     private readonly IEnumerable<ISourceAdapter> _sourceAdapters;
-    private readonly IEventBus _eventBus;
+    private readonly IPublishEndpoint _publishEndpoint;
     private readonly NovelUpdateServiceConfiguration _novelUpdateServiceConfiguration;
+    private readonly IClock _clock;
 
-    public NovelUpdateService(NovelServiceDbContext dbContext, ILogger<NovelUpdateService> logger, IEnumerable<ISourceAdapter> sourceAdapters, IEventBus eventBus, IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration)
+    public NovelUpdateService(NovelServiceDbContext dbContext, ILogger<NovelUpdateService> logger, IEnumerable<ISourceAdapter> sourceAdapters, IPublishEndpoint publishEndpoint, IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration, IClock clock)
     {
         _dbContext = dbContext;
         _logger = logger;
         _sourceAdapters = sourceAdapters;
-        _eventBus = eventBus;
+        _publishEndpoint = publishEndpoint;
         _novelUpdateServiceConfiguration = novelUpdateServiceConfiguration.Value;
+        _clock = clock;
     }
 
     #region Helper Methods
@@ -299,7 +303,7 @@ public class NovelUpdateService
 
     #endregion
 
-    public async Task<Novel> ImportNovel(string novelUrl)
+    public async Task<Novel> ImportNovel(Guid importId, string novelUrl)
     {
         // Step 1: Get metadata from source adapter
         NovelMetadata? metadata = null;
@@ -335,7 +339,8 @@ public class NovelUpdateService
             .ThenInclude(volume => volume.Chapters)
             .ThenInclude(chapter => chapter.Body)
             .ThenInclude(localizationKey => localizationKey.Texts)
-            .Include(n => n.CoverImage)
+            .Include(n => n.CoverImage).Include(novel => novel.Volumes).ThenInclude(volume => volume.Chapters)
+            .ThenInclude(chapter => chapter.Name)
             .FirstOrDefaultAsync(n =>
                 n.ExternalId == metadata.ExternalId &&
                 n.Source.Key == metadata.SourceDescriptor.Key);
@@ -393,14 +398,12 @@ public class NovelUpdateService
         // Publish novel created event for new novels
         if (existingNovel == null)
         {
-            await _eventBus.Publish(new NovelCreatedEvent
+            await _publishEndpoint.Publish<INovelCreated>(new NovelCreated(
-            {
+                novel.Id,
-                NovelId = novel.Id,
+                novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
-                Title = novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
+                novel.RawLanguage,
-                OriginalLanguage = novel.RawLanguage,
+                novel.Source.Key,
-                Source = novel.Source.Key,
+                novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text));
-                AuthorName = novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
-            });
         }
 
         // Publish chapter created events for new chapters
@@ -408,51 +411,60 @@ public class NovelUpdateService
         {
             foreach (var chapter in volume.Chapters.Where(c => !existingChapterIds.Contains(c.Id)))
             {
-                await _eventBus.Publish(new ChapterCreatedEvent
+                await _publishEndpoint.Publish<IChapterCreated>(new ChapterCreated(
-                {
+                    chapter.Id,
-                    ChapterId = chapter.Id,
+                    novel.Id,
-                    NovelId = novel.Id,
+                    volume.Id,
-                    VolumeId = volume.Id,
+                    (uint)volume.Order,
-                    VolumeOrder = volume.Order,
+                    chapter.Order,
-                    ChapterOrder = chapter.Order,
+                    chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text));
-                    ChapterTitle = chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
-                });
             }
         }
 
+        // Count chapters that need pulling
+        var chaptersNeedingPull = novel.Volumes
+            .SelectMany(v => v.Chapters)
+            .Where(c => c.Body?.Texts == null || !c.Body.Texts.Any())
+            .ToList();
+
+        // Publish metadata imported event for saga
+        await _publishEndpoint.Publish<INovelMetadataImported>(new NovelMetadataImported(
+            importId,
+            novel.Id,
+            chaptersNeedingPull.Count
+        ));
+
         // Publish cover image event if needed
         if (shouldPublishCoverEvent && novel.CoverImage != null && metadata.CoverImage != null)
         {
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent
+            await _publishEndpoint.Publish<IFileUploadRequestCreated>(new FileUploadRequestCreated(
-            {
+                importId,
-                RequestId = novel.CoverImage.Id,
+                novel.CoverImage.Id,
-                FileData = metadata.CoverImage.Data,
+                $"Novels/{novel.Id}/Images/cover.jpg",
-                FilePath = $"Novels/{novel.Id}/Images/cover.jpg"
+                metadata.CoverImage.Data));
-            });
         }
 
         // Publish chapter pull events for chapters without body content
         foreach (var volume in novel.Volumes)
         {
-            var chaptersNeedingPull = volume.Chapters
+            var volumeChaptersNeedingPull = volume.Chapters
                 .Where(c => c.Body?.Texts == null || !c.Body.Texts.Any())
                 .ToList();
 
-            foreach (var chapter in chaptersNeedingPull)
+            foreach (var chapter in volumeChaptersNeedingPull)
             {
-                await _eventBus.Publish(new ChapterPullRequestedEvent
+                await _publishEndpoint.Publish<IChapterPullRequested>(new ChapterPullRequested(
-                {
+                    importId,
-                    NovelId = novel.Id,
+                    novel.Id,
-                    VolumeId = volume.Id,
+                    volume.Id,
-                    ChapterOrder = chapter.Order
+                    chapter.Order));
-                });
             }
         }
 
         return novel;
     }
 
-    public async Task<Chapter> PullChapterContents(uint novelId, uint volumeId, uint chapterOrder)
+    public async Task<(Chapter chapter, int imageCount)> PullChapterContents(Guid importId, uint novelId, uint volumeId, uint chapterOrder)
     {
         var novel = await _dbContext.Novels.Where(novel => novel.Id == novelId)
             .Include(novel => novel.Volumes)
@@ -518,15 +530,14 @@ public class NovelUpdateService
         foreach (var image in chapter.Images)
         {
             var data = rawChapter.ImageData.FirstOrDefault(img => img.Url == image.OriginalPath);
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent()
+            await _publishEndpoint.Publish<IFileUploadRequestCreated>(new FileUploadRequestCreated(
-            {
+                importId,
-                FileData = data.Data,
+                image.Id,
-                FilePath = $"{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
+                $"Novels/{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
-                RequestId = image.Id
+                data.Data));
-            });
         }
 
-        return chapter;
+        return (chapter, chapter.Images.Count);
     }
 
     public async Task UpdateImage(Guid imageId, string newUrl)
@@ -557,25 +568,35 @@ public class NovelUpdateService
         await _dbContext.SaveChangesAsync();
     }
 
-    public async Task<NovelUpdateRequestedEvent> QueueNovelImport(string novelUrl)
+    public async Task<NovelImportRequested> QueueNovelImport(string novelUrl)
     {
-        var importNovelRequestEvent = new NovelUpdateRequestedEvent()
+        var importId = Guid.NewGuid();
+        var activeImport = new ActiveImport
         {
-            NovelUrl = novelUrl
+            ImportId = importId,
+            NovelUrl = novelUrl,
+            StartedAt = _clock.GetCurrentInstant()
         };
-        await _eventBus.Publish(importNovelRequestEvent);
+
+        try
+        {
+            await _dbContext.ActiveImports.AddAsync(activeImport);
+            await _dbContext.SaveChangesAsync();
+        }
+        catch (DbUpdateException)
+        {
+            throw new InvalidOperationException($"An import is already in progress for {novelUrl}");
+        }
+
+        var importNovelRequestEvent = new NovelImportRequested(importId, novelUrl);
+        await _publishEndpoint.Publish<INovelImportRequested>(importNovelRequestEvent);
         return importNovelRequestEvent;
     }
 
-    public async Task<ChapterPullRequestedEvent> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
+    public async Task<ChapterPullRequested> QueueChapterPull(Guid importId, uint novelId, uint volumeId, uint chapterOrder)
     {
-        var chapterPullEvent = new ChapterPullRequestedEvent()
+        var chapterPullEvent = new ChapterPullRequested(importId, novelId, volumeId, chapterOrder);
-        {
+        await _publishEndpoint.Publish<IChapterPullRequested>(chapterPullEvent);
-            NovelId = novelId,
-            VolumeId = volumeId,
-            ChapterOrder = chapterOrder
-        };
-        await _eventBus.Publish(chapterPullEvent);
         return chapterPullEvent;
     }
 

FictionArchive.Service.NovelService/appsettings.json

@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning"
     }
   },
   "Novelpia": {

FictionArchive.Service.SchedulerService/Models/JobTemplates/EventJobTemplate.cs

@@ -1,4 +1,4 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using MassTransit;
 using Newtonsoft.Json;
 using Quartz;
 
@@ -6,18 +6,18 @@ namespace FictionArchive.Service.SchedulerService.Models.JobTemplates;
 
 public class EventJobTemplate : IJob
 {
-    private readonly IEventBus _eventBus;
+    private readonly IBus _bus;
     private readonly ILogger<EventJobTemplate> _logger;
 
     public const string EventTypeParameter = "RoutingKey";
     public const string EventDataParameter = "MessageData";
-    
+
-    public EventJobTemplate(IEventBus eventBus, ILogger<EventJobTemplate> logger)
+    public EventJobTemplate(IBus bus, ILogger<EventJobTemplate> logger)
     {
-        _eventBus = eventBus;
+        _bus = bus;
         _logger = logger;
     }
-    
+
     public async Task Execute(IJobExecutionContext context)
     {
         try
@@ -25,7 +25,7 @@ public class EventJobTemplate : IJob
             var eventData = context.MergedJobDataMap.GetString(EventDataParameter);
             var eventType = context.MergedJobDataMap.GetString(EventTypeParameter);
             var eventObject = JsonConvert.DeserializeObject(eventData);
-            await _eventBus.Publish(eventObject, eventType);
+            await _bus.Publish(eventObject);
         }
         catch (Exception ex)
         {

FictionArchive.Service.SchedulerService/Program.cs

@@ -2,7 +2,6 @@ using FictionArchive.Service.SchedulerService.GraphQL;
 using FictionArchive.Service.SchedulerService.Services;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using Quartz;
 using Quartz.Impl.AdoJobStore;
 
@@ -38,10 +37,7 @@ public class Program
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
-            {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            });
         }
 
         #endregion

FictionArchive.Service.SchedulerService/Services/JobManagerService.cs

@@ -1,7 +1,6 @@
 using System.Data;
 using FictionArchive.Service.SchedulerService.Models;
 using FictionArchive.Service.SchedulerService.Models.JobTemplates;
-using FictionArchive.Service.Shared.Services.EventBus;
 using Quartz;
 using Quartz.Impl.Matchers;
 

FictionArchive.Service.SchedulerService/appsettings.json

@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning"
     }
   },
   "RabbitMQ": {

FictionArchive.Service.Shared/Contracts/Events/IChapterCreated.cs

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IChapterCreated
+{
+    uint ChapterId { get; }
+    uint NovelId { get; }
+    uint VolumeId { get; }
+    uint VolumeOrder { get; }
+    uint ChapterOrder { get; }
+    string ChapterTitle { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/IChapterPullCompleted.cs

@@ -0,0 +1,10 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IChapterPullCompleted
+{
+    Guid ImportId { get; }
+    uint ChapterId { get; }
+    int ImagesQueued { get; }
+}
+
+public record ChapterPullCompleted(Guid ImportId, uint ChapterId, int ImagesQueued) : IChapterPullCompleted;

FictionArchive.Service.Shared/Contracts/Events/IChapterPullRequested.cs

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IChapterPullRequested
+{
+    Guid ImportId { get; }
+    uint NovelId { get; }
+    uint VolumeId { get; }
+    uint ChapterOrder { get; }
+}
+
+public record ChapterPullRequested(Guid ImportId, uint NovelId, uint VolumeId, uint ChapterOrder) : IChapterPullRequested;

FictionArchive.Service.Shared/Contracts/Events/IFileUploadRequestCreated.cs

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IFileUploadRequestCreated
+{
+    Guid? ImportId { get; }
+    Guid RequestId { get; }
+    string FilePath { get; }
+    byte[] FileData { get; }
+}
+
+public record FileUploadRequestCreated(Guid? ImportId, Guid RequestId, string FilePath, byte[] FileData) : IFileUploadRequestCreated;

FictionArchive.Service.Shared/Contracts/Events/IFileUploadRequestStatusUpdate.cs

@@ -0,0 +1,14 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IFileUploadRequestStatusUpdate
+{
+    Guid? ImportId { get; }
+    Guid RequestId { get; }
+    RequestStatus Status { get; }
+    string? FileAccessUrl { get; }
+    string? ErrorMessage { get; }
+}
+
+public record FileUploadRequestStatusUpdate(Guid? ImportId, Guid RequestId, RequestStatus Status, string? FileAccessUrl, string? ErrorMessage) : IFileUploadRequestStatusUpdate;

FictionArchive.Service.Shared/Contracts/Events/INovelCreated.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface INovelCreated
+{
+    uint NovelId { get; }
+    string Title { get; }
+    Language OriginalLanguage { get; }
+    string Source { get; }
+    string AuthorName { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/INovelImportCompleted.cs

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface INovelImportCompleted
+{
+    Guid ImportId { get; }
+    uint? NovelId { get; }
+    bool Success { get; }
+    string? ErrorMessage { get; }
+}
+
+public record NovelImportCompleted(Guid ImportId, uint? NovelId, bool Success, string? ErrorMessage) : INovelImportCompleted;

FictionArchive.Service.Shared/Contracts/Events/INovelImportRequested.cs

@@ -0,0 +1,9 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface INovelImportRequested
+{
+    Guid ImportId { get; }
+    string NovelUrl { get; }
+}
+
+public record NovelImportRequested(Guid ImportId, string NovelUrl) : INovelImportRequested;

FictionArchive.Service.Shared/Contracts/Events/INovelMetadataImported.cs

@@ -0,0 +1,10 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface INovelMetadataImported
+{
+    Guid ImportId { get; }
+    uint NovelId { get; }
+    int ChaptersPendingPull { get; }
+}
+
+public record NovelMetadataImported(Guid ImportId, uint NovelId, int ChaptersPendingPull) : INovelMetadataImported;

FictionArchive.Service.Shared/Contracts/Events/ITranslationRequestCompleted.cs

@@ -0,0 +1,7 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface ITranslationRequestCompleted
+{
+    Guid? TranslationRequestId { get; }
+    string? TranslatedText { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/ITranslationRequestCreated.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface ITranslationRequestCreated
+{
+    Guid TranslationRequestId { get; }
+    Language From { get; }
+    Language To { get; }
+    string Body { get; }
+    string TranslationEngineKey { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/IUserInvited.cs

@@ -0,0 +1,12 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IUserInvited
+{
+    string InvitedUserId { get; }
+    string InvitedUsername { get; }
+    string InvitedEmail { get; }
+    string InvitedOAuthProviderId { get; }
+    string InviterId { get; }
+    string InviterUsername { get; }
+    string InviterOAuthProviderId { get; }
+}

FictionArchive.Service.Shared/Extensions/MassTransitExtensions.cs

@@ -0,0 +1,118 @@
+using System.Text.RegularExpressions;
+using FictionArchive.Service.Shared.Services.Filters;
+using MassTransit;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FictionArchive.Service.Shared.Extensions;
+
+public static class MassTransitExtensions
+{
+    public static IServiceCollection AddFictionArchiveMassTransit(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        Action<IBusRegistrationConfigurator>? configureConsumers = null)
+    {
+        services.AddMassTransit(x =>
+        {
+            configureConsumers?.Invoke(x);
+
+            x.UsingRabbitMq((context, cfg) =>
+            {
+                var (host, username, password) = ParseRabbitMqConfiguration(configuration);
+
+                cfg.Host(host, h =>
+                {
+                    h.Username(username);
+                    h.Password(password);
+                });
+
+                cfg.UseMessageRetry(r => r.Exponential(
+                    retryLimit: 5,
+                    minInterval: TimeSpan.FromSeconds(1),
+                    maxInterval: TimeSpan.FromMinutes(1),
+                    intervalDelta: TimeSpan.FromSeconds(2)));
+
+                cfg.UseConsumeFilter(typeof(LoggingConsumeFilter<>), context);
+
+                // Process one message at a time per consumer (matches old EventBus behavior)
+                cfg.PrefetchCount = 1;
+
+                cfg.ConfigureEndpoints(context);
+            });
+        });
+
+        return services;
+    }
+
+    /// <summary>
+    /// Parses RabbitMQ configuration from either ConnectionString format or separate Host/Username/Password keys.
+    /// ConnectionString format: amqp://[username:password@]host[:port]
+    /// </summary>
+    private static (string Host, string Username, string Password) ParseRabbitMqConfiguration(IConfiguration configuration)
+    {
+        var connectionString = configuration["RabbitMQ:ConnectionString"];
+
+        if (!string.IsNullOrEmpty(connectionString))
+        {
+            return ParseConnectionString(connectionString);
+        }
+
+        // Fallback to separate configuration keys
+        var host = configuration["RabbitMQ:Host"] ?? "localhost";
+        var username = configuration["RabbitMQ:Username"] ?? "guest";
+        var password = configuration["RabbitMQ:Password"] ?? "guest";
+
+        return (host, username, password);
+    }
+
+    /// <summary>
+    /// Parses an AMQP connection string into host, username, and password components.
+    /// Supports formats:
+    /// - amqp://host
+    /// - amqp://host:port
+    /// - amqp://username:password@host
+    /// - amqp://username:password@host:port
+    /// </summary>
+    private static (string Host, string Username, string Password) ParseConnectionString(string connectionString)
+    {
+        var username = "guest";
+        var password = "guest";
+        var host = "localhost";
+
+        // Try to parse as URI first
+        if (Uri.TryCreate(connectionString, UriKind.Absolute, out var uri))
+        {
+            host = uri.Host;
+
+            if (!string.IsNullOrEmpty(uri.UserInfo))
+            {
+                var userInfoParts = uri.UserInfo.Split(':', 2);
+                username = Uri.UnescapeDataString(userInfoParts[0]);
+                if (userInfoParts.Length > 1)
+                {
+                    password = Uri.UnescapeDataString(userInfoParts[1]);
+                }
+            }
+        }
+        else
+        {
+            // Fallback regex parsing for edge cases
+            var match = Regex.Match(connectionString, @"amqp://(?:([^:]+):([^@]+)@)?([^:/]+)");
+            if (match.Success)
+            {
+                if (match.Groups[1].Success && match.Groups[2].Success)
+                {
+                    username = match.Groups[1].Value;
+                    password = match.Groups[2].Value;
+                }
+                if (match.Groups[3].Success)
+                {
+                    host = match.Groups[3].Value;
+                }
+            }
+        }
+
+        return (host, username, password);
+    }
+}

FictionArchive.Service.Shared/FictionArchive.Service.Shared.csproj

@@ -31,7 +31,7 @@
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.4" />
         <PackageReference Include="Polly" Version="8.6.5" />
-        <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
+        <PackageReference Include="MassTransit.RabbitMQ" Version="8.*" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     </ItemGroup>
     

FictionArchive.Service.Shared/Services/EventBus/EventBusBuilder.cs

@@ -1,25 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public class EventBusBuilder<TEventBus> where TEventBus : class, IEventBus
-{
-    private readonly IServiceCollection _services;
-    private readonly SubscriptionManager _subscriptionManager;
-
-    public EventBusBuilder(IServiceCollection services)
-    {
-        _services = services;
-        _services.AddSingleton<IEventBus, TEventBus>();
-        
-        _subscriptionManager = new SubscriptionManager();
-        _services.AddSingleton<SubscriptionManager>(_subscriptionManager);
-    }
-
-    public EventBusBuilder<TEventBus> Subscribe<TEvent, TEventHandler>() where TEvent : IIntegrationEvent where TEventHandler : class, IIntegrationEventHandler<TEvent>
-    {
-        _services.AddKeyedTransient<IIntegrationEventHandler, TEventHandler>(typeof(TEvent).Name);
-        _subscriptionManager.RegisterSubscription<TEvent>();
-        return this;
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/EventBusExtensions.cs

@@ -1,12 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public static class EventBusExtensions
-{
-    public static EventBusBuilder<TEventBus> AddEventBus<TEventBus>(this IServiceCollection services)
-        where TEventBus : class, IEventBus
-    {
-        return new EventBusBuilder<TEventBus>(services);
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/IEventBus.cs

@@ -1,7 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public interface IEventBus
-{
-    Task Publish<TEvent>(TEvent integrationEvent) where TEvent : IIntegrationEvent;
-    Task Publish(object integrationEvent, string eventType);
-}

FictionArchive.Service.Shared/Services/EventBus/IIntegrationEvent.cs

@@ -1,7 +0,0 @@
-using NodaTime;
-
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public interface IIntegrationEvent
-{
-}

FictionArchive.Service.Shared/Services/EventBus/IIntegrationEventHandler.cs

@@ -1,12 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public interface IIntegrationEventHandler<in TEvent> : IIntegrationEventHandler where TEvent : IIntegrationEvent
-{
-    Task Handle(TEvent @event);
-    Task IIntegrationEventHandler.Handle(IIntegrationEvent @event) => Handle((TEvent)@event);
-}
-
-public interface IIntegrationEventHandler
-{
-    Task Handle(IIntegrationEvent @event);
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQConnectionProvider.cs

@@ -1,35 +0,0 @@
-using RabbitMQ.Client;
-
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public class RabbitMQConnectionProvider
-{
-    private readonly IConnectionFactory _connectionFactory;
-
-    private IConnection Connection { get; set; }
-    private IChannel DefaultChannel { get; set; }
-
-    public RabbitMQConnectionProvider(IConnectionFactory connectionFactory)
-    {
-        _connectionFactory = connectionFactory;
-    }
-
-    public async Task<IConnection> GetConnectionAsync()
-    {
-        if (Connection == null)
-        {
-            Connection = await _connectionFactory.CreateConnectionAsync();
-        }
-
-        return Connection;
-    }
-    
-    public async Task<IChannel> GetDefaultChannelAsync()
-    {
-        if (DefaultChannel == null)
-        {
-            DefaultChannel = await (await GetConnectionAsync()).CreateChannelAsync();
-        }
-        return DefaultChannel;
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQEventBus.cs

@@ -1,137 +0,0 @@
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using NodaTime;
-using NodaTime.Serialization.JsonNet;
-using RabbitMQ.Client;
-using RabbitMQ.Client.Events;
-
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public class RabbitMQEventBus : IEventBus, IHostedService
-{
-    private readonly IServiceScopeFactory _serviceScopeFactory;
-    private readonly RabbitMQConnectionProvider _connectionProvider;
-    private readonly RabbitMQOptions _options;
-    private readonly SubscriptionManager _subscriptionManager;
-    private readonly ILogger<RabbitMQEventBus> _logger;
-    
-    private readonly JsonSerializerSettings _jsonSerializerSettings;
-
-    private const string ExchangeName = "fiction-archive-event-bus";
-    private const string CreatedAtHeader = "X-Created-At";
-    private const string EventIdHeader = "X-Event-Id";
-
-    public RabbitMQEventBus(IServiceScopeFactory serviceScopeFactory, RabbitMQConnectionProvider connectionProvider, IOptions<RabbitMQOptions> options, SubscriptionManager subscriptionManager, ILogger<RabbitMQEventBus> logger)
-    {
-        _serviceScopeFactory = serviceScopeFactory;
-        _connectionProvider = connectionProvider;
-        _subscriptionManager = subscriptionManager;
-        _logger = logger;
-        _options = options.Value;
-        _jsonSerializerSettings = new JsonSerializerSettings().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
-    }
-
-    public async Task Publish<TEvent>(TEvent integrationEvent) where TEvent : IIntegrationEvent
-    {
-        var routingKey = typeof(TEvent).Name;
-        
-        await Publish(integrationEvent, routingKey);
-    }
-
-    public async Task Publish(object integrationEvent, string eventType)
-    {
-        var channel = await _connectionProvider.GetDefaultChannelAsync();
-        var body = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(integrationEvent));
-        
-        // headers
-        var props = new BasicProperties();
-        props.Headers = new Dictionary<string, object?>()
-        {
-            { CreatedAtHeader, Instant.FromDateTimeUtc(DateTime.UtcNow).ToString() },
-            { EventIdHeader, Guid.NewGuid().ToString() }
-        };
-        
-        await channel.BasicPublishAsync(ExchangeName, eventType, true, props, body);
-        _logger.LogInformation("Published event {EventName}", eventType);
-    }
-
-    public async Task StartAsync(CancellationToken cancellationToken)
-    {
-        _ = Task.Factory.StartNew(async () =>
-        {
-            try
-            {
-                var channel = await _connectionProvider.GetDefaultChannelAsync();
-                await channel.ExchangeDeclareAsync(ExchangeName, ExchangeType.Direct,
-                    cancellationToken: cancellationToken);
-
-                await channel.BasicQosAsync(prefetchSize: 0, prefetchCount: 1, global: false, cancellationToken: cancellationToken);
-                await channel.QueueDeclareAsync(_options.ClientIdentifier, true, false, false,
-                    cancellationToken: cancellationToken);
-                var consumer = new AsyncEventingBasicConsumer(channel);
-                consumer.ReceivedAsync += (sender, @event) =>
-                {
-                    return OnReceivedEvent(sender, @event, channel);
-                };
-                
-                await channel.BasicConsumeAsync(_options.ClientIdentifier, false, consumer, cancellationToken: cancellationToken);
-                
-                foreach (var subscription in _subscriptionManager.Subscriptions)
-                {
-                    await channel.QueueBindAsync(_options.ClientIdentifier, ExchangeName, subscription.Key,
-                        cancellationToken: cancellationToken);
-                    _logger.LogInformation("Subscribed to {SubscriptionKey}", subscription.Key);
-                }
-
-                _logger.LogInformation("RabbitMQ EventBus started.");
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "An error occurred while starting the RabbitMQ EventBus");
-            }
-        }, cancellationToken);
-    }
-
-    public Task StopAsync(CancellationToken cancellationToken)
-    {
-        return Task.CompletedTask;
-    }
-    
-    private async Task OnReceivedEvent(object sender, BasicDeliverEventArgs @event, IChannel channel)
-    {
-        var eventName = @event.RoutingKey;
-        _logger.LogInformation("Received event {EventName}", eventName);
-        try
-        {
-            if (!_subscriptionManager.Subscriptions.ContainsKey(eventName))
-            {
-                _logger.LogWarning("Received event without subscription entry.");
-                return;
-            }
-            
-            var eventBody = Encoding.UTF8.GetString(@event.Body.Span);
-            var eventObject = JsonConvert.DeserializeObject(eventBody, _subscriptionManager.Subscriptions[eventName], _jsonSerializerSettings) as IIntegrationEvent;
-            
-            using var scope = _serviceScopeFactory.CreateScope();
-
-            foreach (var service in scope.ServiceProvider.GetKeyedServices<IIntegrationEventHandler>(eventName))
-            {
-                await service.Handle(eventObject);
-            }
-            _logger.LogInformation("Finished handling event with name {EventName}", eventName);
-        }
-        catch (Exception e)
-        {
-            _logger.LogError(e, "An error occurred while handling an event.");
-        }
-        finally
-        {
-            await channel.BasicAckAsync(@event.DeliveryTag, false);
-        }
-
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQExtensions.cs

@@ -1,24 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using RabbitMQ.Client;
-
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public static class RabbitMQExtensions
-{
-    public static EventBusBuilder<RabbitMQEventBus> AddRabbitMQ(this IServiceCollection services, Action<RabbitMQOptions> configure)
-    {
-        services.Configure(configure);
-        services.AddSingleton<IConnectionFactory, ConnectionFactory>(provider =>
-        {
-            var options = provider.GetService<IOptions<RabbitMQOptions>>();
-            ConnectionFactory factory = new ConnectionFactory();
-            factory.Uri = new Uri(options.Value.ConnectionString);
-            return factory;
-        });
-        services.AddSingleton<RabbitMQConnectionProvider>();
-        services.AddHostedService<RabbitMQEventBus>();
-        return services.AddEventBus<RabbitMQEventBus>();
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQOptions.cs

@@ -1,7 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public class RabbitMQOptions
-{
-    public string ConnectionString { get; set; }
-    public string ClientIdentifier { get; set; }
-}

FictionArchive.Service.Shared/Services/EventBus/SubscriptionManager.cs

@@ -1,11 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public class SubscriptionManager
-{
-    public Dictionary<string, Type> Subscriptions { get; } = new Dictionary<string, Type>();
-
-    public void RegisterSubscription<TEvent>()
-    {
-        Subscriptions.Add(typeof(TEvent).Name, typeof(TEvent));
-    }
-}

FictionArchive.Service.Shared/Services/Filters/LoggingConsumeFilter.cs

@@ -0,0 +1,33 @@
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.Shared.Services.Filters;
+
+public class LoggingConsumeFilter<T> : IFilter<ConsumeContext<T>> where T : class
+{
+    private readonly ILogger<LoggingConsumeFilter<T>> _logger;
+
+    public LoggingConsumeFilter(ILogger<LoggingConsumeFilter<T>> logger)
+    {
+        _logger = logger;
+    }
+
+    public async Task Send(ConsumeContext<T> context, IPipe<ConsumeContext<T>> next)
+    {
+        try
+        {
+            await next.Send(context);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex,
+                "Message {MessageType} failed after all retries. MessageId: {MessageId}, ConversationId: {ConversationId}",
+                typeof(T).Name,
+                context.MessageId,
+                context.ConversationId);
+            throw;
+        }
+    }
+
+    public void Probe(ProbeContext context) => context.CreateFilterScope("logging");
+}

FictionArchive.Service.TranslationService/Consumers/TranslationRequestCreatedConsumer.cs

@@ -0,0 +1,53 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.TranslationService.Contracts;
+using FictionArchive.Service.TranslationService.Models.Enums;
+using FictionArchive.Service.TranslationService.Services;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.TranslationService.Consumers;
+
+public class TranslationRequestCreatedConsumer : IConsumer<ITranslationRequestCreated>
+{
+    private readonly ILogger<TranslationRequestCreatedConsumer> _logger;
+    private readonly TranslationEngineService _translationEngineService;
+    private readonly IPublishEndpoint _publishEndpoint;
+
+    public TranslationRequestCreatedConsumer(
+        ILogger<TranslationRequestCreatedConsumer> logger,
+        TranslationEngineService translationEngineService,
+        IPublishEndpoint publishEndpoint)
+    {
+        _logger = logger;
+        _translationEngineService = translationEngineService;
+        _publishEndpoint = publishEndpoint;
+    }
+
+    public async Task Consume(ConsumeContext<ITranslationRequestCreated> context)
+    {
+        var message = context.Message;
+
+        _logger.LogInformation("Processing translation request {TranslationRequestId}", message.TranslationRequestId);
+
+        var result = await _translationEngineService.Translate(
+            message.From,
+            message.To,
+            message.Body,
+            message.TranslationEngineKey);
+
+        if (result.Status == TranslationRequestStatus.Success)
+        {
+            await _publishEndpoint.Publish<ITranslationRequestCompleted>(
+                new TranslationRequestCompleted(
+                    TranslationRequestId: message.TranslationRequestId,
+                    TranslatedText: result.TranslatedText));
+
+            _logger.LogInformation("Translation completed for request {TranslationRequestId}", message.TranslationRequestId);
+        }
+        else
+        {
+            _logger.LogError("Translation failed for request {TranslationRequestId}", message.TranslationRequestId);
+            throw new InvalidOperationException($"Translation failed for request {message.TranslationRequestId}");
+        }
+    }
+}

FictionArchive.Service.TranslationService/Contracts/TranslationRequestCompleted.cs

@@ -0,0 +1,7 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.TranslationService.Contracts;
+
+public record TranslationRequestCompleted(
+    Guid? TranslationRequestId,
+    string? TranslatedText) : ITranslationRequestCompleted;

FictionArchive.Service.TranslationService/Models/IntegrationEvents/TranslationRequestCompletedEvent.cs

@@ -1,18 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.TranslationService.Models.Enums;
-
-namespace FictionArchive.Service.TranslationService.Models.IntegrationEvents;
-
-public class TranslationRequestCompletedEvent : IIntegrationEvent
-{
-    /// <summary>
-    /// Maps this event back to a triggering request.
-    /// </summary>
-    public Guid? TranslationRequestId { get; set; }
-    
-    /// <summary>
-    /// The resulting text.
-    /// </summary>
-    public string? TranslatedText { get; set; }
-}

FictionArchive.Service.TranslationService/Models/IntegrationEvents/TranslationRequestCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.TranslationService.Models.IntegrationEvents;
-
-public class TranslationRequestCreatedEvent : IIntegrationEvent
-{
-    public Guid TranslationRequestId { get; set; }
-    public Language From { get; set; }
-    public Language To { get; set; }
-    public string Body { get; set; }
-    public string TranslationEngineKey { get; set; }
-}

FictionArchive.Service.TranslationService/Program.cs

@@ -2,16 +2,13 @@ using DeepL;
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.Shared.Services.GraphQL;
+using FictionArchive.Service.TranslationService.Consumers;
 using FictionArchive.Service.TranslationService.GraphQL;
-using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
 using FictionArchive.Service.TranslationService.Services;
 using FictionArchive.Service.TranslationService.Services.Database;
-using FictionArchive.Service.TranslationService.Services.EventHandlers;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines.DeepLTranslate;
-using RabbitMQ.Client;
 
 namespace FictionArchive.Service.TranslationService;
 
@@ -26,15 +23,16 @@ public class Program
 
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(
-            {
+                builder.Configuration,
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
+                x =>
-            })
+                {
-            .Subscribe<TranslationRequestCreatedEvent, TranslationRequestCreatedEventHandler>();
+                    x.AddConsumer<TranslationRequestCreatedConsumer>();
+                });
         }
 
         #endregion

FictionArchive.Service.TranslationService/Services/EventHandlers/TranslationRequestCreatedEventHandler.cs

@@ -1,31 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.TranslationService.Models.Enums;
-using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
-
-namespace FictionArchive.Service.TranslationService.Services.EventHandlers;
-
-public class TranslationRequestCreatedEventHandler : IIntegrationEventHandler<TranslationRequestCreatedEvent>
-{
-    private readonly ILogger<TranslationRequestCreatedEventHandler> _logger;
-    private readonly TranslationEngineService _translationEngineService;
-    private readonly IEventBus _eventBus;
-
-    public TranslationRequestCreatedEventHandler(ILogger<TranslationRequestCreatedEventHandler> logger, TranslationEngineService translationEngineService)
-    {
-        _logger = logger;
-        _translationEngineService = translationEngineService;
-    }
-
-    public async Task Handle(TranslationRequestCreatedEvent @event)
-    {
-        var result = await _translationEngineService.Translate(@event.From, @event.To, @event.Body, @event.TranslationEngineKey);
-        if (result.Status == TranslationRequestStatus.Success)
-        {
-            await _eventBus.Publish(new TranslationRequestCompletedEvent()
-            {
-                TranslatedText = result.TranslatedText,
-                TranslationRequestId = @event.TranslationRequestId,
-            });
-        }
-    }
-}

FictionArchive.Service.TranslationService/Services/TranslationEngineService.cs

@@ -1,28 +1,21 @@
-using System.Text;
 using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.TranslationService.Models;
 using FictionArchive.Service.TranslationService.Models.Database;
 using FictionArchive.Service.TranslationService.Models.Enums;
-using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
 using FictionArchive.Service.TranslationService.Services.Database;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines;
-using RabbitMQ.Client;
 
 namespace FictionArchive.Service.TranslationService.Services;
 
 public class TranslationEngineService
 {
     private readonly IEnumerable<ITranslationEngine> _translationEngines;
-    private readonly IEventBus _eventBus;
     private readonly TranslationServiceDbContext _dbContext;
 
-    public TranslationEngineService(IEnumerable<ITranslationEngine> translationEngines, TranslationServiceDbContext dbContext, IEventBus eventBus)
+    public TranslationEngineService(IEnumerable<ITranslationEngine> translationEngines, TranslationServiceDbContext dbContext)
     {
         _translationEngines = translationEngines;
         _dbContext = dbContext;
-        _eventBus = eventBus;
     }
 
     public async Task<TranslationResult> Translate(Language from, Language to, string text, string translationEngineKey)

FictionArchive.Service.TranslationService/appsettings.json

@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning"
     }
   },
   "DeepL": {

FictionArchive.Service.UserNovelDataService/Consumers/ChapterCreatedConsumer.cs

@@ -1,53 +1,56 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
+using FictionArchive.Service.UserNovelDataService.Services;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 
-namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
+namespace FictionArchive.Service.UserNovelDataService.Consumers;
 
-public class ChapterCreatedEventHandler : IIntegrationEventHandler<ChapterCreatedEvent>
+public class ChapterCreatedConsumer : IConsumer<IChapterCreated>
 {
+    private readonly ILogger<ChapterCreatedConsumer> _logger;
     private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<ChapterCreatedEventHandler> _logger;
 
-    public ChapterCreatedEventHandler(
+    public ChapterCreatedConsumer(
-        UserNovelDataServiceDbContext dbContext,
+        ILogger<ChapterCreatedConsumer> logger,
-        ILogger<ChapterCreatedEventHandler> logger)
+        UserNovelDataServiceDbContext dbContext)
     {
-        _dbContext = dbContext;
         _logger = logger;
+        _dbContext = dbContext;
     }
 
-    public async Task Handle(ChapterCreatedEvent @event)
+    public async Task Consume(ConsumeContext<IChapterCreated> context)
     {
+        var message = context.Message;
+
         // Ensure novel exists
-        var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
+        var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == message.NovelId);
         if (!novelExists)
         {
-            var novel = new Novel { Id = @event.NovelId };
+            var novel = new Novel { Id = message.NovelId };
             _dbContext.Novels.Add(novel);
         }
 
         // Ensure volume exists
-        var volumeExists = await _dbContext.Volumes.AnyAsync(v => v.Id == @event.VolumeId);
+        var volumeExists = await _dbContext.Volumes.AnyAsync(v => v.Id == message.VolumeId);
         if (!volumeExists)
         {
-            var volume = new Volume { Id = @event.VolumeId };
+            var volume = new Volume { Id = message.VolumeId, NovelId = message.NovelId };
             _dbContext.Volumes.Add(volume);
         }
 
         // Create chapter if not exists
-        var chapterExists = await _dbContext.Chapters.AnyAsync(c => c.Id == @event.ChapterId);
+        var chapterExists = await _dbContext.Chapters.AnyAsync(c => c.Id == message.ChapterId);
         if (chapterExists)
         {
-            _logger.LogDebug("Chapter {ChapterId} already exists, skipping", @event.ChapterId);
+            _logger.LogDebug("Chapter {ChapterId} already exists, skipping", message.ChapterId);
             return;
         }
 
-        var chapter = new Chapter { Id = @event.ChapterId };
+        var chapter = new Chapter { Id = message.ChapterId, VolumeId = message.VolumeId };
         _dbContext.Chapters.Add(chapter);
         await _dbContext.SaveChangesAsync();
 
-        _logger.LogInformation("Created chapter stub for {ChapterId} in novel {NovelId}", @event.ChapterId, @event.NovelId);
+        _logger.LogInformation("Created chapter stub for {ChapterId} in novel {NovelId}", message.ChapterId, message.NovelId);
     }
 }

FictionArchive.Service.UserNovelDataService/Consumers/NovelCreatedConsumer.cs

@@ -0,0 +1,39 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.UserNovelDataService.Models.Database;
+using FictionArchive.Service.UserNovelDataService.Services;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.Consumers;
+
+public class NovelCreatedConsumer : IConsumer<INovelCreated>
+{
+    private readonly ILogger<NovelCreatedConsumer> _logger;
+    private readonly UserNovelDataServiceDbContext _dbContext;
+
+    public NovelCreatedConsumer(
+        ILogger<NovelCreatedConsumer> logger,
+        UserNovelDataServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<INovelCreated> context)
+    {
+        var message = context.Message;
+
+        var exists = await _dbContext.Novels.AnyAsync(n => n.Id == message.NovelId);
+        if (exists)
+        {
+            _logger.LogDebug("Novel {NovelId} already exists, skipping", message.NovelId);
+            return;
+        }
+
+        var novel = new Novel { Id = message.NovelId };
+        _dbContext.Novels.Add(novel);
+        await _dbContext.SaveChangesAsync();
+
+        _logger.LogInformation("Created novel stub for {NovelId}", message.NovelId);
+    }
+}

FictionArchive.Service.UserNovelDataService/Consumers/UserInvitedConsumer.cs

@@ -0,0 +1,44 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.UserNovelDataService.Models.Database;
+using FictionArchive.Service.UserNovelDataService.Services;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.Consumers;
+
+public class UserInvitedConsumer : IConsumer<IUserInvited>
+{
+    private readonly ILogger<UserInvitedConsumer> _logger;
+    private readonly UserNovelDataServiceDbContext _dbContext;
+
+    public UserInvitedConsumer(
+        ILogger<UserInvitedConsumer> logger,
+        UserNovelDataServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<IUserInvited> context)
+    {
+        var message = context.Message;
+
+        var userId = Guid.Parse(message.InvitedUserId);
+        var exists = await _dbContext.Users.AnyAsync(u => u.Id == userId);
+        if (exists)
+        {
+            _logger.LogDebug("User {UserId} already exists, skipping", message.InvitedUserId);
+            return;
+        }
+
+        var user = new User
+        {
+            Id = userId,
+            OAuthProviderId = message.InvitedOAuthProviderId
+        };
+        _dbContext.Users.Add(user);
+        await _dbContext.SaveChangesAsync();
+
+        _logger.LogInformation("Created user stub for {UserId}", message.InvitedUserId);
+    }
+}

FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/ChapterCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-
-public class ChapterCreatedEvent : IIntegrationEvent
-{
-    public required uint ChapterId { get; init; }
-    public required uint NovelId { get; init; }
-    public required uint VolumeId { get; init; }
-    public required int VolumeOrder { get; init; }
-    public required uint ChapterOrder { get; init; }
-    public required string ChapterTitle { get; init; }
-}

FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/NovelCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-
-public class NovelCreatedEvent : IIntegrationEvent
-{
-    public required uint NovelId { get; init; }
-    public required string Title { get; init; }
-    public required Language OriginalLanguage { get; init; }
-    public required string Source { get; init; }
-    public required string AuthorName { get; init; }
-}

FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/UserInvitedEvent.cs

@@ -1,15 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-
-public class UserInvitedEvent : IIntegrationEvent
-{
-    public Guid InvitedUserId { get; set; }
-    public required string InvitedUsername { get; set; }
-    public required string InvitedEmail { get; set; }
-    public required string InvitedOAuthProviderId { get; set; }
-
-    public Guid InviterId { get; set; }
-    public required string InviterUsername { get; set; }
-    public required string InviterOAuthProviderId { get; set; }
-}

FictionArchive.Service.UserNovelDataService/Program.cs

@@ -1,11 +1,9 @@
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
+using FictionArchive.Service.UserNovelDataService.Consumers;
 using FictionArchive.Service.UserNovelDataService.GraphQL;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
 using FictionArchive.Service.UserNovelDataService.Services;
-using FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
 
 namespace FictionArchive.Service.UserNovelDataService;
 
@@ -22,17 +20,18 @@ public class Program
         builder.Services.AddMemoryCache();
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(
-            {
+                builder.Configuration,
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
+                x =>
-            })
+                {
-                .Subscribe<NovelCreatedEvent, NovelCreatedEventHandler>()
+                    x.AddConsumer<NovelCreatedConsumer>();
-                .Subscribe<ChapterCreatedEvent, ChapterCreatedEventHandler>()
+                    x.AddConsumer<ChapterCreatedConsumer>();
-                .Subscribe<UserInvitedEvent, UserInvitedEventHandler>();
+                    x.AddConsumer<UserInvitedConsumer>();
+                });
         }
 
         #endregion

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

@@ -1,36 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-using Microsoft.EntityFrameworkCore;
-
-namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
-
-public class NovelCreatedEventHandler : IIntegrationEventHandler<NovelCreatedEvent>
-{
-    private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<NovelCreatedEventHandler> _logger;
-
-    public NovelCreatedEventHandler(
-        UserNovelDataServiceDbContext dbContext,
-        ILogger<NovelCreatedEventHandler> logger)
-    {
-        _dbContext = dbContext;
-        _logger = logger;
-    }
-
-    public async Task Handle(NovelCreatedEvent @event)
-    {
-        var exists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
-        if (exists)
-        {
-            _logger.LogDebug("Novel {NovelId} already exists, skipping", @event.NovelId);
-            return;
-        }
-
-        var novel = new Novel { Id = @event.NovelId };
-        _dbContext.Novels.Add(novel);
-        await _dbContext.SaveChangesAsync();
-
-        _logger.LogInformation("Created novel stub for {NovelId}", @event.NovelId);
-    }
-}

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

@@ -1,40 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-using Microsoft.EntityFrameworkCore;
-
-namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
-
-public class UserInvitedEventHandler : IIntegrationEventHandler<UserInvitedEvent>
-{
-    private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<UserInvitedEventHandler> _logger;
-
-    public UserInvitedEventHandler(
-        UserNovelDataServiceDbContext dbContext,
-        ILogger<UserInvitedEventHandler> logger)
-    {
-        _dbContext = dbContext;
-        _logger = logger;
-    }
-
-    public async Task Handle(UserInvitedEvent @event)
-    {
-        var exists = await _dbContext.Users.AnyAsync(u => u.Id == @event.InvitedUserId);
-        if (exists)
-        {
-            _logger.LogDebug("User {UserId} already exists, skipping", @event.InvitedUserId);
-            return;
-        }
-
-        var user = new User
-        {
-            Id = @event.InvitedUserId,
-            OAuthProviderId = @event.InvitedOAuthProviderId
-        };
-        _dbContext.Users.Add(user);
-        await _dbContext.SaveChangesAsync();
-
-        _logger.LogInformation("Created user stub for {UserId}", @event.InvitedUserId);
-    }
-}

FictionArchive.Service.UserNovelDataService/appsettings.json

@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning"
     }
   },
   "ConnectionStrings": {

FictionArchive.Service.UserService.Tests/UserManagementServiceTests.cs

@@ -1,9 +1,9 @@
-using FictionArchive.Service.Shared.Services.EventBus;
 using FictionArchive.Service.UserService.Models.Database;
 using FictionArchive.Service.UserService.Services;
 using FictionArchive.Service.UserService.Services.AuthenticationClient;
 using FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
 using FluentAssertions;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
@@ -27,13 +27,13 @@ public class UserManagementServiceTests
     private static UserManagementService CreateService(
         UserServiceDbContext dbContext,
         IAuthenticationServiceClient authClient,
-        IEventBus? eventBus = null)
+        IPublishEndpoint? publishEndpoint = null)
     {
         return new UserManagementService(
             dbContext,
             NullLogger<UserManagementService>.Instance,
             authClient,
-            eventBus ?? Substitute.For<IEventBus>());
+            publishEndpoint ?? Substitute.For<IPublishEndpoint>());
     }
 
     private static User CreateTestUser(string username, string email, int availableInvites = 5)

FictionArchive.Service.UserService/Contracts/UserInvited.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.UserService.Contracts;
+
+public record UserInvited(
+    string InvitedUserId,
+    string InvitedUsername,
+    string InvitedEmail,
+    string InvitedOAuthProviderId,
+    string InviterId,
+    string InviterUsername,
+    string InviterOAuthProviderId) : IUserInvited;