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

Reviewed-on: #60

.gitea/workflows/build-gateway.yml

@@ -28,6 +28,9 @@ jobs:
           - name: user-service
             project: FictionArchive.Service.UserService
             subgraph: User
+          - name: usernoveldata-service
+            project: FictionArchive.Service.UserNovelDataService
+            subgraph: UserNovelData
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -110,6 +113,12 @@ jobs:
           name: user-service-subgraph
           path: subgraphs/user
 
+      - name: Download UserNovelData Service subgraph
+        uses: christopherhx/gitea-download-artifact@v4
+        with:
+          name: usernoveldata-service-subgraph
+          path: subgraphs/usernoveldata
+
       - name: Configure subgraph URLs for Docker
         run: |
           for fsp in subgraphs/*/*.fsp; do

.gitea/workflows/release.yml

@@ -27,6 +27,8 @@ jobs:
             dockerfile: FictionArchive.Service.SchedulerService/Dockerfile
           - name: authentication-service
             dockerfile: FictionArchive.Service.AuthenticationService/Dockerfile
+          - name: usernoveldata-service
+            dockerfile: FictionArchive.Service.UserNovelDataService/Dockerfile
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -140,3 +140,6 @@ appsettings.Local.json
 schema.graphql
 *.fsp
 gateway.fgp
+
+# Git worktrees
+.worktrees/

FictionArchive.API/Program.cs

@@ -25,8 +25,6 @@ public class Program
             .ConfigureFromFile("gateway.fgp")
             .CoreBuilder.ApplySaneDefaults();
         
-        builder.Services.AddOidcAuthentication(builder.Configuration);
-        
         #endregion
         
         var allowedOrigin = builder.Configuration["Cors:AllowedOrigin"] ?? "http://localhost:4321";

FictionArchive.Service.AuthenticationService/Controllers/AuthenticationWebhookController.cs

@@ -1,7 +1,6 @@
 using FictionArchive.Service.AuthenticationService.Models.Requests;
-using FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-using Microsoft.AspNetCore.Http;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FictionArchive.Service.AuthenticationService.Controllers
@@ -10,11 +9,11 @@ namespace FictionArchive.Service.AuthenticationService.Controllers
     [ApiController]
     public class AuthenticationWebhookController : ControllerBase
     {
-        private readonly IEventBus _eventBus;
+        private readonly IPublishEndpoint _publishEndpoint;
 
-        public AuthenticationWebhookController(IEventBus eventBus)
+        public AuthenticationWebhookController(IPublishEndpoint publishEndpoint)
         {
-            _eventBus = eventBus;
+            _publishEndpoint = publishEndpoint;
         }
 
         [HttpPost(nameof(UserRegistered))]
@@ -28,7 +27,7 @@ namespace FictionArchive.Service.AuthenticationService.Controllers
                 EventUserUsername = payload.EventUserUsername
             };
 
-            await _eventBus.Publish(authUserAddedEvent);
+            await _publishEndpoint.Publish(authUserAddedEvent);
 
             return Ok();
         }

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/Program.cs

@@ -1,5 +1,4 @@
-using FictionArchive.Service.Shared;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
+using FictionArchive.Service.Shared.MassTransit;
 
 namespace FictionArchive.Service.AuthenticationService;
 
@@ -16,12 +15,9 @@ public class Program
         builder.Services.AddEndpointsApiExplorer();
         builder.Services.AddSwaggerGen();
 
-        #region Event Bus
+        #region MassTransit
 
-        builder.Services.AddRabbitMQ(opt =>
-        {
-            builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-        });
+        builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
 
         #endregion
 

FictionArchive.Service.AuthenticationService/appsettings.json

@@ -6,8 +6,10 @@
     }
   },
   "RabbitMQ": {
-    "ConnectionString": "amqp://localhost",
-    "ClientIdentifier": "AuthenticationService"
+    "Host": "localhost",
+    "VirtualHost": "/",
+    "Username": "guest",
+    "Password": "guest"
   },
   "AllowedHosts": "*"
 }

FictionArchive.Service.FileService/Controllers/S3ProxyController.cs

@@ -36,7 +36,15 @@ namespace FictionArchive.Service.FileService.Controllers
                     Key = decodedPath
                 });
                 
-                return new FileStreamResult(s3Response.ResponseStream, s3Response.Headers.ContentType);
+                Response.Headers.CacheControl = "public, max-age=604800"; // 7 days
+                Response.Headers.LastModified = s3Response.LastModified?.ToString("R");
+
+                if (!string.IsNullOrEmpty(s3Response.ETag))
+                {
+                    Response.Headers.ETag = s3Response.ETag;
+                }
+
+                return File(s3Response.ResponseStream, s3Response.Headers.ContentType);
             }
             catch (AmazonS3Exception e)
             {

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

@@ -2,10 +2,9 @@ using Amazon.Runtime;
 using Amazon.S3;
 using FictionArchive.Common.Extensions;
 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 FictionArchive.Service.Shared.MassTransit;
 using Microsoft.Extensions.Options;
 
 namespace FictionArchive.Service.FileService;
@@ -24,13 +23,14 @@ public class Program
 
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
-        builder.Services.AddRabbitMQ(opt =>
-        {
-            builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-        })
-        .Subscribe<FileUploadRequestCreatedEvent, FileUploadRequestCreatedEventHandler>();
+        builder.Services.AddFictionArchiveMassTransit(
+            builder.Configuration,
+            x =>
+            {
+                x.AddConsumer<UploadFileCommandConsumer>();
+            });
 
         #endregion
         

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

@@ -2,57 +2,62 @@ 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 FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+using MassTransit;
 using Microsoft.Extensions.Options;
 
 namespace FictionArchive.Service.FileService.Services.EventHandlers;
 
-public class FileUploadRequestCreatedEventHandler : IIntegrationEventHandler<FileUploadRequestCreatedEvent>
+public class UploadFileCommandConsumer : IConsumer<UploadFileCommand>
 {
-    private readonly ILogger<FileUploadRequestCreatedEventHandler> _logger;
+    private readonly ILogger<UploadFileCommandConsumer> _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)
+    public UploadFileCommandConsumer(
+        ILogger<UploadFileCommandConsumer> logger,
+        AmazonS3Client amazonS3Client,
+        IOptions<S3Configuration> s3Configuration,
+        IOptions<ProxyConfiguration> proxyConfiguration)
     {
         _logger = logger;
         _amazonS3Client = amazonS3Client;
-        _eventBus = eventBus;
         _proxyConfiguration = proxyConfiguration.Value;
         _s3Configuration = s3Configuration.Value;
     }
 
-    public async Task Handle(FileUploadRequestCreatedEvent @event)
+    public async Task Consume(ConsumeContext<UploadFileCommand> context)
     {
+        var command = context.Message;
+
         var putObjectRequest = new PutObjectRequest();
         putObjectRequest.BucketName = _s3Configuration.Bucket;
-        putObjectRequest.Key = @event.FilePath;
+        putObjectRequest.Key = command.FilePath;
         putObjectRequest.UseChunkEncoding = false; // Needed to avoid an error with Garage
 
-        using MemoryStream memoryStream = new MemoryStream(@event.FileData);
+        using MemoryStream memoryStream = new MemoryStream(command.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()
+            await context.Publish(new FileUploadCompletedEvent
             {
-                RequestId = @event.RequestId,
+                RequestId = command.RequestId,
                 Status = RequestStatus.Failed,
                 ErrorMessage = "An error occurred while uploading file to S3."
             });
             return;
         }
 
-        await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
+        await context.Publish(new FileUploadCompletedEvent
         {
             Status = RequestStatus.Success,
-            RequestId = @event.RequestId,
-            FileAccessUrl = _proxyConfiguration.BaseUrl + "/" + @event.FilePath
+            RequestId = command.RequestId,
+            FileAccessUrl = _proxyConfiguration.BaseUrl + "/" + command.FilePath
         });
     }
 }

FictionArchive.Service.FileService/appsettings.json

@@ -9,8 +9,10 @@
     "BaseUrl": "https://localhost:7247/api"
   },
   "RabbitMQ": {
-    "ConnectionString": "amqp://localhost",
-    "ClientIdentifier": "FileService"
+    "Host": "localhost",
+    "VirtualHost": "/",
+    "Username": "guest",
+    "Password": "guest"
   },
   "S3": {
     "Url": "https://s3.orfl.xyz",

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,8 +7,9 @@ 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.MassTransit.Contracts.Commands;
 using FluentAssertions;
+using MassTransit;
 using HtmlAgilityPack;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -42,6 +42,13 @@ public class NovelUpdateServiceTests
             Images = new List<Image>()
         };
 
+        var volume = new Volume
+        {
+            Order = 1,
+            Name = LocalizationKey.CreateFromText("Main Story", Language.En),
+            Chapters = new List<Chapter> { chapter }
+        };
+
         var novel = new Novel
         {
             Url = "http://demo/novel",
@@ -52,20 +59,21 @@ public class NovelUpdateServiceTests
             Source = source,
             Name = LocalizationKey.CreateFromText("Demo Novel", Language.En),
             Description = LocalizationKey.CreateFromText("Description", Language.En),
-            Chapters = new List<Chapter> { chapter },
+            Volumes = new List<Volume> { volume },
             Tags = new List<NovelTag>()
         };
 
         dbContext.Novels.Add(novel);
         dbContext.SaveChanges();
 
-        return new NovelCreateResult(novel, chapter);
+        return new NovelCreateResult(novel, volume, chapter);
     }
 
     private static NovelUpdateService CreateService(
         NovelServiceDbContext dbContext,
         ISourceAdapter adapter,
-        IEventBus eventBus,
+        IPublishEndpoint publishEndpoint,
+        ISendEndpointProvider sendEndpointProvider,
         string pendingImageUrl = "https://pending/placeholder.jpg")
     {
         var options = Options.Create(new NovelUpdateServiceConfiguration
@@ -73,7 +81,7 @@ public class NovelUpdateServiceTests
             PendingImageUrl = pendingImageUrl
         });
 
-        return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, eventBus, options);
+        return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, publishEndpoint, sendEndpointProvider, options);
     }
 
     [Fact]
@@ -81,7 +89,7 @@ public class NovelUpdateServiceTests
     {
         using var dbContext = CreateDbContext();
         var source = new Source { Name = "Demo", Key = "demo", Url = "http://demo" };
-        var (novel, chapter) = CreateNovelWithSingleChapter(dbContext, source);
+        var (novel, volume, chapter) = CreateNovelWithSingleChapter(dbContext, source);
 
         var rawHtml = "<p>Hello</p><img src=\"http://img/x1.jpg\" alt=\"first\" /><img src=\"http://img/x2.jpg\" alt=\"second\" />";
         var image1 = new ImageData { Url = "http://img/x1.jpg", Data = new byte[] { 1, 2, 3 } };
@@ -95,15 +103,17 @@ public class NovelUpdateServiceTests
             ImageData = new List<ImageData> { image1, image2 }
         }));
 
-        var publishedEvents = new List<FileUploadRequestCreatedEvent>();
-        var eventBus = Substitute.For<IEventBus>();
-        eventBus.Publish(Arg.Do<FileUploadRequestCreatedEvent>(publishedEvents.Add)).Returns(Task.CompletedTask);
-        eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
+        var publishedCommands = new List<UploadFileCommand>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var sendEndpointProvider = Substitute.For<ISendEndpointProvider>();
+        var sendEndpoint = Substitute.For<ISendEndpoint>();
+        sendEndpointProvider.GetSendEndpoint(Arg.Any<Uri>()).Returns(Task.FromResult(sendEndpoint));
+        sendEndpoint.Send(Arg.Do<UploadFileCommand>(publishedCommands.Add), Arg.Any<CancellationToken>()).Returns(Task.CompletedTask);
 
         var pendingImageUrl = "https://pending/placeholder.jpg";
-        var service = CreateService(dbContext, adapter, eventBus, pendingImageUrl);
+        var service = CreateService(dbContext, adapter, publishEndpoint, sendEndpointProvider, pendingImageUrl);
 
-        var updatedChapter = await service.PullChapterContents(novel.Id, chapter.Order);
+        var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
 
         updatedChapter.Images.Should().HaveCount(2);
         updatedChapter.Images.Select(i => i.OriginalPath).Should().BeEquivalentTo(new[] { image1.Url, image2.Url });
@@ -120,10 +130,10 @@ public class NovelUpdateServiceTests
             .Should()
             .BeEquivalentTo(updatedChapter.Images.Select(img => img.Id.ToString()));
 
-        publishedEvents.Should().HaveCount(2);
-        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}/"));
+        publishedCommands.Should().HaveCount(2);
+        publishedCommands.Select(e => e.RequestId).Should().BeEquivalentTo(updatedChapter.Images.Select(i => i.Id));
+        publishedCommands.Select(e => e.FileData).Should().BeEquivalentTo(new[] { image1.Data, image2.Data });
+        publishedCommands.Should().OnlyContain(e => e.FilePath.StartsWith($"{novel.Id}/Images/Chapter-{updatedChapter.Id}/"));
     }
 
     [Fact]
@@ -131,7 +141,7 @@ public class NovelUpdateServiceTests
     {
         using var dbContext = CreateDbContext();
         var source = new Source { Name = "Demo", Key = "demo", Url = "http://demo" };
-        var (novel, chapter) = CreateNovelWithSingleChapter(dbContext, source);
+        var (novel, volume, chapter) = CreateNovelWithSingleChapter(dbContext, source);
 
         var rawHtml = "<p>Hi</p><img src=\"http://img/x1.jpg\">";
         var image = new ImageData { Url = "http://img/x1.jpg", Data = new byte[] { 7, 8, 9 } };
@@ -144,13 +154,14 @@ public class NovelUpdateServiceTests
             ImageData = new List<ImageData> { image }
         }));
 
-        var eventBus = Substitute.For<IEventBus>();
-        eventBus.Publish(Arg.Any<FileUploadRequestCreatedEvent>()).Returns(Task.CompletedTask);
-        eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var sendEndpointProvider = Substitute.For<ISendEndpointProvider>();
+        var sendEndpoint = Substitute.For<ISendEndpoint>();
+        sendEndpointProvider.GetSendEndpoint(Arg.Any<Uri>()).Returns(Task.FromResult(sendEndpoint));
 
-        var service = CreateService(dbContext, adapter, eventBus);
+        var service = CreateService(dbContext, adapter, publishEndpoint, sendEndpointProvider);
 
-        var updatedChapter = await service.PullChapterContents(novel.Id, chapter.Order);
+        var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
 
         var storedHtml = updatedChapter.Body.Texts.Single().Text;
         var doc = new HtmlDocument();
@@ -161,7 +172,7 @@ public class NovelUpdateServiceTests
         imgNode.GetAttributeValue("src", string.Empty).Should().Be("https://pending/placeholder.jpg");
     }
 
-    private record NovelCreateResult(Novel Novel, Chapter Chapter);
+    private record NovelCreateResult(Novel Novel, Volume Volume, Chapter Chapter);
 
     #region UpdateImage Tests
 
@@ -179,8 +190,9 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
-        var service = CreateService(dbContext, adapter, eventBus);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var sendEndpointProvider = Substitute.For<ISendEndpointProvider>();
+        var service = CreateService(dbContext, adapter, publishEndpoint, sendEndpointProvider);
 
         var newUrl = "https://cdn.example.com/uploaded/cover.jpg";
 
@@ -199,7 +211,7 @@ public class NovelUpdateServiceTests
         // Arrange
         using var dbContext = CreateDbContext();
         var source = new Source { Name = "Demo", Key = "demo", Url = "http://demo" };
-        var (novel, chapter) = CreateNovelWithSingleChapter(dbContext, source);
+        var (novel, _, chapter) = CreateNovelWithSingleChapter(dbContext, source);
 
         var image = new Image
         {
@@ -221,8 +233,9 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
-        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var sendEndpointProvider = Substitute.For<ISendEndpointProvider>();
+        var service = CreateService(dbContext, adapter, publishEndpoint, sendEndpointProvider, pendingUrl);
 
         var newUrl = "https://cdn.example.com/uploaded/image.jpg";
 
@@ -252,7 +265,7 @@ public class NovelUpdateServiceTests
         // Arrange
         using var dbContext = CreateDbContext();
         var source = new Source { Name = "Demo", Key = "demo", Url = "http://demo" };
-        var (novel, chapter) = CreateNovelWithSingleChapter(dbContext, source);
+        var (_, _, chapter) = CreateNovelWithSingleChapter(dbContext, source);
 
         var image1 = new Image { OriginalPath = "http://original/img1.jpg", Chapter = chapter };
         var image2 = new Image { OriginalPath = "http://original/img2.jpg", Chapter = chapter };
@@ -270,8 +283,9 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
-        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var sendEndpointProvider = Substitute.For<ISendEndpointProvider>();
+        var service = CreateService(dbContext, adapter, publishEndpoint, sendEndpointProvider, pendingUrl);
 
         var newUrl = "https://cdn.example.com/uploaded/img1.jpg";
 

FictionArchive.Service.NovelService/GraphQL/Mutation.cs

@@ -1,29 +1,33 @@
-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.MassTransit.Contracts.Commands;
 using HotChocolate.Authorization;
-using Microsoft.EntityFrameworkCore;
+using HotChocolate.Types;
 
 namespace FictionArchive.Service.NovelService.GraphQL;
 
 public class Mutation
 {
     [Authorize]
-    public async Task<NovelUpdateRequestedEvent> ImportNovel(string novelUrl, NovelUpdateService service)
+    public async Task<ImportNovelCommand> ImportNovel(string novelUrl, NovelUpdateService service)
     {
         return await service.QueueNovelImport(novelUrl);
     }
 
     [Authorize]
-    public async Task<ChapterPullRequestedEvent> FetchChapterContents(uint novelId,
-        uint chapterNumber,
+    public async Task<PullChapterContentCommand> FetchChapterContents(
+        uint novelId,
+        uint volumeId,
+        uint chapterOrder,
         NovelUpdateService service)
     {
-        return await service.QueueChapterPull(novelId, chapterNumber);
+        return await service.QueueChapterPull(novelId, volumeId, chapterOrder);
+    }
+
+    [Error<KeyNotFoundException>]
+    [Authorize]
+    public async Task<bool> DeleteNovel(uint novelId, NovelUpdateService service)
+    {
+        await service.DeleteNovel(novelId);
+        return true;
     }
 }

FictionArchive.Service.NovelService/GraphQL/Query.cs

@@ -77,32 +77,45 @@ public class Query
                 }
                 : null,
 
-            Chapters = novel.Chapters.Select(chapter => new ChapterDto
+            Volumes = novel.Volumes.OrderBy(v => v.Order).Select(volume => new VolumeDto
             {
-                Id = chapter.Id,
-                CreatedTime = chapter.CreatedTime,
-                LastUpdatedTime = chapter.LastUpdatedTime,
-                Revision = chapter.Revision,
-                Order = chapter.Order,
-                Url = chapter.Url,
-                Name = chapter.Name.Texts
+                Id = volume.Id,
+                CreatedTime = volume.CreatedTime,
+                LastUpdatedTime = volume.LastUpdatedTime,
+                Order = volume.Order,
+                Name = volume.Name.Texts
                     .Where(t => t.Language == preferredLanguage)
                     .Select(t => t.Text)
                     .FirstOrDefault()
-                    ?? chapter.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? volume.Name.Texts.Select(t => t.Text).FirstOrDefault()
                     ?? "",
-                Body = chapter.Body.Texts
-                    .Where(t => t.Language == preferredLanguage)
-                    .Select(t => t.Text)
-                    .FirstOrDefault()
-                    ?? chapter.Body.Texts.Select(t => t.Text).FirstOrDefault()
-                    ?? "",
-                Images = chapter.Images.Select(image => new ImageDto
+                Chapters = volume.Chapters.OrderBy(c => c.Order).Select(chapter => new ChapterDto
                 {
-                    Id = image.Id,
-                    CreatedTime = image.CreatedTime,
-                    LastUpdatedTime = image.LastUpdatedTime,
-                    NewPath = image.NewPath
+                    Id = chapter.Id,
+                    CreatedTime = chapter.CreatedTime,
+                    LastUpdatedTime = chapter.LastUpdatedTime,
+                    Revision = chapter.Revision,
+                    Order = chapter.Order,
+                    Url = chapter.Url,
+                    Name = chapter.Name.Texts
+                        .Where(t => t.Language == preferredLanguage)
+                        .Select(t => t.Text)
+                        .FirstOrDefault()
+                        ?? chapter.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                        ?? "",
+                    Body = chapter.Body.Texts
+                        .Where(t => t.Language == preferredLanguage)
+                        .Select(t => t.Text)
+                        .FirstOrDefault()
+                        ?? chapter.Body.Texts.Select(t => t.Text).FirstOrDefault()
+                        ?? "",
+                    Images = chapter.Images.Select(image => new ImageDto
+                    {
+                        Id = image.Id,
+                        CreatedTime = image.CreatedTime,
+                        LastUpdatedTime = image.LastUpdatedTime,
+                        NewPath = image.NewPath
+                    }).ToList()
                 }).ToList()
             }).ToList(),
 
@@ -140,11 +153,12 @@ public class Query
     public IQueryable<ChapterReaderDto> GetChapter(
         NovelServiceDbContext dbContext,
         uint novelId,
+        uint volumeOrder,
         uint chapterOrder,
         Language preferredLanguage = Language.En)
     {
         return dbContext.Chapters
-            .Where(c => c.Novel.Id == novelId && c.Order == chapterOrder)
+            .Where(c => c.Volume.Novel.Id == novelId && c.Volume.Order == volumeOrder && c.Order == chapterOrder)
             .Select(chapter => new ChapterReaderDto
             {
                 Id = chapter.Id,
@@ -176,24 +190,74 @@ public class Query
                     NewPath = image.NewPath
                 }).ToList(),
 
-                NovelId = chapter.Novel.Id,
-                NovelName = chapter.Novel.Name.Texts
+                NovelId = chapter.Volume.Novel.Id,
+                NovelName = chapter.Volume.Novel.Name.Texts
                     .Where(t => t.Language == preferredLanguage)
                     .Select(t => t.Text)
                     .FirstOrDefault()
-                    ?? chapter.Novel.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? chapter.Volume.Novel.Name.Texts.Select(t => t.Text).FirstOrDefault()
                     ?? "",
-                TotalChapters = chapter.Novel.Chapters.Count,
-                PrevChapterOrder = chapter.Novel.Chapters
+
+                // Volume context
+                VolumeId = chapter.Volume.Id,
+                VolumeName = chapter.Volume.Name.Texts
+                    .Where(t => t.Language == preferredLanguage)
+                    .Select(t => t.Text)
+                    .FirstOrDefault()
+                    ?? chapter.Volume.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? "",
+                VolumeOrder = chapter.Volume.Order,
+                TotalChaptersInVolume = chapter.Volume.Chapters.Count,
+
+                // Previous chapter: first try same volume, then last chapter of previous volume
+                PrevChapterVolumeOrder = chapter.Volume.Chapters
+                    .Where(c => c.Order < chapterOrder)
+                    .OrderByDescending(c => c.Order)
+                    .Select(c => (int?)chapter.Volume.Order)
+                    .FirstOrDefault()
+                    ?? chapter.Volume.Novel.Volumes
+                        .Where(v => v.Order < chapter.Volume.Order)
+                        .OrderByDescending(v => v.Order)
+                        .SelectMany(v => v.Chapters.OrderByDescending(c => c.Order).Take(1))
+                        .Select(c => (int?)c.Volume.Order)
+                        .FirstOrDefault(),
+
+                PrevChapterOrder = chapter.Volume.Chapters
                     .Where(c => c.Order < chapterOrder)
                     .OrderByDescending(c => c.Order)
                     .Select(c => (uint?)c.Order)
-                    .FirstOrDefault(),
-                NextChapterOrder = chapter.Novel.Chapters
+                    .FirstOrDefault()
+                    ?? chapter.Volume.Novel.Volumes
+                        .Where(v => v.Order < chapter.Volume.Order)
+                        .OrderByDescending(v => v.Order)
+                        .SelectMany(v => v.Chapters.OrderByDescending(c => c.Order).Take(1))
+                        .Select(c => (uint?)c.Order)
+                        .FirstOrDefault(),
+
+                // Next chapter: first try same volume, then first chapter of next volume
+                NextChapterVolumeOrder = chapter.Volume.Chapters
+                    .Where(c => c.Order > chapterOrder)
+                    .OrderBy(c => c.Order)
+                    .Select(c => (int?)chapter.Volume.Order)
+                    .FirstOrDefault()
+                    ?? chapter.Volume.Novel.Volumes
+                        .Where(v => v.Order > chapter.Volume.Order)
+                        .OrderBy(v => v.Order)
+                        .SelectMany(v => v.Chapters.OrderBy(c => c.Order).Take(1))
+                        .Select(c => (int?)c.Volume.Order)
+                        .FirstOrDefault(),
+
+                NextChapterOrder = chapter.Volume.Chapters
                     .Where(c => c.Order > chapterOrder)
                     .OrderBy(c => c.Order)
                     .Select(c => (uint?)c.Order)
                     .FirstOrDefault()
+                    ?? chapter.Volume.Novel.Volumes
+                        .Where(v => v.Order > chapter.Volume.Order)
+                        .OrderBy(v => v.Order)
+                        .SelectMany(v => v.Chapters.OrderBy(c => c.Order).Take(1))
+                        .Select(c => (uint?)c.Order)
+                        .FirstOrDefault()
             });
     }
 }

FictionArchive.Service.NovelService/Migrations/20251229203027_AddVolumes.Designer.cs

@@ -0,0 +1,605 @@
+// <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("20251229203027_AddVolumes")]
+    partial class AddVolumes
+    {
+        /// <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.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("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/20251229203027_AddVolumes.cs

@@ -0,0 +1,195 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FictionArchive.Service.NovelService.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddVolumes : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // 1. Create the Volume table
+            migrationBuilder.CreateTable(
+                name: "Volume",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    Order = table.Column<int>(type: "integer", nullable: false),
+                    NameId = table.Column<Guid>(type: "uuid", nullable: false),
+                    NovelId = table.Column<long>(type: "bigint", nullable: false),
+                    CreatedTime = table.Column<Instant>(type: "timestamp with time zone", nullable: false),
+                    LastUpdatedTime = table.Column<Instant>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Volume", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Volume_LocalizationKeys_NameId",
+                        column: x => x.NameId,
+                        principalTable: "LocalizationKeys",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Volume_Novels_NovelId",
+                        column: x => x.NovelId,
+                        principalTable: "Novels",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Volume_NameId",
+                table: "Volume",
+                column: "NameId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Volume_NovelId_Order",
+                table: "Volume",
+                columns: new[] { "NovelId", "Order" },
+                unique: true);
+
+            // 2. Add nullable VolumeId column to Chapter (keep NovelId for now)
+            migrationBuilder.AddColumn<long>(
+                name: "VolumeId",
+                table: "Chapter",
+                type: "bigint",
+                nullable: true);
+
+            // 3. Data migration: Create volumes and link chapters for each novel
+            migrationBuilder.Sql(@"
+DO $$
+DECLARE
+    novel_rec RECORD;
+    loc_key_id uuid;
+    volume_id bigint;
+BEGIN
+    FOR novel_rec IN SELECT ""Id"", ""RawLanguage"" FROM ""Novels"" LOOP
+        -- Create LocalizationKey for volume name
+        loc_key_id := gen_random_uuid();
+        INSERT INTO ""LocalizationKeys"" (""Id"", ""CreatedTime"", ""LastUpdatedTime"")
+        VALUES (loc_key_id, NOW(), NOW());
+
+        -- Create LocalizationText for 'Main Story' in novel's raw language
+        INSERT INTO ""LocalizationText"" (""Id"", ""LocalizationKeyId"", ""Language"", ""Text"", ""CreatedTime"", ""LastUpdatedTime"")
+        VALUES (gen_random_uuid(), loc_key_id, novel_rec.""RawLanguage"", 'Main Story', NOW(), NOW());
+
+        -- Create Volume for this novel
+        INSERT INTO ""Volume"" (""Order"", ""NameId"", ""NovelId"", ""CreatedTime"", ""LastUpdatedTime"")
+        VALUES (1, loc_key_id, novel_rec.""Id"", NOW(), NOW())
+        RETURNING ""Id"" INTO volume_id;
+
+        -- Link all chapters of this novel to the new volume
+        UPDATE ""Chapter"" SET ""VolumeId"" = volume_id WHERE ""NovelId"" = novel_rec.""Id"";
+    END LOOP;
+END $$;
+            ");
+
+            // 4. Drop old FK and index for NovelId
+            migrationBuilder.DropForeignKey(
+                name: "FK_Chapter_Novels_NovelId",
+                table: "Chapter");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Chapter_NovelId",
+                table: "Chapter");
+
+            // 5. Drop NovelId column from Chapter
+            migrationBuilder.DropColumn(
+                name: "NovelId",
+                table: "Chapter");
+
+            // 6. Make VolumeId non-nullable
+            migrationBuilder.AlterColumn<long>(
+                name: "VolumeId",
+                table: "Chapter",
+                type: "bigint",
+                nullable: false,
+                oldClrType: typeof(long),
+                oldType: "bigint",
+                oldNullable: true);
+
+            // 7. Add unique index and FK for VolumeId
+            migrationBuilder.CreateIndex(
+                name: "IX_Chapter_VolumeId_Order",
+                table: "Chapter",
+                columns: new[] { "VolumeId", "Order" },
+                unique: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Chapter_Volume_VolumeId",
+                table: "Chapter",
+                column: "VolumeId",
+                principalTable: "Volume",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // Add back NovelId column
+            migrationBuilder.AddColumn<long>(
+                name: "NovelId",
+                table: "Chapter",
+                type: "bigint",
+                nullable: true);
+
+            // Migrate data back: set NovelId from Volume
+            migrationBuilder.Sql(@"
+UPDATE ""Chapter"" c
+SET ""NovelId"" = v.""NovelId""
+FROM ""Volume"" v
+WHERE c.""VolumeId"" = v.""Id"";
+            ");
+
+            // Make NovelId non-nullable
+            migrationBuilder.AlterColumn<long>(
+                name: "NovelId",
+                table: "Chapter",
+                type: "bigint",
+                nullable: false,
+                oldClrType: typeof(long),
+                oldType: "bigint",
+                oldNullable: true);
+
+            // Drop VolumeId FK and index
+            migrationBuilder.DropForeignKey(
+                name: "FK_Chapter_Volume_VolumeId",
+                table: "Chapter");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Chapter_VolumeId_Order",
+                table: "Chapter");
+
+            // Drop VolumeId column
+            migrationBuilder.DropColumn(
+                name: "VolumeId",
+                table: "Chapter");
+
+            // Recreate NovelId index and FK
+            migrationBuilder.CreateIndex(
+                name: "IX_Chapter_NovelId",
+                table: "Chapter",
+                column: "NovelId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Chapter_Novels_NovelId",
+                table: "Chapter",
+                column: "NovelId",
+                principalTable: "Novels",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            // Note: Volume LocalizationKeys are not cleaned up in Down migration
+            // as they may have been modified. Manual cleanup may be needed.
+            migrationBuilder.DropTable(
+                name: "Volume");
+        }
+    }
+}

FictionArchive.Service.NovelService/Migrations/NovelServiceDbContextModelSnapshot.cs

@@ -153,9 +153,6 @@ namespace FictionArchive.Service.NovelService.Migrations
                     b.Property<Guid>("NameId")
                         .HasColumnType("uuid");
 
-                    b.Property<long>("NovelId")
-                        .HasColumnType("bigint");
-
                     b.Property<long>("Order")
                         .HasColumnType("bigint");
 
@@ -165,13 +162,17 @@ namespace FictionArchive.Service.NovelService.Migrations
                     b.Property<string>("Url")
                         .HasColumnType("text");
 
+                    b.Property<long>("VolumeId")
+                        .HasColumnType("bigint");
+
                     b.HasKey("Id");
 
                     b.HasIndex("BodyId");
 
                     b.HasIndex("NameId");
 
-                    b.HasIndex("NovelId");
+                    b.HasIndex("VolumeId", "Order")
+                        .IsUnique();
 
                     b.ToTable("Chapter");
                 });
@@ -357,6 +358,39 @@ namespace FictionArchive.Service.NovelService.Migrations
                     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("NovelNovelTag", b =>
                 {
                     b.Property<long>("NovelsId")
@@ -427,9 +461,9 @@ namespace FictionArchive.Service.NovelService.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Novel", "Novel")
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Volume", "Volume")
                         .WithMany("Chapters")
-                        .HasForeignKey("NovelId")
+                        .HasForeignKey("VolumeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
@@ -437,7 +471,7 @@ namespace FictionArchive.Service.NovelService.Migrations
 
                     b.Navigation("Name");
 
-                    b.Navigation("Novel");
+                    b.Navigation("Volume");
                 });
 
             modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Novel", b =>
@@ -509,6 +543,25 @@ namespace FictionArchive.Service.NovelService.Migrations
                     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)
@@ -535,6 +588,11 @@ namespace FictionArchive.Service.NovelService.Migrations
                 });
 
             modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Novel", b =>
+                {
+                    b.Navigation("Volumes");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Volume", b =>
                 {
                     b.Navigation("Chapters");
                 });

FictionArchive.Service.NovelService/Models/DTOs/ChapterReaderDto.cs

@@ -12,7 +12,16 @@ public class ChapterReaderDto : BaseDto<uint>
     // Navigation context
     public uint NovelId { get; init; }
     public required string NovelName { get; init; }
-    public int TotalChapters { get; init; }
+
+    // Volume context
+    public uint VolumeId { get; init; }
+    public required string VolumeName { get; init; }
+    public int VolumeOrder { get; init; }
+    public int TotalChaptersInVolume { get; init; }
+
+    // Cross-volume navigation (VolumeOrder + ChapterOrder identify a chapter)
+    public int? PrevChapterVolumeOrder { get; init; }
     public uint? PrevChapterOrder { get; init; }
+    public int? NextChapterVolumeOrder { get; init; }
     public uint? NextChapterOrder { get; init; }
 }

FictionArchive.Service.NovelService/Models/DTOs/NovelDto.cs

@@ -14,7 +14,7 @@ public class NovelDto : BaseDto<uint>
     public required string ExternalId { get; init; }
     public required string Name { get; init; }
     public required string Description { get; init; }
-    public required List<ChapterDto> Chapters { get; init; }
+    public required List<VolumeDto> Volumes { get; init; }
     public required List<NovelTagDto> Tags { get; init; }
     public ImageDto? CoverImage { get; init; }
 }

FictionArchive.Service.NovelService/Models/DTOs/VolumeDto.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class VolumeDto : BaseDto<uint>
+{
+    public int Order { get; init; }
+    public required string Name { get; init; }
+    public required List<ChapterDto> Chapters { get; init; }
+}

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

@@ -1,9 +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 ChapterNumber { 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/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/Models/Novels/Chapter.cs

@@ -20,7 +20,7 @@ public class Chapter : BaseEntity<uint>
     
     #region Navigation Properties
 
-    public Novel Novel { get; set; }
+    public Volume Volume { get; set; }
 
     #endregion
 }

FictionArchive.Service.NovelService/Models/Novels/Novel.cs

@@ -21,7 +21,7 @@ public class Novel : BaseEntity<uint>
     public LocalizationKey Name { get; set; }
     public LocalizationKey Description { get; set; }
     
-    public List<Chapter> Chapters { get; set; }
+    public List<Volume> Volumes { get; set; }
     public List<NovelTag> Tags { get; set; }
     public Image? CoverImage { get; set; }
 }

FictionArchive.Service.NovelService/Models/Novels/Volume.cs

@@ -0,0 +1,24 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using FictionArchive.Service.NovelService.Models.Localization;
+using FictionArchive.Service.Shared.Models;
+
+namespace FictionArchive.Service.NovelService.Models.Novels;
+
+[Table("Volume")]
+public class Volume : BaseEntity<uint>
+{
+    /// <summary>
+    /// Signed int to allow special ordering like -1 for "Author Notes" at top.
+    /// </summary>
+    public int Order { get; set; }
+
+    public LocalizationKey Name { get; set; }
+
+    public List<Chapter> Chapters { get; set; }
+
+    #region Navigation Properties
+
+    public Novel Novel { get; set; }
+
+    #endregion
+}

FictionArchive.Service.NovelService/Models/SourceAdapters/NovelMetadata.cs

@@ -16,7 +16,7 @@ public class NovelMetadata
     public Language RawLanguage { get; set; }
     public NovelStatus RawStatus { get; set; }
     
-    public List<ChapterMetadata> Chapters { get; set; }
+    public List<VolumeMetadata> Volumes { get; set; }
     public List<string> SourceTags { get; set; }
     public List<string> SystemTags { get; set; }
     public SourceDescriptor SourceDescriptor { get; set; }

FictionArchive.Service.NovelService/Models/SourceAdapters/VolumeMetadata.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.NovelService.Models.SourceAdapters;
+
+public class VolumeMetadata
+{
+    public int Order { get; set; }
+    public string Name { get; set; }
+    public List<ChapterMetadata> Chapters { get; set; }
+}

FictionArchive.Service.NovelService/Program.cs

@@ -1,14 +1,13 @@
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.NovelService.GraphQL;
 using FictionArchive.Service.NovelService.Models.Configuration;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
 using FictionArchive.Service.NovelService.Services;
-using FictionArchive.Service.NovelService.Services.EventHandlers;
+using FictionArchive.Service.NovelService.Services.Consumers;
 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.MassTransit;
 using FictionArchive.Service.Shared.Services.GraphQL;
 using Microsoft.EntityFrameworkCore;
 
@@ -25,18 +24,19 @@ public class Program
         
         builder.Services.AddMemoryCache();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
-            {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            })
-                .Subscribe<TranslationRequestCompletedEvent, TranslationRequestCompletedEventHandler>()
-                .Subscribe<NovelUpdateRequestedEvent, NovelUpdateRequestedEventHandler>()
-                .Subscribe<ChapterPullRequestedEvent, ChapterPullRequestedEventHandler>()
-                .Subscribe<FileUploadRequestStatusUpdateEvent, FileUploadRequestStatusUpdateEventHandler>();
+            builder.Services.AddFictionArchiveMassTransit<NovelServiceDbContext>(
+                builder.Configuration,
+                cfg =>
+                {
+                    cfg.AddConsumer<ImportNovelCommandConsumer>();
+                    cfg.AddConsumer<PullChapterContentCommandConsumer>();
+                    cfg.AddConsumer<TranslationCompletedEventConsumer>();
+                    cfg.AddConsumer<FileUploadCompletedEventConsumer>();
+                });
         }
 
         #endregion
@@ -44,7 +44,6 @@ public class Program
         #region GraphQL
 
         builder.Services.AddDefaultGraphQl<Query, Mutation>()
-            .ModifyCostOptions(opt => opt.MaxFieldCost = 5000)
             .AddAuthorization();
         
         #endregion
@@ -63,12 +62,14 @@ public class Program
         builder.Services.AddHttpClient<NovelpiaAuthMessageHandler>(client =>
         {
             client.BaseAddress = new Uri("https://novelpia.com");
-        });
+        })
+        .AddStandardResilienceHandler();
         builder.Services.AddHttpClient<ISourceAdapter, NovelpiaAdapter>(client =>
             {
                 client.BaseAddress = new Uri("https://novelpia.com");
             })
-            .AddHttpMessageHandler<NovelpiaAuthMessageHandler>();
+            .AddHttpMessageHandler<NovelpiaAuthMessageHandler>()
+            .AddStandardResilienceHandler();
 
         builder.Services.Configure<NovelUpdateServiceConfiguration>(builder.Configuration.GetSection("UpdateService"));
         builder.Services.AddTransient<NovelUpdateService>();

FictionArchive.Service.NovelService/Services/Consumers/FileUploadCompletedEventConsumer.cs

@@ -0,0 +1,53 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+using MassTransit;
+
+namespace FictionArchive.Service.NovelService.Services.Consumers;
+
+public class FileUploadCompletedEventConsumer : IConsumer<FileUploadCompletedEvent>
+{
+    private readonly ILogger<FileUploadCompletedEventConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public FileUploadCompletedEventConsumer(
+        ILogger<FileUploadCompletedEventConsumer> logger,
+        NovelServiceDbContext dbContext,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<FileUploadCompletedEvent> context)
+    {
+        var @event = context.Message;
+
+        var image = await _dbContext.Images.FindAsync(@event.RequestId);
+        if (image == null)
+        {
+            // Not a request we care about.
+            _logger.LogDebug(
+                "FileUploadCompletedEvent received for unknown image: {RequestId}",
+                @event.RequestId);
+            return;
+        }
+
+        if (@event.Status == RequestStatus.Failed)
+        {
+            _logger.LogError(
+                "Image upload failed for image with id {ImageId}: {ErrorMessage}",
+                image.Id, @event.ErrorMessage);
+            return;
+        }
+
+        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/Consumers/ImportNovelCommandConsumer.cs

@@ -0,0 +1,26 @@
+using FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+using MassTransit;
+
+namespace FictionArchive.Service.NovelService.Services.Consumers;
+
+public class ImportNovelCommandConsumer : IConsumer<ImportNovelCommand>
+{
+    private readonly ILogger<ImportNovelCommandConsumer> _logger;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public ImportNovelCommandConsumer(
+        ILogger<ImportNovelCommandConsumer> logger,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<ImportNovelCommand> context)
+    {
+        var command = context.Message;
+        _logger.LogInformation("Processing ImportNovelCommand for URL: {NovelUrl}", command.NovelUrl);
+
+        await _novelUpdateService.ImportNovel(command.NovelUrl);
+    }
+}

FictionArchive.Service.NovelService/Services/Consumers/PullChapterContentCommandConsumer.cs

@@ -0,0 +1,28 @@
+using FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+using MassTransit;
+
+namespace FictionArchive.Service.NovelService.Services.Consumers;
+
+public class PullChapterContentCommandConsumer : IConsumer<PullChapterContentCommand>
+{
+    private readonly ILogger<PullChapterContentCommandConsumer> _logger;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public PullChapterContentCommandConsumer(
+        ILogger<PullChapterContentCommandConsumer> logger,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<PullChapterContentCommand> context)
+    {
+        var command = context.Message;
+        _logger.LogInformation(
+            "Processing PullChapterContentCommand for Novel: {NovelId}, Volume: {VolumeId}, Chapter: {ChapterOrder}",
+            command.NovelId, command.VolumeId, command.ChapterOrder);
+
+        await _novelUpdateService.PullChapterContents(command.NovelId, command.VolumeId, command.ChapterOrder);
+    }
+}

FictionArchive.Service.NovelService/Services/Consumers/TranslationCompletedEventConsumer.cs

@@ -0,0 +1,52 @@
+using FictionArchive.Service.NovelService.Models.Localization;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.NovelService.Services.Consumers;
+
+public class TranslationCompletedEventConsumer : IConsumer<TranslationCompletedEvent>
+{
+    private readonly ILogger<TranslationCompletedEventConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+
+    public TranslationCompletedEventConsumer(
+        ILogger<TranslationCompletedEventConsumer> logger,
+        NovelServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<TranslationCompletedEvent> context)
+    {
+        var @event = context.Message;
+
+        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
+            _logger.LogDebug(
+                "TranslationCompletedEvent received for unknown request: {RequestId}",
+                @event.TranslationRequestId);
+            return;
+        }
+
+        localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText()
+        {
+            Language = localizationRequest.TranslateTo,
+            Text = @event.TranslatedText,
+            TranslationEngine = localizationRequest.Engine
+        });
+        _dbContext.LocalizationRequests.Remove(localizationRequest);
+        await _dbContext.SaveChangesAsync();
+
+        _logger.LogInformation(
+            "Completed translation for request: {RequestId}",
+            @event.TranslationRequestId);
+    }
+}

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.ChapterNumber);
-    }
-}

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

@@ -10,6 +10,7 @@ public class NovelServiceDbContext(DbContextOptions options, ILogger<NovelServic
     : FictionArchiveDbContext(options, logger)
 {
     public DbSet<Novel> Novels { get; set; }
+    public DbSet<Volume> Volumes { get; set; }
     public DbSet<Chapter> Chapters { get; set; }
     public DbSet<Source> Sources { get; set; }
     public DbSet<TranslationEngine> TranslationEngines { get; set; }
@@ -25,5 +26,15 @@ public class NovelServiceDbContext(DbContextOptions options, ILogger<NovelServic
         modelBuilder.Entity<Novel>()
             .HasIndex("ExternalId", "SourceId")
             .IsUnique();
+
+        // Volume.Order is unique per Novel
+        modelBuilder.Entity<Volume>()
+            .HasIndex("NovelId", "Order")
+            .IsUnique();
+
+        // Chapter.Order is unique per Volume
+        modelBuilder.Entity<Chapter>()
+            .HasIndex("VolumeId", "Order")
+            .IsUnique();
     }
 }

FictionArchive.Service.NovelService/Services/NovelUpdateService.cs

@@ -1,15 +1,15 @@
 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;
-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.MassTransit.Contracts.Commands;
+using FictionArchive.Service.Shared.MassTransit.Contracts.Events;
 using HtmlAgilityPack;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
@@ -20,15 +20,23 @@ 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 ISendEndpointProvider _sendEndpointProvider;
     private readonly NovelUpdateServiceConfiguration _novelUpdateServiceConfiguration;
 
-    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,
+        ISendEndpointProvider sendEndpointProvider,
+        IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration)
     {
         _dbContext = dbContext;
         _logger = logger;
         _sourceAdapters = sourceAdapters;
-        _eventBus = eventBus;
+        _publishEndpoint = publishEndpoint;
+        _sendEndpointProvider = sendEndpointProvider;
         _novelUpdateServiceConfiguration = novelUpdateServiceConfiguration.Value;
     }
 
@@ -190,6 +198,48 @@ public class NovelUpdateService
         return existingChapters.Concat(newChapters).ToList();
     }
 
+    private static List<Volume> SynchronizeVolumes(
+        List<VolumeMetadata> metadataVolumes,
+        Language rawLanguage,
+        List<Volume>? existingVolumes)
+    {
+        existingVolumes ??= new List<Volume>();
+        var result = new List<Volume>();
+
+        foreach (var metaVolume in metadataVolumes)
+        {
+            // Match volumes by Order (unique per novel)
+            var existingVolume = existingVolumes.FirstOrDefault(v => v.Order == metaVolume.Order);
+
+            if (existingVolume != null)
+            {
+                // Volume exists - sync its chapters
+                existingVolume.Chapters = SynchronizeChapters(
+                    metaVolume.Chapters,
+                    rawLanguage,
+                    existingVolume.Chapters);
+                result.Add(existingVolume);
+            }
+            else
+            {
+                // New volume - create it with synced chapters
+                var newVolume = new Volume
+                {
+                    Order = metaVolume.Order,
+                    Name = LocalizationKey.CreateFromText(metaVolume.Name, rawLanguage),
+                    Chapters = SynchronizeChapters(metaVolume.Chapters, rawLanguage, null)
+                };
+                result.Add(newVolume);
+            }
+        }
+
+        // Keep existing volumes not in metadata (user-created volumes)
+        var metaOrders = metadataVolumes.Select(v => v.Order).ToHashSet();
+        result.AddRange(existingVolumes.Where(v => !metaOrders.Contains(v.Order)));
+
+        return result;
+    }
+
     private static (Image? image, bool shouldPublishEvent) HandleCoverImage(
         ImageData? newCoverData,
         Image? existingCoverImage)
@@ -232,7 +282,7 @@ public class NovelUpdateService
             metadata.SystemTags,
             metadata.RawLanguage);
 
-        var chapters = SynchronizeChapters(metadata.Chapters, metadata.RawLanguage, null);
+        var volumes = SynchronizeVolumes(metadata.Volumes, metadata.RawLanguage, null);
 
         var novel = new Novel
         {
@@ -243,7 +293,7 @@ public class NovelUpdateService
             CoverImage = metadata.CoverImage != null
                 ? new Image { OriginalPath = metadata.CoverImage.Url }
                 : null,
-            Chapters = chapters,
+            Volumes = volumes,
             Description = LocalizationKey.CreateFromText(metadata.Description, metadata.RawLanguage),
             Name = LocalizationKey.CreateFromText(metadata.Name, metadata.RawLanguage),
             RawStatus = metadata.RawStatus,
@@ -281,15 +331,18 @@ public class NovelUpdateService
         // Step 3: Check for existing novel by ExternalId + Source.Key
         var existingNovel = await _dbContext.Novels
             .Include(n => n.Author)
-                .ThenInclude(a => a.Name)
-                .ThenInclude(lk => lk.Texts)
+            .ThenInclude(a => a.Name)
+            .ThenInclude(lk => lk.Texts)
             .Include(n => n.Source)
             .Include(n => n.Name)
-                .ThenInclude(lk => lk.Texts)
+            .ThenInclude(lk => lk.Texts)
             .Include(n => n.Description)
-                .ThenInclude(lk => lk.Texts)
+            .ThenInclude(lk => lk.Texts)
             .Include(n => n.Tags)
-            .Include(n => n.Chapters)
+            .Include(n => n.Volumes)
+            .ThenInclude(volume => volume.Chapters)
+            .ThenInclude(chapter => chapter.Body)
+            .ThenInclude(localizationKey => localizationKey.Texts)
             .Include(n => n.CoverImage)
             .FirstOrDefaultAsync(n =>
                 n.ExternalId == metadata.ExternalId &&
@@ -298,6 +351,12 @@ public class NovelUpdateService
         Novel novel;
         bool shouldPublishCoverEvent;
 
+        // Capture existing chapter IDs to detect new chapters later
+        var existingChapterIds = existingNovel?.Volumes
+            .SelectMany(v => v.Chapters)
+            .Select(c => c.Id)
+            .ToHashSet() ?? new HashSet<uint>();
+
         if (existingNovel == null)
         {
             // CREATE PATH: New novel
@@ -325,11 +384,11 @@ public class NovelUpdateService
                 metadata.SystemTags,
                 metadata.RawLanguage);
 
-            // Synchronize chapters (add only)
-            novel.Chapters = SynchronizeChapters(
-                metadata.Chapters,
+            // Synchronize volumes (and their chapters)
+            novel.Volumes = SynchronizeVolumes(
+                metadata.Volumes,
                 metadata.RawLanguage,
-                existingNovel.Chapters);
+                existingNovel.Volumes);
 
             // Handle cover image
             (novel.CoverImage, shouldPublishCoverEvent) = HandleCoverImage(
@@ -339,10 +398,41 @@ public class NovelUpdateService
 
         await _dbContext.SaveChangesAsync();
 
-        // Publish cover image event if needed
+        // Publish novel created event for new novels
+        if (existingNovel == null)
+        {
+            await _publishEndpoint.Publish(new NovelCreatedEvent
+            {
+                NovelId = novel.Id,
+                Title = novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
+                OriginalLanguage = novel.RawLanguage,
+                Source = novel.Source.Key,
+                AuthorName = novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
+            });
+        }
+
+        // Publish chapter created events for new chapters
+        foreach (var volume in novel.Volumes)
+        {
+            foreach (var chapter in volume.Chapters.Where(c => !existingChapterIds.Contains(c.Id)))
+            {
+                await _publishEndpoint.Publish(new ChapterCreatedEvent
+                {
+                    ChapterId = chapter.Id,
+                    NovelId = novel.Id,
+                    VolumeId = volume.Id,
+                    VolumeOrder = volume.Order,
+                    ChapterOrder = chapter.Order,
+                    ChapterTitle = chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
+                });
+            }
+        }
+
+        // Send cover image upload command if needed
         if (shouldPublishCoverEvent && novel.CoverImage != null && metadata.CoverImage != null)
         {
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent
+            var uploadEndpoint = await _sendEndpointProvider.GetSendEndpoint(new Uri("queue:upload-file-command"));
+            await uploadEndpoint.Send(new UploadFileCommand
             {
                 RequestId = novel.CoverImage.Id,
                 FileData = metadata.CoverImage.Data,
@@ -350,40 +440,61 @@ public class NovelUpdateService
             });
         }
 
-        // Publish chapter pull events for chapters without body content
-        var chaptersNeedingPull = novel.Chapters
-            .Where(c => c.Body?.Texts == null || !c.Body.Texts.Any())
-            .ToList();
-
-        foreach (var chapter in chaptersNeedingPull)
+        // Send chapter pull commands for chapters without body content
+        var pullChapterEndpoint = await _sendEndpointProvider.GetSendEndpoint(new Uri("queue:pull-chapter-content-command"));
+        foreach (var volume in novel.Volumes)
         {
-            await _eventBus.Publish(new ChapterPullRequestedEvent
+            var chaptersNeedingPull = volume.Chapters
+                .Where(c => c.Body?.Texts == null || !c.Body.Texts.Any())
+                .ToList();
+
+            foreach (var chapter in chaptersNeedingPull)
             {
-                NovelId = novel.Id,
-                ChapterNumber = chapter.Order
-            });
+                await pullChapterEndpoint.Send(new PullChapterContentCommand
+                {
+                    NovelId = novel.Id,
+                    VolumeId = volume.Id,
+                    ChapterOrder = chapter.Order
+                });
+            }
         }
 
         return novel;
     }
 
-    public async Task<Chapter> PullChapterContents(uint novelId, uint chapterNumber)
+    public async Task<Chapter> PullChapterContents(uint novelId, uint volumeId, uint chapterOrder)
     {
         var novel = await _dbContext.Novels.Where(novel => novel.Id == novelId)
-            .Include(novel => novel.Chapters)
+            .Include(novel => novel.Volumes)
+            .ThenInclude(volume => volume.Chapters)
             .ThenInclude(chapter => chapter.Body)
             .ThenInclude(body => body.Texts)
-            .Include(novel => novel.Source).Include(novel => novel.Chapters).ThenInclude(chapter => chapter.Images)
+            .Include(novel => novel.Source)
+            .Include(novel => novel.Volumes)
+            .ThenInclude(volume => volume.Chapters)
+            .ThenInclude(chapter => chapter.Images)
             .FirstOrDefaultAsync();
-        var chapter = novel.Chapters.Where(chapter => chapter.Order == chapterNumber).FirstOrDefault();
+        var volume = novel.Volumes.FirstOrDefault(v => v.Id == volumeId);
+        var chapter = volume.Chapters.FirstOrDefault(c => c.Order == chapterOrder);
         var adapter = _sourceAdapters.FirstOrDefault(adapter => adapter.SourceDescriptor.Key == novel.Source.Key);
         var rawChapter = await adapter.GetRawChapter(chapter.Url);
-        var localizationText = new LocalizationText()
+        
+        // If we already have the raw for this, overwrite it for now. Revisions will come later.
+        var localizationText = chapter.Body.Texts.FirstOrDefault(text => text.Language == novel.RawLanguage);
+        if (localizationText == null)
         {
-            Text = rawChapter.Text,
-            Language = novel.RawLanguage
-        };
-        chapter.Body.Texts.Add(localizationText);
+            localizationText = new LocalizationText()
+            {
+                Text = rawChapter.Text,
+                Language = novel.RawLanguage
+            };
+            chapter.Body.Texts.Add(localizationText);
+        }
+        else
+        {
+            localizationText.Text = rawChapter.Text;
+        }
+        
         chapter.Images = rawChapter.ImageData.Select(img => new Image()
         {
             OriginalPath = img.Url
@@ -412,12 +523,13 @@ public class NovelUpdateService
         localizationText.Text = chapterDoc.DocumentNode.OuterHtml;
         await _dbContext.SaveChangesAsync();
         
-        // Body was updated, raise image request
+        // Body was updated, send upload commands for images
+        var uploadEndpoint = await _sendEndpointProvider.GetSendEndpoint(new Uri("queue:upload-file-command"));
         int imgCount = 0;
         foreach (var image in chapter.Images)
         {
             var data = rawChapter.ImageData.FirstOrDefault(img => img.Url == image.OriginalPath);
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent()
+            await uploadEndpoint.Send(new UploadFileCommand
             {
                 FileData = data.Data,
                 FilePath = $"{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
@@ -456,24 +568,84 @@ public class NovelUpdateService
         await _dbContext.SaveChangesAsync();
     }
 
-    public async Task<NovelUpdateRequestedEvent> QueueNovelImport(string novelUrl)
+    public async Task<ImportNovelCommand> QueueNovelImport(string novelUrl)
     {
-        var importNovelRequestEvent = new NovelUpdateRequestedEvent()
+        var command = new ImportNovelCommand
         {
             NovelUrl = novelUrl
         };
-        await _eventBus.Publish(importNovelRequestEvent);
-        return importNovelRequestEvent;
+        var endpoint = await _sendEndpointProvider.GetSendEndpoint(new Uri("queue:import-novel-command"));
+        await endpoint.Send(command);
+        return command;
     }
 
-    public async Task<ChapterPullRequestedEvent> QueueChapterPull(uint novelId, uint chapterNumber)
+    public async Task<PullChapterContentCommand> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
     {
-        var chapterPullEvent = new ChapterPullRequestedEvent()
+        var command = new PullChapterContentCommand
         {
             NovelId = novelId,
-            ChapterNumber = chapterNumber
+            VolumeId = volumeId,
+            ChapterOrder = chapterOrder
         };
-        await _eventBus.Publish(chapterPullEvent);
-        return chapterPullEvent;
+        var endpoint = await _sendEndpointProvider.GetSendEndpoint(new Uri("queue:pull-chapter-content-command"));
+        await endpoint.Send(command);
+        return command;
+    }
+
+    public async Task DeleteNovel(uint novelId)
+    {
+        var novel = await _dbContext.Novels
+            .Include(n => n.CoverImage)
+            .Include(n => n.Name).ThenInclude(k => k.Texts)
+            .Include(n => n.Description).ThenInclude(k => k.Texts)
+            .Include(n => n.Volumes).ThenInclude(v => v.Name).ThenInclude(k => k.Texts)
+            .Include(n => n.Volumes).ThenInclude(v => v.Chapters).ThenInclude(c => c.Images)
+            .Include(n => n.Volumes).ThenInclude(v => v.Chapters).ThenInclude(c => c.Name).ThenInclude(k => k.Texts)
+            .Include(n => n.Volumes).ThenInclude(v => v.Chapters).ThenInclude(c => c.Body).ThenInclude(k => k.Texts)
+            .FirstOrDefaultAsync(n => n.Id == novelId);
+
+        if (novel == null)
+            throw new KeyNotFoundException($"Novel with ID '{novelId}' not found");
+
+        // Collect all LocalizationKey IDs for cleanup
+        var locKeyIds = new List<Guid> { novel.Name.Id, novel.Description.Id };
+        foreach (var volume in novel.Volumes)
+        {
+            locKeyIds.Add(volume.Name.Id);
+            locKeyIds.AddRange(volume.Chapters.Select(c => c.Name.Id));
+            locKeyIds.AddRange(volume.Chapters.Select(c => c.Body.Id));
+        }
+
+        // 1. Remove LocalizationRequests referencing these keys
+        var locRequests = await _dbContext.LocalizationRequests
+            .Where(r => locKeyIds.Contains(r.KeyRequestedForTranslation.Id))
+            .ToListAsync();
+        _dbContext.LocalizationRequests.RemoveRange(locRequests);
+
+        // 2. Remove LocalizationTexts (NO ACTION FK - won't cascade)
+        _dbContext.RemoveRange(novel.Name.Texts);
+        _dbContext.RemoveRange(novel.Description.Texts);
+        foreach (var volume in novel.Volumes)
+        {
+            _dbContext.RemoveRange(volume.Name.Texts);
+            foreach (var chapter in volume.Chapters)
+            {
+                _dbContext.RemoveRange(chapter.Name.Texts);
+                _dbContext.RemoveRange(chapter.Body.Texts);
+            }
+        }
+
+        // 3. Remove Images (NO ACTION FK - won't cascade)
+        if (novel.CoverImage != null)
+            _dbContext.Images.Remove(novel.CoverImage);
+        foreach (var volume in novel.Volumes)
+        {
+            foreach (var chapter in volume.Chapters)
+                _dbContext.Images.RemoveRange(chapter.Images);
+        }
+
+        // 4. Remove novel - cascades: volumes, chapters, localization keys, tag mappings
+        _dbContext.Novels.Remove(novel);
+        await _dbContext.SaveChangesAsync();
     }
 }

FictionArchive.Service.NovelService/Services/SourceAdapters/Novelpia/NovelpiaAdapter.cs

@@ -66,7 +66,7 @@ public class NovelpiaAdapter : ISourceAdapter
             ExternalId = novelId.ToString(),
             SystemTags = new List<string>(),
             SourceTags = new List<string>(),
-            Chapters = new List<ChapterMetadata>(),
+            Volumes = new List<VolumeMetadata>(),
             SourceDescriptor = SourceDescriptor
         };
         
@@ -133,15 +133,16 @@ public class NovelpiaAdapter : ISourceAdapter
             novel.SourceTags.Add(tag);
         }
 
+        // Author's posts (from notice_table in the page HTML)
+        var authorsPosts = ParseAuthorsPosts(novelData);
+
         // Chapters
         uint page = 0;
         List<ChapterMetadata> chapters = new List<ChapterMetadata>();
         List<uint> seenChapterIds = new List<uint>();
-        uint chapterOrder = 0;
+        uint chapterOrder = 1;
         while (true)
         {
-            await Task.Delay(500);
-            _logger.LogInformation("Next chapter batch");
             var response = await _httpClient.PostAsync(EpisodeListEndpoint, new FormUrlEncodedContent(new Dictionary<string, string>
             {
                 {"novel_no", novelId.ToString()},
@@ -170,7 +171,25 @@ public class NovelpiaAdapter : ISourceAdapter
             }
             page++;
         }
-        novel.Chapters = chapters;
+
+        // Add Author's Posts volume if there are any
+        if (authorsPosts.Count > 0)
+        {
+            novel.Volumes.Add(new VolumeMetadata
+            {
+                Order = 0,
+                Name = "Author's Posts",
+                Chapters = authorsPosts
+            });
+        }
+
+        // Main Story volume
+        novel.Volumes.Add(new VolumeMetadata
+        {
+            Order = 1,
+            Name = "Main Story",
+            Chapters = chapters
+        });
 
         return novel;
     }
@@ -243,4 +262,40 @@ public class NovelpiaAdapter : ISourceAdapter
         }
         return await image.Content.ReadAsByteArrayAsync();
     }
+
+    private List<ChapterMetadata> ParseAuthorsPosts(string novelHtml)
+    {
+        var posts = new List<ChapterMetadata>();
+
+        // Find the notice_table section
+        var noticeTableMatch = Regex.Match(novelHtml,
+            @"(?s)<table[^>]*class=""notice_table[^""]*""[^>]*>(.*?)</table>");
+        if (!noticeTableMatch.Success)
+            return posts;
+
+        var tableContent = noticeTableMatch.Groups[1].Value;
+
+        // Find all td elements with onclick containing viewer URL and extract title from <b>
+        // HTML structure: <td ... onclick="...location='/viewer/3330612';"><b>Title</b>
+        var postMatches = Regex.Matches(tableContent,
+            @"onclick=""[^""]*location='/viewer/(\d+)'[^""]*""[^>]*><b>([^<]+)</b>");
+
+        uint order = 1;
+        foreach (Match match in postMatches)
+        {
+            string viewerId = match.Groups[1].Value;
+            string title = WebUtility.HtmlDecode(match.Groups[2].Value.Trim());
+
+            posts.Add(new ChapterMetadata
+            {
+                Revision = 0,
+                Order = order,
+                Url = $"https://novelpia.com/viewer/{viewerId}",
+                Name = title
+            });
+            order++;
+        }
+
+        return posts;
+    }
 }

FictionArchive.Service.NovelService/appsettings.json

@@ -16,8 +16,10 @@
     "DefaultConnection": "Host=localhost;Database=FictionArchive_NovelService;Username=postgres;password=postgres"
   },
   "RabbitMQ": {
-    "ConnectionString": "amqp://localhost",
-    "ClientIdentifier": "NovelService"
+    "Host": "localhost",
+    "VirtualHost": "/",
+    "Username": "guest",
+    "Password": "guest"
   },
   "AllowedHosts": "*",
   "OIDC": {

FictionArchive.Service.ReportingService/Dockerfile

@@ -0,0 +1,23 @@
+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.ReportingService/FictionArchive.Service.ReportingService.csproj", "FictionArchive.Service.ReportingService/"]
+RUN dotnet restore "FictionArchive.Service.ReportingService/FictionArchive.Service.ReportingService.csproj"
+COPY . .
+WORKDIR "/src/FictionArchive.Service.ReportingService"
+RUN dotnet build "./FictionArchive.Service.ReportingService.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./FictionArchive.Service.ReportingService.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.ReportingService.dll"]

FictionArchive.Service.ReportingService/FictionArchive.Service.ReportingService.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\FictionArchive.Service.Shared\FictionArchive.Service.Shared.csproj" />
+    </ItemGroup>
+
+</Project>

FictionArchive.Service.ReportingService/GraphQL/Mutation.cs

@@ -0,0 +1,15 @@
+using HotChocolate;
+using HotChocolate.Authorization;
+
+namespace FictionArchive.Service.ReportingService.GraphQL;
+
+public class Mutation
+{
+    /// <summary>
+    /// Placeholder mutation for GraphQL schema requirements.
+    /// The ReportingService is primarily read-only, consuming events from other services.
+    /// </summary>
+    [Authorize(Roles = ["admin"])]
+    [GraphQLDescription("Placeholder mutation. ReportingService is primarily read-only.")]
+    public bool Ping() => true;
+}

FictionArchive.Service.ReportingService/GraphQL/Query.cs

@@ -0,0 +1,52 @@
+using System.Text.Json;
+using FictionArchive.Service.ReportingService.Models.Database;
+using FictionArchive.Service.ReportingService.Models.DTOs;
+using FictionArchive.Service.ReportingService.Services;
+using HotChocolate;
+using HotChocolate.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.ReportingService.GraphQL;
+
+public class Query
+{
+    [UseProjection]
+    [UseFiltering]
+    [UseSorting]
+    [GraphQLName("reportingJobs")]
+    public IQueryable<Job> GetReportingJobs(ReportingServiceDbContext dbContext)
+        => dbContext.Jobs.Include(j => j.History);
+
+    [GraphQLName("reportingJob")]
+    public async Task<JobDto?> GetReportingJob(Guid id, ReportingServiceDbContext dbContext)
+    {
+        var job = await dbContext.Jobs
+            .Include(j => j.History.OrderBy(h => h.Timestamp))
+            .FirstOrDefaultAsync(j => j.Id == id);
+
+        if (job == null) return null;
+
+        return new JobDto
+        {
+            Id = job.Id,
+            JobType = job.JobType,
+            Status = job.Status,
+            CurrentStep = job.CurrentStep,
+            ErrorMessage = job.ErrorMessage,
+            Metadata = job.Metadata != null
+                ? JsonSerializer.Deserialize<Dictionary<string, object>>(job.Metadata.RootElement.GetRawText())
+                : null,
+            History = job.History.Select(h => new JobHistoryEntryDto
+            {
+                FromState = h.FromState,
+                ToState = h.ToState,
+                Message = h.Message,
+                Error = h.Error,
+                Timestamp = h.Timestamp
+            }).ToList(),
+            CreatedTime = job.CreatedTime,
+            UpdatedTime = job.UpdatedTime,
+            CompletedTime = job.CompletedTime
+        };
+    }
+}

FictionArchive.Service.ReportingService/Models/DTOs/JobDto.cs

@@ -0,0 +1,17 @@
+using NodaTime;
+
+namespace FictionArchive.Service.ReportingService.Models.DTOs;
+
+public class JobDto
+{
+    public Guid Id { get; set; }
+    public required string JobType { get; set; }
+    public required string Status { get; set; }
+    public string? CurrentStep { get; set; }
+    public string? ErrorMessage { get; set; }
+    public Dictionary<string, object>? Metadata { get; set; }
+    public List<JobHistoryEntryDto> History { get; set; } = new();
+    public Instant CreatedTime { get; set; }
+    public Instant UpdatedTime { get; set; }
+    public Instant? CompletedTime { get; set; }
+}

FictionArchive.Service.ReportingService/Models/DTOs/JobHistoryEntryDto.cs

@@ -0,0 +1,12 @@
+using NodaTime;
+
+namespace FictionArchive.Service.ReportingService.Models.DTOs;
+
+public class JobHistoryEntryDto
+{
+    public required string FromState { get; set; }
+    public required string ToState { get; set; }
+    public string? Message { get; set; }
+    public string? Error { get; set; }
+    public Instant Timestamp { get; set; }
+}

FictionArchive.Service.ReportingService/Models/Database/Job.cs

@@ -0,0 +1,19 @@
+using System.Text.Json;
+using NodaTime;
+
+namespace FictionArchive.Service.ReportingService.Models.Database;
+
+public class Job
+{
+    public Guid Id { get; set; }
+    public required string JobType { get; set; }
+    public required string Status { get; set; }
+    public string? CurrentStep { get; set; }
+    public string? ErrorMessage { get; set; }
+    public JsonDocument? Metadata { get; set; }
+    public Instant CreatedTime { get; set; }
+    public Instant UpdatedTime { get; set; }
+    public Instant? CompletedTime { get; set; }
+
+    public ICollection<JobHistoryEntry> History { get; set; } = new List<JobHistoryEntry>();
+}

FictionArchive.Service.ReportingService/Models/Database/JobHistoryEntry.cs

@@ -0,0 +1,16 @@
+using NodaTime;
+
+namespace FictionArchive.Service.ReportingService.Models.Database;
+
+public class JobHistoryEntry
+{
+    public int Id { get; set; }
+    public Guid JobId { get; set; }
+    public required string FromState { get; set; }
+    public required string ToState { get; set; }
+    public string? Message { get; set; }
+    public string? Error { get; set; }
+    public Instant Timestamp { get; set; }
+
+    public Job Job { get; set; } = null!;
+}

FictionArchive.Service.ReportingService/Program.cs

@@ -0,0 +1,76 @@
+using FictionArchive.Common.Extensions;
+using FictionArchive.Service.ReportingService.GraphQL;
+using FictionArchive.Service.ReportingService.Services;
+using FictionArchive.Service.ReportingService.Services.Consumers;
+using FictionArchive.Service.Shared;
+using FictionArchive.Service.Shared.Extensions;
+using FictionArchive.Service.Shared.MassTransit;
+
+namespace FictionArchive.Service.ReportingService;
+
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+
+        var isSchemaExport = SchemaExportDetector.IsSchemaExportMode(args);
+
+        builder.AddLocalAppsettings();
+
+        builder.Services.AddHealthChecks();
+
+        #region Database
+
+        builder.Services.RegisterDbContext<ReportingServiceDbContext>(
+            builder.Configuration.GetConnectionString("DefaultConnection")!,
+            skipInfrastructure: isSchemaExport);
+
+        #endregion
+
+        #region MassTransit
+
+        if (!isSchemaExport)
+        {
+            builder.Services.AddFictionArchiveMassTransit<ReportingServiceDbContext>(
+                builder.Configuration,
+                x =>
+                {
+                    x.AddConsumer<JobStateChangedEventConsumer>();
+                });
+        }
+
+        #endregion
+
+        #region GraphQL
+
+        builder.Services.AddDefaultGraphQl<Query, Mutation>()
+            .AddAuthorization();
+
+        #endregion
+
+        // Authentication & Authorization
+        builder.Services.AddOidcAuthentication(builder.Configuration);
+        builder.Services.AddFictionArchiveAuthorization();
+
+        var app = builder.Build();
+
+        if (!isSchemaExport)
+        {
+            using var scope = app.Services.CreateScope();
+            var dbContext = scope.ServiceProvider.GetRequiredService<ReportingServiceDbContext>();
+            dbContext.UpdateDatabase();
+        }
+
+        app.UseHttpsRedirection();
+
+        app.MapHealthChecks("/healthz");
+
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.MapGraphQL();
+
+        app.RunWithGraphQLCommands(args);
+    }
+}

FictionArchive.Service.ReportingService/Properties/launchSettings.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:45320",
+      "sslPort": 44320
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5180",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "graphql",
+      "applicationUrl": "https://localhost:7320;http://localhost:5180",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

FictionArchive.Service.ReportingService/Services/Consumers/JobStateChangedEventConsumer.cs

@@ -0,0 +1,74 @@
+using System.Text.Json;
+using FictionArchive.Service.ReportingService.Models.Database;
+using FictionArchive.Service.Shared.MassTransit.Contracts;
+using MassTransit;
+
+namespace FictionArchive.Service.ReportingService.Services.Consumers;
+
+public class JobStateChangedEventConsumer : IConsumer<JobStateChangedEvent>
+{
+    private readonly ReportingServiceDbContext _dbContext;
+    private readonly ILogger<JobStateChangedEventConsumer> _logger;
+
+    public JobStateChangedEventConsumer(
+        ReportingServiceDbContext dbContext,
+        ILogger<JobStateChangedEventConsumer> logger)
+    {
+        _dbContext = dbContext;
+        _logger = logger;
+    }
+
+    public async Task Consume(ConsumeContext<JobStateChangedEvent> context)
+    {
+        var @event = context.Message;
+
+        var job = await _dbContext.Jobs.FindAsync(@event.JobId);
+
+        if (job == null)
+        {
+            job = new Job
+            {
+                Id = @event.JobId,
+                JobType = @event.JobType,
+                Status = @event.ToState,
+                CreatedTime = @event.Timestamp,
+                UpdatedTime = @event.Timestamp,
+                Metadata = @event.Metadata != null
+                    ? JsonSerializer.SerializeToDocument(@event.Metadata)
+                    : null
+            };
+            _dbContext.Jobs.Add(job);
+        }
+        else
+        {
+            job.Status = @event.ToState;
+            job.UpdatedTime = @event.Timestamp;
+
+            if (@event.Error != null)
+            {
+                job.ErrorMessage = @event.Error;
+            }
+
+            if (@event.ToState is "Completed" or "Failed")
+            {
+                job.CompletedTime = @event.Timestamp;
+            }
+        }
+
+        var historyEntry = new JobHistoryEntry
+        {
+            JobId = @event.JobId,
+            FromState = @event.FromState,
+            ToState = @event.ToState,
+            Message = @event.Message,
+            Error = @event.Error,
+            Timestamp = @event.Timestamp
+        };
+        _dbContext.JobHistoryEntries.Add(historyEntry);
+
+        await _dbContext.SaveChangesAsync();
+
+        _logger.LogDebug("Recorded job state change: {JobId} {FromState} -> {ToState}",
+            @event.JobId, @event.FromState, @event.ToState);
+    }
+}

FictionArchive.Service.ReportingService/Services/ReportingServiceDbContext.cs

@@ -0,0 +1,36 @@
+using FictionArchive.Service.ReportingService.Models.Database;
+using FictionArchive.Service.Shared.Services.Database;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.ReportingService.Services;
+
+public class ReportingServiceDbContext : FictionArchiveDbContext
+{
+    public ReportingServiceDbContext(DbContextOptions options, ILogger<ReportingServiceDbContext> logger)
+        : base(options, logger) { }
+
+    public DbSet<Job> Jobs => Set<Job>();
+    public DbSet<JobHistoryEntry> JobHistoryEntries => Set<JobHistoryEntry>();
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        modelBuilder.Entity<Job>(entity =>
+        {
+            entity.HasKey(e => e.Id);
+            entity.HasIndex(e => e.JobType);
+            entity.HasIndex(e => e.Status);
+            entity.HasIndex(e => e.CreatedTime);
+        });
+
+        modelBuilder.Entity<JobHistoryEntry>(entity =>
+        {
+            entity.HasKey(e => e.Id);
+            entity.HasOne(e => e.Job)
+                .WithMany(j => j.History)
+                .HasForeignKey(e => e.JobId)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+    }
+}

FictionArchive.Service.ReportingService/appsettings.Development.json

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

FictionArchive.Service.ReportingService/appsettings.json

@@ -0,0 +1,28 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": "Host=localhost;Database=FictionArchive_ReportingService;Username=postgres;password=postgres"
+  },
+  "RabbitMQ": {
+    "Host": "localhost",
+    "VirtualHost": "/",
+    "Username": "guest",
+    "Password": "guest"
+  },
+  "OIDC": {
+    "Authority": "https://auth.orfl.xyz/application/o/fiction-archive/",
+    "ClientId": "ldi5IpEidq2WW0Ka1lehVskb2SOBjnYRaZCpEyBh",
+    "Audience": "ldi5IpEidq2WW0Ka1lehVskb2SOBjnYRaZCpEyBh",
+    "ValidIssuer": "https://auth.orfl.xyz/application/o/fiction-archive/",
+    "ValidateIssuer": true,
+    "ValidateAudience": true,
+    "ValidateLifetime": true,
+    "ValidateIssuerSigningKey": true
+  },
+  "AllowedHosts": "*"
+}

FictionArchive.Service.ReportingService/subgraph-config.json

@@ -0,0 +1,6 @@
+{
+  "subgraph": "Reporting",
+  "http": {
+    "baseAddress": "http://localhost:5180/graphql"
+  }
+}

FictionArchive.Service.SchedulerService/FictionArchive.Service.SchedulerService.csproj

@@ -19,6 +19,7 @@
 
     <ItemGroup>
       <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" Version="0.5.1" />
+      <PackageReference Include="MassTransit" Version="8.4.0" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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,15 +6,22 @@ namespace FictionArchive.Service.SchedulerService.Models.JobTemplates;
 
 public class EventJobTemplate : IJob
 {
-    private readonly IEventBus _eventBus;
+    private readonly IPublishEndpoint _publishEndpoint;
+    private readonly ISendEndpointProvider _sendEndpointProvider;
     private readonly ILogger<EventJobTemplate> _logger;
 
-    public const string EventTypeParameter = "RoutingKey";
+    public const string EventTypeParameter = "MessageType";
     public const string EventDataParameter = "MessageData";
+    public const string IsCommandParameter = "IsCommand";
+    public const string DestinationQueueParameter = "DestinationQueue";
 
-    public EventJobTemplate(IEventBus eventBus, ILogger<EventJobTemplate> logger)
+    public EventJobTemplate(
+        IPublishEndpoint publishEndpoint,
+        ISendEndpointProvider sendEndpointProvider,
+        ILogger<EventJobTemplate> logger)
     {
-        _eventBus = eventBus;
+        _publishEndpoint = publishEndpoint;
+        _sendEndpointProvider = sendEndpointProvider;
         _logger = logger;
     }
 
@@ -22,14 +29,47 @@ public class EventJobTemplate : IJob
     {
         try
         {
-            var eventData = context.MergedJobDataMap.GetString(EventDataParameter);
-            var eventType = context.MergedJobDataMap.GetString(EventTypeParameter);
-            var eventObject = JsonConvert.DeserializeObject(eventData);
-            await _eventBus.Publish(eventObject, eventType);
+            var messageData = context.MergedJobDataMap.GetString(EventDataParameter);
+            var messageTypeName = context.MergedJobDataMap.GetString(EventTypeParameter);
+            var isCommand = context.MergedJobDataMap.GetBoolean(IsCommandParameter);
+
+            var messageType = Type.GetType(messageTypeName!);
+            if (messageType == null)
+            {
+                _logger.LogError("Could not resolve message type: {MessageType}", messageTypeName);
+                return;
+            }
+
+            var message = JsonConvert.DeserializeObject(messageData!, messageType);
+            if (message == null)
+            {
+                _logger.LogError("Could not deserialize message data for type: {MessageType}", messageTypeName);
+                return;
+            }
+
+            if (isCommand)
+            {
+                var destinationQueue = context.MergedJobDataMap.GetString(DestinationQueueParameter);
+                if (string.IsNullOrEmpty(destinationQueue))
+                {
+                    _logger.LogError("Destination queue not specified for command message");
+                    return;
+                }
+
+                var endpoint = await _sendEndpointProvider.GetSendEndpoint(new Uri($"queue:{destinationQueue}"));
+                await endpoint.Send(message, messageType);
+                _logger.LogInformation("Sent command {MessageType} to queue {Queue}", messageTypeName, destinationQueue);
+            }
+            else
+            {
+                await _publishEndpoint.Publish(message, messageType);
+                _logger.LogInformation("Published event {MessageType}", messageTypeName);
+            }
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "An error occurred while running an event job.");
+            throw; // Re-throw to let Quartz handle retries
         }
     }
 }

FictionArchive.Service.SchedulerService/Program.cs

@@ -2,7 +2,7 @@ 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 FictionArchive.Service.Shared.MassTransit;
 using Quartz;
 using Quartz.Impl.AdoJobStore;
 
@@ -34,14 +34,11 @@ public class Program
         
         #endregion
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
-            {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            });
+            builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
         }
 
         #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

@@ -6,8 +6,10 @@
     }
   },
   "RabbitMQ": {
-    "ConnectionString": "amqp://localhost",
-    "ClientIdentifier": "SchedulerService"
+    "Host": "localhost",
+    "VirtualHost": "/",
+    "Username": "guest",
+    "Password": "guest"
   },
   "ConnectionStrings": {
     "DefaultConnection": "Host=localhost;Database=FictionArchive_SchedulerService;Username=postgres;password=postgres"

FictionArchive.Service.Shared/Extensions/AuthenticationExtensions.cs

@@ -6,6 +6,7 @@ using Microsoft.IdentityModel.Tokens;
 using FictionArchive.Service.Shared.Constants;
 using FictionArchive.Service.Shared.Models.Authentication;
 using System.Linq;
+using System.Security.Claims;
 
 namespace FictionArchive.Service.Shared.Extensions;
 
@@ -78,7 +79,7 @@ public static class AuthenticationExtensions
 
                 logger.LogDebug(
                     "JWT token validated for subject: {Subject}",
-                    context.Principal?.FindFirst("sub")?.Value ?? "unknown");
+                    context.Principal?.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "unknown");
 
                 return existingEvents?.OnTokenValidated?.Invoke(context) ?? Task.CompletedTask;
             }

FictionArchive.Service.Shared/Extensions/GraphQLExtensions.cs

@@ -22,6 +22,7 @@ public static class GraphQLExtensions
                         .AddErrorFilter<LoggingErrorFilter>()
                         .AddType<UnsignedIntType>()
                         .AddType<InstantType>()
+                        .ModifyCostOptions(opt => opt.MaxFieldCost = 10000)
                         .AddMutationConventions(applyToAllMutations: true)
                         .AddFiltering(opt => opt.AddDefaults().BindRuntimeType<uint, UnsignedIntOperationFilterInputType>())
                         .AddSorting()

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

@@ -25,11 +25,15 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.2.0" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.4" />
-        <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
+        <PackageReference Include="Polly" Version="8.6.5" />
+        <PackageReference Include="MassTransit" Version="8.4.0" />
+        <PackageReference Include="MassTransit.RabbitMQ" Version="8.4.0" />
+        <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.4.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     </ItemGroup>
     

FictionArchive.Service.Shared/MassTransit/Configuration/MassTransitOptions.cs

@@ -0,0 +1,9 @@
+namespace FictionArchive.Service.Shared.MassTransit.Configuration;
+
+public class MassTransitOptions
+{
+    public string Host { get; set; } = "localhost";
+    public string VirtualHost { get; set; } = "/";
+    public string Username { get; set; } = "guest";
+    public string Password { get; set; } = "guest";
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Commands/ImportNovelCommand.cs

@@ -0,0 +1,6 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+
+public record ImportNovelCommand : ICommand
+{
+    public required string NovelUrl { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Commands/PullChapterContentCommand.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+
+public record PullChapterContentCommand : ICommand
+{
+    public required uint NovelId { get; init; }
+    public required uint VolumeId { get; init; }
+    public required uint ChapterOrder { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Commands/TranslateTextCommand.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+
+public record TranslateTextCommand : ICommand
+{
+    public Guid TranslationRequestId { get; init; }
+    public Language From { get; init; }
+    public Language To { get; init; }
+    public required string Body { get; init; }
+    public required string TranslationEngineKey { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Commands/UploadFileCommand.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Commands;
+
+public record UploadFileCommand : ICommand
+{
+    public Guid RequestId { get; init; }
+    public required string FilePath { get; init; }
+    public required byte[] FileData { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Events/AuthUserAddedEvent.cs

@@ -0,0 +1,9 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+
+public record AuthUserAddedEvent : IEvent
+{
+    public required string OAuthProviderId { get; init; }
+    public required string InviterOAuthProviderId { get; init; }
+    public required string EventUserEmail { get; init; }
+    public required string EventUserUsername { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Events/ChapterCreatedEvent.cs

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+
+public record ChapterCreatedEvent : IEvent
+{
+    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.Shared/MassTransit/Contracts/Events/FileUploadCompletedEvent.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+
+public record FileUploadCompletedEvent : IEvent
+{
+    public Guid RequestId { get; init; }
+    public RequestStatus Status { get; init; }
+    public string? FileAccessUrl { get; init; }
+    public string? ErrorMessage { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Events/NovelCreatedEvent.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+
+public record NovelCreatedEvent : IEvent
+{
+    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.Shared/MassTransit/Contracts/Events/TranslationCompletedEvent.cs

@@ -0,0 +1,7 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+
+public record TranslationCompletedEvent : IEvent
+{
+    public Guid TranslationRequestId { get; init; }
+    public required string TranslatedText { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/Events/UserInvitedEvent.cs

@@ -0,0 +1,13 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts.Events;
+
+public record UserInvitedEvent : IEvent
+{
+    public Guid InvitedUserId { get; init; }
+    public required string InvitedUsername { get; init; }
+    public required string InvitedEmail { get; init; }
+    public required string InvitedOAuthProviderId { get; init; }
+
+    public Guid InviterId { get; init; }
+    public required string InviterUsername { get; init; }
+    public required string InviterOAuthProviderId { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/Contracts/ICommand.cs

@@ -0,0 +1,6 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts;
+
+/// <summary>
+/// Marker interface for commands (do something, single consumer)
+/// </summary>
+public interface ICommand { }

FictionArchive.Service.Shared/MassTransit/Contracts/IEvent.cs

@@ -0,0 +1,6 @@
+namespace FictionArchive.Service.Shared.MassTransit.Contracts;
+
+/// <summary>
+/// Marker interface for events (something happened, multiple subscribers)
+/// </summary>
+public interface IEvent { }

FictionArchive.Service.Shared/MassTransit/Contracts/JobStateChangedEvent.cs

@@ -0,0 +1,18 @@
+using NodaTime;
+
+namespace FictionArchive.Service.Shared.MassTransit.Contracts;
+
+/// <summary>
+/// Published by sagas on state transitions for centralized job tracking
+/// </summary>
+public record JobStateChangedEvent : IEvent
+{
+    public Guid JobId { get; init; }
+    public required string JobType { get; init; }
+    public required string FromState { get; init; }
+    public required string ToState { get; init; }
+    public string? Message { get; init; }
+    public string? Error { get; init; }
+    public Instant Timestamp { get; init; }
+    public Dictionary<string, object>? Metadata { get; init; }
+}

FictionArchive.Service.Shared/MassTransit/MassTransitExtensions.cs

@@ -0,0 +1,103 @@
+using FictionArchive.Service.Shared.MassTransit.Configuration;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FictionArchive.Service.Shared.MassTransit;
+
+public static class MassTransitExtensions
+{
+    /// <summary>
+    /// Adds MassTransit with RabbitMQ and Entity Framework outbox
+    /// </summary>
+    public static IServiceCollection AddFictionArchiveMassTransit<TDbContext>(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        Action<IBusRegistrationConfigurator>? configureConsumers = null)
+        where TDbContext : DbContext
+    {
+        services.AddMassTransit(x =>
+        {
+            configureConsumers?.Invoke(x);
+
+            x.AddEntityFrameworkOutbox<TDbContext>(o =>
+            {
+                o.UsePostgres();
+                o.UseBusOutbox();
+            });
+
+            x.UsingRabbitMq((context, cfg) =>
+            {
+                var options = configuration.GetSection("RabbitMQ").Get<MassTransitOptions>()
+                    ?? new MassTransitOptions();
+
+                cfg.Host(options.Host, options.VirtualHost, h =>
+                {
+                    h.Username(options.Username);
+                    h.Password(options.Password);
+                });
+
+                // Immediate retries for transient failures
+                cfg.UseMessageRetry(r => r.Intervals(
+                    TimeSpan.FromSeconds(1),
+                    TimeSpan.FromSeconds(1),
+                    TimeSpan.FromSeconds(1)));
+
+                // Delayed redelivery for longer outages
+                cfg.UseDelayedRedelivery(r => r.Intervals(
+                    TimeSpan.FromSeconds(5),
+                    TimeSpan.FromSeconds(30),
+                    TimeSpan.FromMinutes(2),
+                    TimeSpan.FromMinutes(10),
+                    TimeSpan.FromMinutes(30)));
+
+                cfg.ConfigureEndpoints(context);
+            });
+        });
+
+        return services;
+    }
+
+    /// <summary>
+    /// Adds MassTransit with RabbitMQ without outbox (for services without EF)
+    /// </summary>
+    public static IServiceCollection AddFictionArchiveMassTransit(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        Action<IBusRegistrationConfigurator>? configureConsumers = null)
+    {
+        services.AddMassTransit(x =>
+        {
+            configureConsumers?.Invoke(x);
+
+            x.UsingRabbitMq((context, cfg) =>
+            {
+                var options = configuration.GetSection("RabbitMQ").Get<MassTransitOptions>()
+                    ?? new MassTransitOptions();
+
+                cfg.Host(options.Host, options.VirtualHost, h =>
+                {
+                    h.Username(options.Username);
+                    h.Password(options.Password);
+                });
+
+                cfg.UseMessageRetry(r => r.Intervals(
+                    TimeSpan.FromSeconds(1),
+                    TimeSpan.FromSeconds(1),
+                    TimeSpan.FromSeconds(1)));
+
+                cfg.UseDelayedRedelivery(r => r.Intervals(
+                    TimeSpan.FromSeconds(5),
+                    TimeSpan.FromSeconds(30),
+                    TimeSpan.FromMinutes(2),
+                    TimeSpan.FromMinutes(10),
+                    TimeSpan.FromMinutes(30)));
+
+                cfg.ConfigureEndpoints(context);
+            });
+        });
+
+        return services;
+    }
+}

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.TranslationService/FictionArchive.Service.TranslationService.csproj

@@ -23,6 +23,7 @@
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
         <PackageReference Include="DeepL.net" Version="1.17.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
+        <PackageReference Include="MassTransit" Version="8.4.0" />
     </ItemGroup>
 
     <ItemGroup>

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,14 @@ 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.MassTransit;
 using FictionArchive.Service.Shared.Services.GraphQL;
 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 +24,16 @@ public class Program
 
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
-            {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            })
-            .Subscribe<TranslationRequestCreatedEvent, TranslationRequestCreatedEventHandler>();
+            builder.Services.AddFictionArchiveMassTransit<TranslationServiceDbContext>(
+                builder.Configuration,
+                x =>
+                {
+                    x.AddConsumer<TranslateTextCommandConsumer>();
+                });
         }
 
         #endregion