[FA-27] Bookmark implementation

Reviewed-on: #58

.gitea/workflows/claude_assistant.yml

@@ -1,49 +0,0 @@
-name: Claude PR Assistant
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude-code-action:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && contains(github.event.issue.body, '@claude'))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      issues: write
-      id-token: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Run Claude PR Action
-        uses: markwylde/claude-code-gitea-action@v1.0.20
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          gitea_token: ${{ secrets.CLAUDE_GITEA_TOKEN }}
-          # Or use OAuth token instead:
-          # claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          timeout_minutes: "60"
-          # mode: tag  # Default: responds to @claude mentions
-          # Optional: Restrict network access to specific domains only
-          # experimental_allowed_domains: |
-          #   .anthropic.com
-          #   .github.com
-          #   api.github.com
-          #   .githubusercontent.com
-          #   bun.sh
-          #   registry.npmjs.org
-          #   .blob.core.windows.net

FictionArchive.API/Dockerfile

@@ -24,6 +24,8 @@ RUN dotnet build "./FictionArchive.API.csproj" -c $BUILD_CONFIGURATION -o /app/b
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
 RUN dotnet publish "./FictionArchive.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:SkipFusionBuild=true
+# Copy pre-composed gateway.fgp from CI build
+COPY FictionArchive.API/gateway.fgp /app/publish/
 
 FROM base AS final
 WORKDIR /app

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.FileService/Controllers/S3ProxyController.cs

@@ -35,8 +35,16 @@ namespace FictionArchive.Service.FileService.Controllers
                     BucketName = _s3Configuration.Bucket,
                     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.NovelService.Tests/NovelUpdateServiceTests.cs

@@ -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,14 +59,14 @@ 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(
@@ -81,7 +88,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 } };
@@ -103,7 +110,7 @@ public class NovelUpdateServiceTests
         var pendingImageUrl = "https://pending/placeholder.jpg";
         var service = CreateService(dbContext, adapter, eventBus, 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 });
@@ -131,7 +138,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 } };
@@ -150,7 +157,7 @@ public class NovelUpdateServiceTests
 
         var service = CreateService(dbContext, adapter, eventBus);
 
-        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,5 +168,139 @@ 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
+
+    [Fact]
+    public async Task UpdateImage_sets_NewPath_on_image_without_chapter()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var image = new Image
+        {
+            OriginalPath = "http://original/cover.jpg",
+            NewPath = null
+        };
+        dbContext.Images.Add(image);
+        await dbContext.SaveChangesAsync();
+
+        var adapter = Substitute.For<ISourceAdapter>();
+        var eventBus = Substitute.For<IEventBus>();
+        var service = CreateService(dbContext, adapter, eventBus);
+
+        var newUrl = "https://cdn.example.com/uploaded/cover.jpg";
+
+        // Act
+        await service.UpdateImage(image.Id, newUrl);
+
+        // Assert
+        var updatedImage = await dbContext.Images.FindAsync(image.Id);
+        updatedImage!.NewPath.Should().Be(newUrl);
+        updatedImage.OriginalPath.Should().Be("http://original/cover.jpg");
+    }
+
+    [Fact]
+    public async Task UpdateImage_updates_chapter_body_html_with_new_url()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var source = new Source { Name = "Demo", Key = "demo", Url = "http://demo" };
+        var (novel, _, chapter) = CreateNovelWithSingleChapter(dbContext, source);
+
+        var image = new Image
+        {
+            OriginalPath = "http://original/image.jpg",
+            NewPath = null,
+            Chapter = chapter
+        };
+        chapter.Images.Add(image);
+        await dbContext.SaveChangesAsync();
+
+        // Set up the chapter body with an img tag referencing the image by ID (as PullChapterContents does)
+        var pendingUrl = "https://pending/placeholder.jpg";
+        var bodyHtml = $"<p>Content</p><img src=\"{pendingUrl}\" alt=\"{image.Id}\" />";
+        chapter.Body.Texts.Add(new LocalizationText
+        {
+            Language = Language.En,
+            Text = bodyHtml
+        });
+        await dbContext.SaveChangesAsync();
+
+        var adapter = Substitute.For<ISourceAdapter>();
+        var eventBus = Substitute.For<IEventBus>();
+        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+
+        var newUrl = "https://cdn.example.com/uploaded/image.jpg";
+
+        // Act
+        await service.UpdateImage(image.Id, newUrl);
+
+        // Assert
+        var updatedImage = await dbContext.Images
+            .Include(i => i.Chapter)
+            .ThenInclude(c => c.Body)
+            .ThenInclude(b => b.Texts)
+            .FirstAsync(i => i.Id == image.Id);
+
+        updatedImage.NewPath.Should().Be(newUrl);
+
+        var updatedBodyText = updatedImage.Chapter!.Body.Texts.Single().Text;
+        var doc = new HtmlDocument();
+        doc.LoadHtml(updatedBodyText);
+        var imgNode = doc.DocumentNode.SelectSingleNode("//img");
+        imgNode.Should().NotBeNull();
+        imgNode!.GetAttributeValue("src", string.Empty).Should().Be(newUrl);
+    }
+
+    [Fact]
+    public async Task UpdateImage_does_not_modify_other_images_in_chapter_body()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var source = new Source { Name = "Demo", Key = "demo", Url = "http://demo" };
+        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 };
+        chapter.Images.Add(image1);
+        chapter.Images.Add(image2);
+        await dbContext.SaveChangesAsync();
+
+        var pendingUrl = "https://pending/placeholder.jpg";
+        var bodyHtml = $"<p>Content</p><img src=\"{pendingUrl}\" alt=\"{image1.Id}\" /><img src=\"{pendingUrl}\" alt=\"{image2.Id}\" />";
+        chapter.Body.Texts.Add(new LocalizationText
+        {
+            Language = Language.En,
+            Text = bodyHtml
+        });
+        await dbContext.SaveChangesAsync();
+
+        var adapter = Substitute.For<ISourceAdapter>();
+        var eventBus = Substitute.For<IEventBus>();
+        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+
+        var newUrl = "https://cdn.example.com/uploaded/img1.jpg";
+
+        // Act - only update image1
+        await service.UpdateImage(image1.Id, newUrl);
+
+        // Assert
+        var updatedChapter = await dbContext.Chapters
+            .Include(c => c.Body)
+            .ThenInclude(b => b.Texts)
+            .FirstAsync(c => c.Id == chapter.Id);
+
+        var updatedBodyText = updatedChapter.Body.Texts.Single().Text;
+        var doc = new HtmlDocument();
+        doc.LoadHtml(updatedBodyText);
+
+        var img1Node = doc.DocumentNode.SelectSingleNode($"//img[@alt='{image1.Id}']");
+        var img2Node = doc.DocumentNode.SelectSingleNode($"//img[@alt='{image2.Id}']");
+
+        img1Node!.GetAttributeValue("src", string.Empty).Should().Be(newUrl);
+        img2Node!.GetAttributeValue("src", string.Empty).Should().Be(pendingUrl);
+    }
+
+    #endregion
 }

FictionArchive.Service.NovelService/GraphQL/Mutation.cs

@@ -7,6 +7,7 @@ using FictionArchive.Service.NovelService.Services;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
 using FictionArchive.Service.Shared.Services.EventBus;
 using HotChocolate.Authorization;
+using HotChocolate.Types;
 using Microsoft.EntityFrameworkCore;
 
 namespace FictionArchive.Service.NovelService.GraphQL;
@@ -20,10 +21,20 @@ public class Mutation
     }
 
     [Authorize]
-    public async Task<ChapterPullRequestedEvent> FetchChapterContents(uint novelId,
-        uint chapterNumber,
+    public async Task<ChapterPullRequestedEvent> 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

@@ -1,4 +1,5 @@
-using FictionArchive.Service.NovelService.Models.Novels;
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.NovelService.Models.DTOs;
 using FictionArchive.Service.NovelService.Services;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
@@ -13,8 +14,250 @@ public class Query
     [UseProjection]
     [UseFiltering]
     [UseSorting]
-    public IQueryable<Novel> GetNovels(NovelServiceDbContext dbContext)
+    public IQueryable<NovelDto> GetNovels(
+        NovelServiceDbContext dbContext,
+        Language preferredLanguage = Language.En)
     {
-        return dbContext.Novels.AsQueryable();
+        return dbContext.Novels.Select(novel => new NovelDto
+        {
+            Id = novel.Id,
+            CreatedTime = novel.CreatedTime,
+            LastUpdatedTime = novel.LastUpdatedTime,
+            Url = novel.Url,
+            RawLanguage = novel.RawLanguage,
+            RawStatus = novel.RawStatus,
+            StatusOverride = novel.StatusOverride,
+            ExternalId = novel.ExternalId,
+
+            Name = novel.Name.Texts
+                .Where(t => t.Language == preferredLanguage)
+                .Select(t => t.Text)
+                .FirstOrDefault()
+                ?? novel.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                ?? "",
+
+            Description = novel.Description.Texts
+                .Where(t => t.Language == preferredLanguage)
+                .Select(t => t.Text)
+                .FirstOrDefault()
+                ?? novel.Description.Texts.Select(t => t.Text).FirstOrDefault()
+                ?? "",
+
+            Author = new PersonDto
+            {
+                Id = novel.Author.Id,
+                CreatedTime = novel.Author.CreatedTime,
+                LastUpdatedTime = novel.Author.LastUpdatedTime,
+                Name = novel.Author.Name.Texts
+                    .Where(t => t.Language == preferredLanguage)
+                    .Select(t => t.Text)
+                    .FirstOrDefault()
+                    ?? novel.Author.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? "",
+                ExternalUrl = novel.Author.ExternalUrl
+            },
+
+            Source = new SourceDto
+            {
+                Id = novel.Source.Id,
+                CreatedTime = novel.Source.CreatedTime,
+                LastUpdatedTime = novel.Source.LastUpdatedTime,
+                Name = novel.Source.Name,
+                Key = novel.Source.Key,
+                Url = novel.Source.Url
+            },
+
+            CoverImage = novel.CoverImage != null
+                ? new ImageDto
+                {
+                    Id = novel.CoverImage.Id,
+                    CreatedTime = novel.CoverImage.CreatedTime,
+                    LastUpdatedTime = novel.CoverImage.LastUpdatedTime,
+                    NewPath = novel.CoverImage.NewPath
+                }
+                : null,
+
+            Volumes = novel.Volumes.OrderBy(v => v.Order).Select(volume => new VolumeDto
+            {
+                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()
+                    ?? volume.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? "",
+                Chapters = volume.Chapters.OrderBy(c => c.Order).Select(chapter => new ChapterDto
+                {
+                    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(),
+
+            Tags = novel.Tags.Select(tag => new NovelTagDto
+            {
+                Id = tag.Id,
+                CreatedTime = tag.CreatedTime,
+                LastUpdatedTime = tag.LastUpdatedTime,
+                Key = tag.Key,
+                TagType = tag.TagType,
+                DisplayName = tag.DisplayName.Texts
+                    .Where(t => t.Language == preferredLanguage)
+                    .Select(t => t.Text)
+                    .FirstOrDefault()
+                    ?? tag.DisplayName.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? "",
+                Source = tag.Source != null
+                    ? new SourceDto
+                    {
+                        Id = tag.Source.Id,
+                        CreatedTime = tag.Source.CreatedTime,
+                        LastUpdatedTime = tag.Source.LastUpdatedTime,
+                        Name = tag.Source.Name,
+                        Key = tag.Source.Key,
+                        Url = tag.Source.Url
+                    }
+                    : null
+            }).ToList()
+        });
     }
-}
+
+    [Authorize]
+    [UseFirstOrDefault]
+    [UseProjection]
+    public IQueryable<ChapterReaderDto> GetChapter(
+        NovelServiceDbContext dbContext,
+        uint novelId,
+        uint volumeOrder,
+        uint chapterOrder,
+        Language preferredLanguage = Language.En)
+    {
+        return dbContext.Chapters
+            .Where(c => c.Volume.Novel.Id == novelId && c.Volume.Order == volumeOrder && c.Order == chapterOrder)
+            .Select(chapter => new ChapterReaderDto
+            {
+                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(),
+
+                NovelId = chapter.Volume.Novel.Id,
+                NovelName = chapter.Volume.Novel.Name.Texts
+                    .Where(t => t.Language == preferredLanguage)
+                    .Select(t => t.Text)
+                    .FirstOrDefault()
+                    ?? chapter.Volume.Novel.Name.Texts.Select(t => t.Text).FirstOrDefault()
+                    ?? "",
+
+                // 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()
+                    ?? 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/20251208230154_FA-misc_NovelConstraint.Designer.cs

@@ -0,0 +1,547 @@
+// <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("20251208230154_FA-misc_NovelConstraint")]
+    partial class FAmisc_NovelConstraint
+    {
+        /// <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>("NovelId")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("Revision")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BodyId");
+
+                    b.HasIndex("NameId");
+
+                    b.HasIndex("NovelId");
+
+                    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("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.Novel", "Novel")
+                        .WithMany("Chapters")
+                        .HasForeignKey("NovelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Body");
+
+                    b.Navigation("Name");
+
+                    b.Navigation("Novel");
+                });
+
+            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("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("Chapters");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FictionArchive.Service.NovelService/Migrations/20251208230154_FA-misc_NovelConstraint.cs

@@ -0,0 +1,69 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FictionArchive.Service.NovelService.Migrations
+{
+    /// <inheritdoc />
+    public partial class FAmisc_NovelConstraint : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Chapter_Novels_NovelId",
+                table: "Chapter");
+
+            migrationBuilder.AlterColumn<long>(
+                name: "NovelId",
+                table: "Chapter",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L,
+                oldClrType: typeof(long),
+                oldType: "bigint",
+                oldNullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Novels_ExternalId_SourceId",
+                table: "Novels",
+                columns: new[] { "ExternalId", "SourceId" },
+                unique: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Chapter_Novels_NovelId",
+                table: "Chapter",
+                column: "NovelId",
+                principalTable: "Novels",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Chapter_Novels_NovelId",
+                table: "Chapter");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Novels_ExternalId_SourceId",
+                table: "Novels");
+
+            migrationBuilder.AlterColumn<long>(
+                name: "NovelId",
+                table: "Chapter",
+                type: "bigint",
+                nullable: true,
+                oldClrType: typeof(long),
+                oldType: "bigint");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Chapter_Novels_NovelId",
+                table: "Chapter",
+                column: "NovelId",
+                principalTable: "Novels",
+                principalColumn: "Id");
+        }
+    }
+}

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");
                 });
@@ -234,6 +235,9 @@ namespace FictionArchive.Service.NovelService.Migrations
 
                     b.HasIndex("SourceId");
 
+                    b.HasIndex("ExternalId", "SourceId")
+                        .IsUnique();
+
                     b.ToTable("Novels");
                 });
 
@@ -354,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")
@@ -424,13 +461,17 @@ namespace FictionArchive.Service.NovelService.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Novel", null)
+                    b.HasOne("FictionArchive.Service.NovelService.Models.Novels.Volume", "Volume")
                         .WithMany("Chapters")
-                        .HasForeignKey("NovelId");
+                        .HasForeignKey("VolumeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.Navigation("Body");
 
                     b.Navigation("Name");
+
+                    b.Navigation("Volume");
                 });
 
             modelBuilder.Entity("FictionArchive.Service.NovelService.Models.Novels.Novel", b =>
@@ -502,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)
@@ -528,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/BaseDto.cs

@@ -0,0 +1,10 @@
+using NodaTime;
+
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public abstract class BaseDto<TKey>
+{
+    public TKey Id { get; init; }
+    public Instant CreatedTime { get; init; }
+    public Instant LastUpdatedTime { get; init; }
+}

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

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class ChapterDto : BaseDto<uint>
+{
+    public uint Revision { get; init; }
+    public uint Order { get; init; }
+    public string? Url { get; init; }
+    public required string Name { get; init; }
+    public required string Body { get; init; }
+    public required List<ImageDto> Images { get; init; }
+}

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

@@ -0,0 +1,27 @@
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class ChapterReaderDto : BaseDto<uint>
+{
+    public uint Revision { get; init; }
+    public uint Order { get; init; }
+    public string? Url { get; init; }
+    public required string Name { get; init; }
+    public required string Body { get; init; }
+    public required List<ImageDto> Images { get; init; }
+
+    // Navigation context
+    public uint NovelId { get; init; }
+    public required string NovelName { 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/ImageDto.cs

@@ -0,0 +1,6 @@
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class ImageDto : BaseDto<Guid>
+{
+    public string? NewPath { get; init; }
+}

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

@@ -0,0 +1,20 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.NovelService.Models.Enums;
+
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class NovelDto : BaseDto<uint>
+{
+    public required PersonDto Author { get; init; }
+    public required string Url { get; init; }
+    public Language RawLanguage { get; init; }
+    public NovelStatus RawStatus { get; init; }
+    public NovelStatus? StatusOverride { get; init; }
+    public required SourceDto Source { get; init; }
+    public required string ExternalId { get; init; }
+    public required string Name { get; init; }
+    public required string Description { 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/NovelTagDto.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Service.NovelService.Models.Enums;
+
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class NovelTagDto : BaseDto<uint>
+{
+    public required string Key { get; init; }
+    public required string DisplayName { get; init; }
+    public TagType TagType { get; init; }
+    public SourceDto? Source { get; init; }
+}

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

@@ -0,0 +1,7 @@
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class PersonDto : BaseDto<uint>
+{
+    public required string Name { get; init; }
+    public string? ExternalUrl { get; init; }
+}

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

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.NovelService.Models.DTOs;
+
+public class SourceDto : BaseDto<uint>
+{
+    public required string Name { get; init; }
+    public required string Key { get; init; }
+    public required string Url { 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

@@ -5,5 +5,6 @@ namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
 public class ChapterPullRequestedEvent : IIntegrationEvent
 {
     public uint NovelId { get; set; }
-    public uint ChapterNumber { get; set; }
+    public uint VolumeId { get; set; }
+    public uint ChapterOrder { get; set; }
 }

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

@@ -1,9 +1,11 @@
+using System.ComponentModel.DataAnnotations.Schema;
 using FictionArchive.Service.NovelService.Models.Images;
 using FictionArchive.Service.NovelService.Models.Localization;
 using FictionArchive.Service.Shared.Models;
 
 namespace FictionArchive.Service.NovelService.Models.Novels;
 
+[Table("Chapter")]
 public class Chapter : BaseEntity<uint>
 {
     public uint Revision { get; set; }
@@ -15,4 +17,10 @@ public class Chapter : BaseEntity<uint>
     
     // Images appearing in this chapter.
     public List<Image> Images { get; set; }
+    
+    #region Navigation Properties
+
+    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

@@ -62,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/EventHandlers/ChapterPullRequestedEventHandler.cs

@@ -14,6 +14,6 @@ public class ChapterPullRequestedEventHandler : IIntegrationEventHandler<Chapter
 
     public async Task Handle(ChapterPullRequestedEvent @event)
     {
-        await _novelUpdateService.PullChapterContents(@event.NovelId, @event.ChapterNumber);
+        await _novelUpdateService.PullChapterContents(@event.NovelId, @event.VolumeId, @event.ChapterOrder);
     }
 }

FictionArchive.Service.NovelService/Services/NovelServiceDbContext.cs

@@ -10,10 +10,31 @@ 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; }
     public DbSet<NovelTag> Tags { get; set; }
     public DbSet<LocalizationKey> LocalizationKeys { get; set; }
     public DbSet<LocalizationRequest> LocalizationRequests { get; set; }
     public DbSet<Image> Images { get; set; }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        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,3 +1,4 @@
+using FictionArchive.Common.Enums;
 using FictionArchive.Service.FileService.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Configuration;
 using FictionArchive.Service.NovelService.Models.Enums;
@@ -31,14 +32,283 @@ public class NovelUpdateService
         _novelUpdateServiceConfiguration = novelUpdateServiceConfiguration.Value;
     }
 
+    #region Helper Methods
+
+    private async Task<Source> GetOrCreateSource(SourceDescriptor descriptor)
+    {
+        var existingSource = await _dbContext.Sources
+            .FirstOrDefaultAsync(s => s.Key == descriptor.Key);
+
+        if (existingSource != null)
+        {
+            return existingSource;
+        }
+
+        return new Source
+        {
+            Name = descriptor.Name,
+            Url = descriptor.Url,
+            Key = descriptor.Key
+        };
+    }
+
+    private Person GetOrCreateAuthor(
+        string authorName,
+        string? authorUrl,
+        Language rawLanguage,
+        Person? existingAuthor)
+    {
+        // Case 1: No existing author - create new
+        if (existingAuthor == null)
+        {
+            return new Person
+            {
+                Name = LocalizationKey.CreateFromText(authorName, rawLanguage),
+                ExternalUrl = authorUrl
+            };
+        }
+
+        // Case 2: ExternalUrl differs - create new Person
+        if (existingAuthor.ExternalUrl != authorUrl)
+        {
+            return new Person
+            {
+                Name = LocalizationKey.CreateFromText(authorName, rawLanguage),
+                ExternalUrl = authorUrl
+            };
+        }
+
+        // Case 3: Same URL - update name if different
+        UpdateLocalizationKey(existingAuthor.Name, authorName, rawLanguage);
+        return existingAuthor;
+    }
+
+    private static void UpdateLocalizationKey(LocalizationKey key, string newText, Language language)
+    {
+        var existingText = key.Texts.FirstOrDefault(t => t.Language == language);
+        if (existingText != null)
+        {
+            existingText.Text = newText;
+        }
+        else
+        {
+            key.Texts.Add(new LocalizationText
+            {
+                Language = language,
+                Text = newText
+            });
+        }
+    }
+
+    private void UpdateNovelMetadata(Novel novel, NovelMetadata metadata)
+    {
+        UpdateLocalizationKey(novel.Name, metadata.Name, metadata.RawLanguage);
+        UpdateLocalizationKey(novel.Description, metadata.Description, metadata.RawLanguage);
+        novel.RawStatus = metadata.RawStatus;
+        novel.Url = metadata.Url;
+    }
+
+    private async Task<List<NovelTag>> SynchronizeTags(
+        List<string> sourceTags,
+        List<string> systemTags,
+        Language rawLanguage)
+    {
+        var allTagKeys = sourceTags.Concat(systemTags).ToHashSet();
+
+        // Query existing tags from DB by Key
+        var existingTagsInDb = await _dbContext.Tags
+            .Where(t => allTagKeys.Contains(t.Key))
+            .ToListAsync();
+
+        var existingTagKeyMap = existingTagsInDb.ToDictionary(t => t.Key);
+        var result = new List<NovelTag>();
+
+        // Process source tags
+        foreach (var tagKey in sourceTags)
+        {
+            if (existingTagKeyMap.TryGetValue(tagKey, out var existingTag))
+            {
+                result.Add(existingTag);
+            }
+            else
+            {
+                result.Add(new NovelTag
+                {
+                    Key = tagKey,
+                    DisplayName = LocalizationKey.CreateFromText(tagKey, rawLanguage),
+                    TagType = TagType.External
+                });
+            }
+        }
+
+        // Process system tags
+        foreach (var tagKey in systemTags)
+        {
+            if (existingTagKeyMap.TryGetValue(tagKey, out var existingTag))
+            {
+                result.Add(existingTag);
+            }
+            else
+            {
+                result.Add(new NovelTag
+                {
+                    Key = tagKey,
+                    DisplayName = LocalizationKey.CreateFromText(tagKey, rawLanguage),
+                    TagType = TagType.System
+                });
+            }
+        }
+
+        return result;
+    }
+
+    private static List<Chapter> SynchronizeChapters(
+        List<ChapterMetadata> metadataChapters,
+        Language rawLanguage,
+        List<Chapter>? existingChapters)
+    {
+        existingChapters ??= new List<Chapter>();
+        var existingOrderSet = existingChapters.Select(c => c.Order).ToHashSet();
+
+        // Only add chapters that don't already exist (by Order)
+        var newChapters = metadataChapters
+            .Where(mc => !existingOrderSet.Contains(mc.Order))
+            .Select(mc => new Chapter
+            {
+                Order = mc.Order,
+                Url = mc.Url,
+                Revision = mc.Revision,
+                Name = LocalizationKey.CreateFromText(mc.Name, rawLanguage),
+                Body = new LocalizationKey
+                {
+                    Texts = new List<LocalizationText>()
+                }
+            })
+            .ToList();
+
+        // Combine existing chapters with new ones
+        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)
+    {
+        // Case 1: No new cover image - keep existing or null
+        if (newCoverData == null)
+        {
+            return (existingCoverImage, false);
+        }
+
+        // Case 2: New cover, no existing
+        if (existingCoverImage == null)
+        {
+            var newImage = new Image { OriginalPath = newCoverData.Url };
+            return (newImage, true);
+        }
+
+        // Case 3: Both exist - check if URL changed
+        if (existingCoverImage.OriginalPath != newCoverData.Url)
+        {
+            existingCoverImage.OriginalPath = newCoverData.Url;
+            existingCoverImage.NewPath = null; // Reset uploaded path
+            return (existingCoverImage, true);
+        }
+
+        // Case 4: Same cover URL - no change needed
+        return (existingCoverImage, false);
+    }
+
+    private async Task<Novel> CreateNewNovel(NovelMetadata metadata, Source source)
+    {
+        var author = new Person
+        {
+            Name = LocalizationKey.CreateFromText(metadata.AuthorName, metadata.RawLanguage),
+            ExternalUrl = metadata.AuthorUrl
+        };
+
+        var tags = await SynchronizeTags(
+            metadata.SourceTags,
+            metadata.SystemTags,
+            metadata.RawLanguage);
+
+        var volumes = SynchronizeVolumes(metadata.Volumes, metadata.RawLanguage, null);
+
+        var novel = new Novel
+        {
+            Author = author,
+            RawLanguage = metadata.RawLanguage,
+            Url = metadata.Url,
+            ExternalId = metadata.ExternalId,
+            CoverImage = metadata.CoverImage != null
+                ? new Image { OriginalPath = metadata.CoverImage.Url }
+                : null,
+            Volumes = volumes,
+            Description = LocalizationKey.CreateFromText(metadata.Description, metadata.RawLanguage),
+            Name = LocalizationKey.CreateFromText(metadata.Name, metadata.RawLanguage),
+            RawStatus = metadata.RawStatus,
+            Tags = tags,
+            Source = source
+        };
+
+        _dbContext.Novels.Add(novel);
+        return novel;
+    }
+
+    #endregion
+
     public async Task<Novel> ImportNovel(string novelUrl)
     {
+        // Step 1: Get metadata from source adapter
         NovelMetadata? metadata = null;
         foreach (ISourceAdapter sourceAdapter in _sourceAdapters)
         {
             if (await sourceAdapter.CanProcessNovel(novelUrl))
             {
                 metadata = await sourceAdapter.GetMetadata(novelUrl);
+                break; // Stop after finding adapter
             }
         }
 
@@ -47,91 +317,138 @@ public class NovelUpdateService
             throw new NotSupportedException("The provided novel url is currently unsupported.");
         }
 
-        var systemTags = metadata.SystemTags.Select(tag => new NovelTag()
-        {
-            Key = tag,
-            DisplayName = LocalizationKey.CreateFromText(tag, metadata.RawLanguage),
-            TagType = TagType.System
-        });
-        var sourceTags = metadata.SourceTags.Select(tag => new NovelTag()
-        {
-            Key = tag,
-            DisplayName = LocalizationKey.CreateFromText(tag, metadata.RawLanguage),
-            TagType = TagType.External
-        });
+        // Step 2: Resolve or create Source
+        var source = await GetOrCreateSource(metadata.SourceDescriptor);
 
-        var addedNovel = _dbContext.Novels.Add(new Novel()
+        // 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)
+            .Include(n => n.Source)
+            .Include(n => n.Name)
+            .ThenInclude(lk => lk.Texts)
+            .Include(n => n.Description)
+            .ThenInclude(lk => lk.Texts)
+            .Include(n => n.Tags)
+            .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 &&
+                n.Source.Key == metadata.SourceDescriptor.Key);
+
+        Novel novel;
+        bool shouldPublishCoverEvent;
+
+        if (existingNovel == null)
         {
-            Author = new Person()
-            {
-                Name = LocalizationKey.CreateFromText(metadata.AuthorName, metadata.RawLanguage),
-                ExternalUrl = metadata.AuthorUrl,
-            },
-            RawLanguage = metadata.RawLanguage,
-            Url = metadata.Url,
-            ExternalId = metadata.ExternalId,
-            CoverImage = metadata.CoverImage != null ? new Image()
-            {
-                OriginalPath = metadata.CoverImage.Url,
-            } : null,
-            Chapters = metadata.Chapters.Select(chapter =>
-            {
-                return new Chapter()
-                {
-                    Order = chapter.Order,
-                    Url = chapter.Url,
-                    Revision = chapter.Revision,
-                    Name = LocalizationKey.CreateFromText(chapter.Name, metadata.RawLanguage),
-                    Body = new LocalizationKey()
-                    {
-                        Texts = new List<LocalizationText>()
-                    }
-                };
-            }).ToList(),
-            Description = LocalizationKey.CreateFromText(metadata.Description, metadata.RawLanguage),
-            Name = LocalizationKey.CreateFromText(metadata.Name, metadata.RawLanguage),
-            RawStatus = metadata.RawStatus,
-            Tags = sourceTags.Concat(systemTags).ToList(),
-            Source = new Source()
-            {
-                Name = metadata.SourceDescriptor.Name,
-                Url = metadata.SourceDescriptor.Url,
-                Key = metadata.SourceDescriptor.Key,
-            }
-        });
+            // CREATE PATH: New novel
+            novel = await CreateNewNovel(metadata, source);
+            shouldPublishCoverEvent = novel.CoverImage != null;
+        }
+        else
+        {
+            // UPDATE PATH: Existing novel
+            novel = existingNovel;
+
+            // Update author
+            novel.Author = GetOrCreateAuthor(
+                metadata.AuthorName,
+                metadata.AuthorUrl,
+                metadata.RawLanguage,
+                existingNovel.Author);
+
+            // Update metadata (Name, Description, RawStatus)
+            UpdateNovelMetadata(novel, metadata);
+
+            // Synchronize tags (remove old, add new, reuse existing)
+            novel.Tags = await SynchronizeTags(
+                metadata.SourceTags,
+                metadata.SystemTags,
+                metadata.RawLanguage);
+
+            // Synchronize volumes (and their chapters)
+            novel.Volumes = SynchronizeVolumes(
+                metadata.Volumes,
+                metadata.RawLanguage,
+                existingNovel.Volumes);
+
+            // Handle cover image
+            (novel.CoverImage, shouldPublishCoverEvent) = HandleCoverImage(
+                metadata.CoverImage,
+                existingNovel.CoverImage);
+        }
+
         await _dbContext.SaveChangesAsync();
-        
-        // Signal request for cover image if present
-        if (addedNovel.Entity.CoverImage != null)
+
+        // Publish cover image event if needed
+        if (shouldPublishCoverEvent && novel.CoverImage != null && metadata.CoverImage != null)
         {
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent()
+            await _eventBus.Publish(new FileUploadRequestCreatedEvent
             {
-                RequestId = addedNovel.Entity.CoverImage.Id,
+                RequestId = novel.CoverImage.Id,
                 FileData = metadata.CoverImage.Data,
-                FilePath = $"Novels/{addedNovel.Entity.Id}/Images/cover.jpg"
+                FilePath = $"Novels/{novel.Id}/Images/cover.jpg"
             });
         }
-        
-        return addedNovel.Entity;
+
+        // Publish chapter pull events for chapters without body content
+        foreach (var volume in novel.Volumes)
+        {
+            var chaptersNeedingPull = volume.Chapters
+                .Where(c => c.Body?.Texts == null || !c.Body.Texts.Any())
+                .ToList();
+
+            foreach (var chapter in chaptersNeedingPull)
+            {
+                await _eventBus.Publish(new ChapterPullRequestedEvent
+                {
+                    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
@@ -196,6 +513,7 @@ public class NovelUpdateService
                 if (match != null)
                 {
                     match.Attributes["src"].Value = newUrl;
+                    bodyText.Text = chapterDoc.DocumentNode.OuterHtml;
                 }
             }
         }
@@ -213,14 +531,72 @@ public class NovelUpdateService
         return importNovelRequestEvent;
     }
 
-    public async Task<ChapterPullRequestedEvent> QueueChapterPull(uint novelId, uint chapterNumber)
+    public async Task<ChapterPullRequestedEvent> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
     {
         var chapterPullEvent = new ChapterPullRequestedEvent()
         {
             NovelId = novelId,
-            ChapterNumber = chapterNumber
+            VolumeId = volumeId,
+            ChapterOrder = chapterOrder
         };
         await _eventBus.Publish(chapterPullEvent);
         return chapterPullEvent;
     }
+
+    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
         };
         
@@ -132,16 +132,17 @@ 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,8 +171,26 @@ 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.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,10 +25,12 @@
             <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="Polly" Version="8.6.5" />
         <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     </ItemGroup>

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

@@ -69,6 +69,7 @@ public class RabbitMQEventBus : IEventBus, IHostedService
                 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);

FictionArchive.Service.TranslationService/GraphQL/Query.cs

@@ -1,9 +1,9 @@
 using FictionArchive.Service.TranslationService.Models;
-using FictionArchive.Service.TranslationService.Models.Database;
+using FictionArchive.Service.TranslationService.Models.DTOs;
 using FictionArchive.Service.TranslationService.Services.Database;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines;
 using HotChocolate.Authorization;
-using Microsoft.EntityFrameworkCore;
+using HotChocolate.Data;
 
 namespace FictionArchive.Service.TranslationService.GraphQL;
 
@@ -22,8 +22,20 @@ public class Query
     [UseProjection]
     [UseFiltering]
     [UseSorting]
-    public IQueryable<TranslationRequest> GetTranslationRequests(TranslationServiceDbContext dbContext)
+    public IQueryable<TranslationRequestDto> GetTranslationRequests(TranslationServiceDbContext dbContext)
     {
-        return dbContext.TranslationRequests.AsQueryable();
+        return dbContext.TranslationRequests.Select(request => new TranslationRequestDto
+        {
+            Id = request.Id,
+            CreatedTime = request.CreatedTime,
+            LastUpdatedTime = request.LastUpdatedTime,
+            OriginalText = request.OriginalText,
+            TranslatedText = request.TranslatedText,
+            From = request.From,
+            To = request.To,
+            TranslationEngineKey = request.TranslationEngineKey,
+            Status = request.Status,
+            BilledCharacterCount = request.BilledCharacterCount
+        });
     }
-}
+}

FictionArchive.Service.TranslationService/Models/DTOs/TranslationRequestDto.cs

@@ -0,0 +1,19 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.TranslationService.Models.Enums;
+using NodaTime;
+
+namespace FictionArchive.Service.TranslationService.Models.DTOs;
+
+public class TranslationRequestDto
+{
+    public Guid Id { get; init; }
+    public Instant CreatedTime { get; init; }
+    public Instant LastUpdatedTime { get; init; }
+    public required string OriginalText { get; init; }
+    public string? TranslatedText { get; init; }
+    public Language From { get; init; }
+    public Language To { get; init; }
+    public required string TranslationEngineKey { get; init; }
+    public TranslationRequestStatus Status { get; init; }
+    public uint BilledCharacterCount { get; init; }
+}

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

FictionArchive.Service.UserNovelDataService/FictionArchive.Service.UserNovelDataService.csproj

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

FictionArchive.Service.UserNovelDataService/GraphQL/Mutation.cs

@@ -0,0 +1,109 @@
+using System.Security.Claims;
+using FictionArchive.Service.UserNovelDataService.Models.Database;
+using FictionArchive.Service.UserNovelDataService.Models.DTOs;
+using FictionArchive.Service.UserNovelDataService.Services;
+using HotChocolate.Authorization;
+using HotChocolate.Types;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.GraphQL;
+
+public class Mutation
+{
+    [Authorize]
+    [Error<InvalidOperationException>]
+    public async Task<BookmarkPayload> UpsertBookmark(
+        UserNovelDataServiceDbContext dbContext,
+        ClaimsPrincipal claimsPrincipal,
+        UpsertBookmarkInput input)
+    {
+        var oAuthProviderId = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+        if (string.IsNullOrEmpty(oAuthProviderId))
+        {
+            throw new InvalidOperationException("Unable to determine current user identity");
+        }
+
+        var user = await dbContext.Users
+            .FirstOrDefaultAsync(u => u.OAuthProviderId == oAuthProviderId);
+
+        if (user == null)
+        {
+            // Auto-create user if not exists
+            user = new User { OAuthProviderId = oAuthProviderId };
+            dbContext.Users.Add(user);
+            await dbContext.SaveChangesAsync();
+        }
+
+        var existingBookmark = await dbContext.Bookmarks
+            .FirstOrDefaultAsync(b => b.UserId == user.Id && b.ChapterId == input.ChapterId);
+
+        if (existingBookmark != null)
+        {
+            // Update existing
+            existingBookmark.Description = input.Description;
+        }
+        else
+        {
+            // Create new
+            existingBookmark = new Bookmark
+            {
+                UserId = user.Id,
+                NovelId = input.NovelId,
+                ChapterId = input.ChapterId,
+                Description = input.Description
+            };
+            dbContext.Bookmarks.Add(existingBookmark);
+        }
+
+        await dbContext.SaveChangesAsync();
+
+        return new BookmarkPayload
+        {
+            Success = true,
+            Bookmark = new BookmarkDto
+            {
+                Id = existingBookmark.Id,
+                ChapterId = existingBookmark.ChapterId,
+                NovelId = existingBookmark.NovelId,
+                Description = existingBookmark.Description,
+                CreatedTime = existingBookmark.CreatedTime
+            }
+        };
+    }
+
+    [Authorize]
+    [Error<InvalidOperationException>]
+    public async Task<BookmarkPayload> RemoveBookmark(
+        UserNovelDataServiceDbContext dbContext,
+        ClaimsPrincipal claimsPrincipal,
+        uint chapterId)
+    {
+        var oAuthProviderId = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+        if (string.IsNullOrEmpty(oAuthProviderId))
+        {
+            throw new InvalidOperationException("Unable to determine current user identity");
+        }
+
+        var user = await dbContext.Users
+            .AsNoTracking()
+            .FirstOrDefaultAsync(u => u.OAuthProviderId == oAuthProviderId);
+
+        if (user == null)
+        {
+            return new BookmarkPayload { Success = false };
+        }
+
+        var bookmark = await dbContext.Bookmarks
+            .FirstOrDefaultAsync(b => b.UserId == user.Id && b.ChapterId == chapterId);
+
+        if (bookmark == null)
+        {
+            return new BookmarkPayload { Success = false };
+        }
+
+        dbContext.Bookmarks.Remove(bookmark);
+        await dbContext.SaveChangesAsync();
+
+        return new BookmarkPayload { Success = true };
+    }
+}

FictionArchive.Service.UserNovelDataService/GraphQL/Query.cs

@@ -0,0 +1,45 @@
+using System.Security.Claims;
+using FictionArchive.Service.UserNovelDataService.Models.DTOs;
+using FictionArchive.Service.UserNovelDataService.Services;
+using HotChocolate.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.GraphQL;
+
+public class Query
+{
+    [Authorize]
+    public async Task<IQueryable<BookmarkDto>> GetBookmarks(
+        UserNovelDataServiceDbContext dbContext,
+        ClaimsPrincipal claimsPrincipal,
+        uint novelId)
+    {
+        var oAuthProviderId = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+        if (string.IsNullOrEmpty(oAuthProviderId))
+        {
+            return new List<BookmarkDto>().AsQueryable();
+        }
+
+        var user = await dbContext.Users
+            .AsNoTracking()
+            .FirstOrDefaultAsync(u => u.OAuthProviderId == oAuthProviderId);
+
+        if (user == null)
+        {
+            return new List<BookmarkDto>().AsQueryable();
+        }
+
+        return dbContext.Bookmarks
+            .AsNoTracking()
+            .Where(b => b.UserId == user.Id && b.NovelId == novelId)
+            .OrderByDescending(b => b.CreatedTime)
+            .Select(b => new BookmarkDto
+            {
+                Id = b.Id,
+                ChapterId = b.ChapterId,
+                NovelId = b.NovelId,
+                Description = b.Description,
+                CreatedTime = b.CreatedTime
+            });
+    }
+}

FictionArchive.Service.UserNovelDataService/Migrations/20251230181559_AddBookmarks.Designer.cs

@@ -0,0 +1,99 @@
+// <auto-generated />
+using System;
+using FictionArchive.Service.UserNovelDataService.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.UserNovelDataService.Migrations
+{
+    [DbContext(typeof(UserNovelDataServiceDbContext))]
+    [Migration("20251230181559_AddBookmarks")]
+    partial class AddBookmarks
+    {
+        /// <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.UserNovelDataService.Models.Database.Bookmark", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<long>("ChapterId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long>("NovelId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ChapterId")
+                        .IsUnique();
+
+                    b.HasIndex("UserId", "NovelId");
+
+                    b.ToTable("Bookmarks");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.UserNovelDataService.Models.Database.User", 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.Property<string>("OAuthProviderId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.UserNovelDataService.Models.Database.Bookmark", b =>
+                {
+                    b.HasOne("FictionArchive.Service.UserNovelDataService.Models.Database.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FictionArchive.Service.UserNovelDataService/Migrations/20251230181559_AddBookmarks.cs

@@ -0,0 +1,76 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FictionArchive.Service.UserNovelDataService.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBookmarks : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Users",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    OAuthProviderId = table.Column<string>(type: "text", 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_Users", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Bookmarks",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    UserId = table.Column<Guid>(type: "uuid", nullable: false),
+                    ChapterId = table.Column<long>(type: "bigint", nullable: false),
+                    NovelId = table.Column<long>(type: "bigint", nullable: false),
+                    Description = table.Column<string>(type: "text", nullable: true),
+                    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_Bookmarks", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Bookmarks_Users_UserId",
+                        column: x => x.UserId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Bookmarks_UserId_ChapterId",
+                table: "Bookmarks",
+                columns: new[] { "UserId", "ChapterId" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Bookmarks_UserId_NovelId",
+                table: "Bookmarks",
+                columns: new[] { "UserId", "NovelId" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Bookmarks");
+
+            migrationBuilder.DropTable(
+                name: "Users");
+        }
+    }
+}

FictionArchive.Service.UserNovelDataService/Migrations/UserNovelDataServiceDbContextModelSnapshot.cs

@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using FictionArchive.Service.UserNovelDataService.Services;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FictionArchive.Service.UserNovelDataService.Migrations
+{
+    [DbContext(typeof(UserNovelDataServiceDbContext))]
+    partial class UserNovelDataServiceDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.11")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("FictionArchive.Service.UserNovelDataService.Models.Database.Bookmark", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<long>("ChapterId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long>("NovelId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ChapterId")
+                        .IsUnique();
+
+                    b.HasIndex("UserId", "NovelId");
+
+                    b.ToTable("Bookmarks");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.UserNovelDataService.Models.Database.User", 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.Property<string>("OAuthProviderId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.UserNovelDataService.Models.Database.Bookmark", b =>
+                {
+                    b.HasOne("FictionArchive.Service.UserNovelDataService.Models.Database.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FictionArchive.Service.UserNovelDataService/Models/DTOs/BookmarkDto.cs

@@ -0,0 +1,12 @@
+using NodaTime;
+
+namespace FictionArchive.Service.UserNovelDataService.Models.DTOs;
+
+public class BookmarkDto
+{
+    public int Id { get; init; }
+    public uint ChapterId { get; init; }
+    public uint NovelId { get; init; }
+    public string? Description { get; init; }
+    public Instant CreatedTime { get; init; }
+}

FictionArchive.Service.UserNovelDataService/Models/DTOs/BookmarkPayload.cs

@@ -0,0 +1,7 @@
+namespace FictionArchive.Service.UserNovelDataService.Models.DTOs;
+
+public class BookmarkPayload
+{
+    public BookmarkDto? Bookmark { get; init; }
+    public bool Success { get; init; }
+}

FictionArchive.Service.UserNovelDataService/Models/DTOs/UpsertBookmarkInput.cs

@@ -0,0 +1,3 @@
+namespace FictionArchive.Service.UserNovelDataService.Models.DTOs;
+
+public record UpsertBookmarkInput(uint NovelId, uint ChapterId, string? Description);

FictionArchive.Service.UserNovelDataService/Models/Database/Bookmark.cs

@@ -0,0 +1,14 @@
+using FictionArchive.Service.Shared.Models;
+
+namespace FictionArchive.Service.UserNovelDataService.Models.Database;
+
+public class Bookmark : BaseEntity<int>
+{
+    public Guid UserId { get; set; }
+    public virtual User User { get; set; } = null!;
+
+    public uint ChapterId { get; set; }
+    public uint NovelId { get; set; }
+
+    public string? Description { get; set; }
+}

FictionArchive.Service.UserNovelDataService/Models/Database/Chapter.cs

@@ -0,0 +1,8 @@
+using FictionArchive.Service.Shared.Models;
+
+namespace FictionArchive.Service.UserNovelDataService.Models.Database;
+
+public class Chapter : BaseEntity<uint>
+{
+    
+}

FictionArchive.Service.UserNovelDataService/Models/Database/Novel.cs

@@ -0,0 +1,8 @@
+using FictionArchive.Service.Shared.Models;
+
+namespace FictionArchive.Service.UserNovelDataService.Models.Database;
+
+public class Novel : BaseEntity<uint>
+{
+    public virtual ICollection<Volume> Volumes { get; set; }
+}

FictionArchive.Service.UserNovelDataService/Models/Database/User.cs

@@ -0,0 +1,8 @@
+using FictionArchive.Service.Shared.Models;
+
+namespace FictionArchive.Service.UserNovelDataService.Models.Database;
+
+public class User : BaseEntity<Guid>
+{
+    public required string OAuthProviderId { get; set; }
+}

FictionArchive.Service.UserNovelDataService/Models/Database/Volume.cs

@@ -0,0 +1,8 @@
+using FictionArchive.Service.Shared.Models;
+
+namespace FictionArchive.Service.UserNovelDataService.Models.Database;
+
+public class Volume : BaseEntity<uint>
+{
+    public virtual ICollection<Chapter> Chapters { get; set; }
+}

FictionArchive.Service.UserNovelDataService/Program.cs

@@ -0,0 +1,75 @@
+using FictionArchive.Common.Extensions;
+using FictionArchive.Service.Shared;
+using FictionArchive.Service.Shared.Extensions;
+using FictionArchive.Service.Shared.Services.EventBus.Implementations;
+using FictionArchive.Service.UserNovelDataService.GraphQL;
+using FictionArchive.Service.UserNovelDataService.Services;
+
+namespace FictionArchive.Service.UserNovelDataService;
+
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+        
+        var isSchemaExport = SchemaExportDetector.IsSchemaExportMode(args);
+
+        builder.AddLocalAppsettings();
+        
+        builder.Services.AddMemoryCache();
+        builder.Services.AddHealthChecks();
+        
+        #region Event Bus
+
+        if (!isSchemaExport)
+        {
+            builder.Services.AddRabbitMQ(opt =>
+            {
+                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
+            });
+        }
+
+        #endregion
+        
+        #region GraphQL
+
+        builder.Services.AddDefaultGraphQl<Query, Mutation>()
+            .AddAuthorization();
+        
+        #endregion
+        
+        #region Database
+
+        builder.Services.RegisterDbContext<UserNovelDataServiceDbContext>(
+            builder.Configuration.GetConnectionString("DefaultConnection"),
+            skipInfrastructure: isSchemaExport);
+        
+        #endregion
+        
+        // Authentication & Authorization
+        builder.Services.AddOidcAuthentication(builder.Configuration);
+        builder.Services.AddFictionArchiveAuthorization();
+        
+        var app = builder.Build();
+        
+        // Update database (skip in schema export mode)
+        if (!isSchemaExport)
+        {
+            using var scope = app.Services.CreateScope();
+            var dbContext = scope.ServiceProvider.GetRequiredService<UserNovelDataServiceDbContext>();
+            dbContext.UpdateDatabase();
+        }
+        
+        app.UseHttpsRedirection();
+
+        app.MapHealthChecks("/healthz");
+
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.MapGraphQL();
+
+        app.RunWithGraphQLCommands(args);
+    }
+}

FictionArchive.Service.UserNovelDataService/Properties/launchSettings.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:26318",
+      "sslPort": 44303
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5130",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7298;http://localhost:5130",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

FictionArchive.Service.UserNovelDataService/Services/UserNovelDataServiceDbContext.cs

@@ -0,0 +1,35 @@
+using FictionArchive.Service.Shared.Services.Database;
+using FictionArchive.Service.UserNovelDataService.Models.Database;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.Services;
+
+public class UserNovelDataServiceDbContext : FictionArchiveDbContext
+{
+    public DbSet<User> Users { get; set; }
+    public DbSet<Bookmark> Bookmarks { get; set; }
+
+    public UserNovelDataServiceDbContext(DbContextOptions options, ILogger<UserNovelDataServiceDbContext> logger) : base(options, logger)
+    {
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        modelBuilder.Entity<Bookmark>(entity =>
+        {
+            // Unique constraint: one bookmark per chapter per user
+            entity.HasIndex(b => new { b.UserId, b.ChapterId }).IsUnique();
+
+            // Index for efficient "get bookmarks for novel" queries
+            entity.HasIndex(b => new { b.UserId, b.NovelId });
+
+            // User relationship
+            entity.HasOne(b => b.User)
+                .WithMany()
+                .HasForeignKey(b => b.UserId)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+    }
+}

FictionArchive.Service.UserNovelDataService/appsettings.Development.json

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

FictionArchive.Service.UserNovelDataService/appsettings.json

@@ -0,0 +1,26 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": "Host=localhost;Database=FictionArchive_UserNovelDataService;Username=postgres;password=postgres"
+  },
+  "RabbitMQ": {
+    "ConnectionString": "amqp://localhost",
+    "ClientIdentifier": "UserNovelDataService"
+  },
+  "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.UserNovelDataService/subgraph-config.json

@@ -0,0 +1,6 @@
+{
+  "subgraph": "UserNovelData",
+  "http": {
+    "baseAddress": "https://localhost:7298/graphql"
+  }
+}

FictionArchive.Service.UserService.Tests/FictionArchive.Service.UserService.Tests.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FictionArchive.Service.UserService\FictionArchive.Service.UserService.csproj" />
+  </ItemGroup>
+
+</Project>

FictionArchive.Service.UserService.Tests/UserManagementServiceTests.cs

@@ -0,0 +1,329 @@
+using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.UserService.Models.Database;
+using FictionArchive.Service.UserService.Services;
+using FictionArchive.Service.UserService.Services.AuthenticationClient;
+using FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
+using FluentAssertions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging.Abstractions;
+using NSubstitute;
+using Xunit;
+
+namespace FictionArchive.Service.UserService.Tests;
+
+public class UserManagementServiceTests
+{
+    #region Helper Methods
+
+    private static UserServiceDbContext CreateDbContext()
+    {
+        var options = new DbContextOptionsBuilder<UserServiceDbContext>()
+            .UseInMemoryDatabase($"UserManagementServiceTests-{Guid.NewGuid()}")
+            .Options;
+
+        return new UserServiceDbContext(options, NullLogger<UserServiceDbContext>.Instance);
+    }
+
+    private static UserManagementService CreateService(
+        UserServiceDbContext dbContext,
+        IAuthenticationServiceClient authClient,
+        IEventBus? eventBus = null)
+    {
+        return new UserManagementService(
+            dbContext,
+            NullLogger<UserManagementService>.Instance,
+            authClient,
+            eventBus ?? Substitute.For<IEventBus>());
+    }
+
+    private static User CreateTestUser(string username, string email, int availableInvites = 5)
+    {
+        return new User
+        {
+            Username = username,
+            Email = email,
+            OAuthProviderId = Guid.NewGuid().ToString(),
+            Disabled = false,
+            AvailableInvites = availableInvites
+        };
+    }
+
+    #endregion
+
+    #region InviteUserAsync Tests
+
+    [Fact]
+    public async Task InviteUserAsync_WithValidInviter_CreatesUserAndDecrementsInvites()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 3);
+        dbContext.Users.Add(inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        authClient.CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
+            .Returns(new AuthentikUserResponse { Pk = 123, Uid = "authentik-uid-456" });
+        authClient.SendRecoveryEmailAsync(Arg.Any<int>()).Returns(true);
+
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "new@test.com", "newuser");
+
+        // Assert
+        result.Should().NotBeNull();
+        result!.Username.Should().Be("newuser");
+        result.Email.Should().Be("new@test.com");
+        result.InviterId.Should().Be(inviter.Id);
+        result.AvailableInvites.Should().Be(0);
+        inviter.AvailableInvites.Should().Be(2);
+
+        await authClient.Received(1).CreateUserAsync("newuser", "new@test.com", "newuser");
+        await authClient.Received(1).SendRecoveryEmailAsync(123);
+    }
+
+    [Fact]
+    public async Task InviteUserAsync_WithNoAvailableInvites_ReturnsNull()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 0);
+        dbContext.Users.Add(inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "new@test.com", "newuser");
+
+        // Assert
+        result.Should().BeNull();
+        await authClient.DidNotReceive().CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task InviteUserAsync_WithDuplicateEmail_ReturnsNull()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var existingUser = CreateTestUser("existing", "existing@test.com");
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 3);
+        dbContext.Users.AddRange(existingUser, inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "existing@test.com", "newuser");
+
+        // Assert
+        result.Should().BeNull();
+        await authClient.DidNotReceive().CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+        inviter.AvailableInvites.Should().Be(3); // Not decremented
+    }
+
+    [Fact]
+    public async Task InviteUserAsync_WithDuplicateUsername_ReturnsNull()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var existingUser = CreateTestUser("existinguser", "existing@test.com");
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 3);
+        dbContext.Users.AddRange(existingUser, inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "new@test.com", "existinguser");
+
+        // Assert
+        result.Should().BeNull();
+        await authClient.DidNotReceive().CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+        inviter.AvailableInvites.Should().Be(3); // Not decremented
+    }
+
+    [Fact]
+    public async Task InviteUserAsync_WhenAuthentikFails_ReturnsNull()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 3);
+        dbContext.Users.Add(inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        authClient.CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
+            .Returns((AuthentikUserResponse?)null);
+
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "new@test.com", "newuser");
+
+        // Assert
+        result.Should().BeNull();
+        await authClient.DidNotReceive().SendRecoveryEmailAsync(Arg.Any<int>());
+
+        // Verify no user was added to the database
+        var usersInDb = await dbContext.Users.ToListAsync();
+        usersInDb.Should().HaveCount(1); // Only the inviter
+        inviter.AvailableInvites.Should().Be(3); // Not decremented
+    }
+
+    [Fact]
+    public async Task InviteUserAsync_WhenRecoveryEmailFails_StillCreatesUser()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 3);
+        dbContext.Users.Add(inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        authClient.CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
+            .Returns(new AuthentikUserResponse { Pk = 123, Uid = "authentik-uid-456" });
+        authClient.SendRecoveryEmailAsync(Arg.Any<int>()).Returns(false); // Email fails
+
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "new@test.com", "newuser");
+
+        // Assert - User should still be created despite email failure
+        result.Should().NotBeNull();
+        result!.Username.Should().Be("newuser");
+        inviter.AvailableInvites.Should().Be(2);
+
+        // Verify user was added to database
+        var usersInDb = await dbContext.Users.ToListAsync();
+        usersInDb.Should().HaveCount(2);
+    }
+
+    [Fact]
+    public async Task InviteUserAsync_SetsCorrectUserProperties()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var inviter = CreateTestUser("inviter", "inviter@test.com", availableInvites: 5);
+        dbContext.Users.Add(inviter);
+        await dbContext.SaveChangesAsync();
+
+        var authentikUid = "authentik-uid-789";
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        authClient.CreateUserAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
+            .Returns(new AuthentikUserResponse { Pk = 456, Uid = authentikUid });
+        authClient.SendRecoveryEmailAsync(Arg.Any<int>()).Returns(true);
+
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.InviteUserAsync(inviter, "newuser@test.com", "newusername");
+
+        // Assert
+        result.Should().NotBeNull();
+        result!.Username.Should().Be("newusername");
+        result.Email.Should().Be("newuser@test.com");
+        result.OAuthProviderId.Should().Be(authentikUid);
+        result.InviterId.Should().Be(inviter.Id);
+        result.AvailableInvites.Should().Be(0);
+        result.Disabled.Should().BeFalse();
+        result.Id.Should().NotBeEmpty();
+    }
+
+    #endregion
+
+    #region GetUserByOAuthProviderIdAsync Tests
+
+    [Fact]
+    public async Task GetUserByOAuthProviderIdAsync_WithExistingUser_ReturnsUser()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var oAuthProviderId = "oauth-provider-123";
+        var user = new User
+        {
+            Username = "testuser",
+            Email = "test@test.com",
+            OAuthProviderId = oAuthProviderId,
+            Disabled = false,
+            AvailableInvites = 5
+        };
+        dbContext.Users.Add(user);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.GetUserByOAuthProviderIdAsync(oAuthProviderId);
+
+        // Assert
+        result.Should().NotBeNull();
+        result!.Id.Should().Be(user.Id);
+        result.Username.Should().Be("testuser");
+        result.OAuthProviderId.Should().Be(oAuthProviderId);
+    }
+
+    [Fact]
+    public async Task GetUserByOAuthProviderIdAsync_WithNonExistingUser_ReturnsNull()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.GetUserByOAuthProviderIdAsync("non-existing-id");
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    #endregion
+
+    #region GetUsers Tests
+
+    [Fact]
+    public async Task GetUsers_ReturnsAllUsers()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var user1 = CreateTestUser("user1", "user1@test.com");
+        var user2 = CreateTestUser("user2", "user2@test.com");
+        var user3 = CreateTestUser("user3", "user3@test.com");
+        dbContext.Users.AddRange(user1, user2, user3);
+        await dbContext.SaveChangesAsync();
+
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.GetUsers().ToListAsync();
+
+        // Assert
+        result.Should().HaveCount(3);
+        result.Select(u => u.Username).Should().BeEquivalentTo(new[] { "user1", "user2", "user3" });
+    }
+
+    [Fact]
+    public async Task GetUsers_WithEmptyDb_ReturnsEmptyQueryable()
+    {
+        // Arrange
+        using var dbContext = CreateDbContext();
+        var authClient = Substitute.For<IAuthenticationServiceClient>();
+        var service = CreateService(dbContext, authClient);
+
+        // Act
+        var result = await service.GetUsers().ToListAsync();
+
+        // Assert
+        result.Should().BeEmpty();
+    }
+
+    #endregion
+}

FictionArchive.Service.UserService/FictionArchive.Service.UserService.csproj

@@ -22,6 +22,12 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Models\IntegrationEvents\" />
+      <Folder Include="Services\EventHandlers\" />
     </ItemGroup>
 
 </Project>

FictionArchive.Service.UserService/GraphQL/Mutation.cs

@@ -1,16 +1,53 @@
-using FictionArchive.Service.Shared.Constants;
-using FictionArchive.Service.UserService.Models.Database;
+using System.Security.Claims;
+using FictionArchive.Service.UserService.Models.DTOs;
 using FictionArchive.Service.UserService.Services;
 using HotChocolate.Authorization;
+using HotChocolate.Types;
 
 namespace FictionArchive.Service.UserService.GraphQL;
 
 public class Mutation
 {
-    [Authorize(Roles = [AuthorizationConstants.Roles.Admin])]
-    public async Task<User> RegisterUser(string username, string email, string oAuthProviderId,
-        string? inviterOAuthProviderId, UserManagementService userManagementService)
+    [Authorize]
+    [Error<InvalidOperationException>]
+    public async Task<UserDto> InviteUser(
+        string email,
+        string username,
+        UserManagementService userManagementService,
+        ClaimsPrincipal claimsPrincipal)
     {
-        return await userManagementService.RegisterUser(username, email, oAuthProviderId, inviterOAuthProviderId);
+        // Get the current user's OAuth provider ID from claims
+        var oAuthProviderId = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+        if (string.IsNullOrEmpty(oAuthProviderId))
+        {
+            throw new InvalidOperationException("Unable to determine current user identity");
+        }
+
+        // Get the inviter from the database
+        var inviter = await userManagementService.GetUserByOAuthProviderIdAsync(oAuthProviderId);
+        if (inviter == null)
+        {
+            throw new InvalidOperationException("Current user not found in the system");
+        }
+
+        // Invite the new user
+        var newUser = await userManagementService.InviteUserAsync(inviter, email, username);
+        if (newUser == null)
+        {
+            throw new InvalidOperationException(
+                "Failed to invite user. Either you have no available invites, or the email/username is already in use.");
+        }
+
+        return new UserDto
+        {
+            Id = newUser.Id,
+            CreatedTime = newUser.CreatedTime,
+            LastUpdatedTime = newUser.LastUpdatedTime,
+            Username = newUser.Username,
+            Email = newUser.Email,
+            Disabled = newUser.Disabled,
+            AvailableInvites = newUser.AvailableInvites,
+            InviterId = newUser.InviterId
+        };
     }
-}
+}

FictionArchive.Service.UserService/GraphQL/Query.cs

@@ -1,14 +1,43 @@
-using FictionArchive.Service.UserService.Models.Database;
+using System.Security.Claims;
+using FictionArchive.Service.UserService.Models.DTOs;
 using FictionArchive.Service.UserService.Services;
 using HotChocolate.Authorization;
+using HotChocolate.Data;
 
 namespace FictionArchive.Service.UserService.GraphQL;
 
 public class Query
 {
     [Authorize]
-    public async Task<IQueryable<User>> GetUsers(UserManagementService userManagementService)
+    [UseProjection]
+    [UseFirstOrDefault]
+    public IQueryable<UserDto> GetCurrentUser(
+        UserServiceDbContext dbContext,
+        ClaimsPrincipal claimsPrincipal)
     {
-        return userManagementService.GetUsers();
+        var oAuthProviderId = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+        if (string.IsNullOrEmpty(oAuthProviderId))
+        {
+            return Enumerable.Empty<UserDto>().AsQueryable();
+        }
+
+        return dbContext.Users
+            .Where(u => u.OAuthProviderId == oAuthProviderId)
+            .Select(u => new UserDto
+            {
+                Id = u.Id,
+                CreatedTime = u.CreatedTime,
+                LastUpdatedTime = u.LastUpdatedTime,
+                Username = u.Username,
+                Email = u.Email,
+                Disabled = u.Disabled,
+                AvailableInvites = u.AvailableInvites,
+                InviterId = u.InviterId,
+                InvitedUsers = u.InvitedUsers.Select(iu => new InvitedUserDto
+                {
+                    Username = iu.Username,
+                    Email = iu.Email
+                }).ToList()
+            });
     }
-}
+}

FictionArchive.Service.UserService/Migrations/20251229151921_AddAvailableInvites.Designer.cs

@@ -0,0 +1,83 @@
+// <auto-generated />
+using System;
+using FictionArchive.Service.UserService.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.UserService.Migrations
+{
+    [DbContext(typeof(UserServiceDbContext))]
+    [Migration("20251229151921_AddAvailableInvites")]
+    partial class AddAvailableInvites
+    {
+        /// <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.UserService.Models.Database.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AvailableInvites")
+                        .HasColumnType("integer");
+
+                    b.Property<Instant>("CreatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("Disabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("InviterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("OAuthProviderId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InviterId");
+
+                    b.HasIndex("OAuthProviderId")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("FictionArchive.Service.UserService.Models.Database.User", b =>
+                {
+                    b.HasOne("FictionArchive.Service.UserService.Models.Database.User", "Inviter")
+                        .WithMany()
+                        .HasForeignKey("InviterId");
+
+                    b.Navigation("Inviter");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FictionArchive.Service.UserService/Migrations/20251229151921_AddAvailableInvites.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FictionArchive.Service.UserService.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAvailableInvites : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "AvailableInvites",
+                table: "Users",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AvailableInvites",
+                table: "Users");
+        }
+    }
+}

FictionArchive.Service.UserService/Migrations/UserServiceDbContextModelSnapshot.cs

@@ -29,6 +29,9 @@ namespace FictionArchive.Service.UserService.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
+                    b.Property<int>("AvailableInvites")
+                        .HasColumnType("integer");
+
                     b.Property<Instant>("CreatedTime")
                         .HasColumnType("timestamp with time zone");
 

FictionArchive.Service.UserService/Models/DTOs/InvitedUserDto.cs

@@ -0,0 +1,7 @@
+namespace FictionArchive.Service.UserService.Models.DTOs;
+
+public class InvitedUserDto
+{
+    public required string Username { get; init; }
+    public required string Email { get; init; }
+}

FictionArchive.Service.UserService/Models/DTOs/UserDto.cs

@@ -0,0 +1,17 @@
+using NodaTime;
+
+namespace FictionArchive.Service.UserService.Models.DTOs;
+
+public class UserDto
+{
+    public Guid Id { get; init; }
+    public Instant CreatedTime { get; init; }
+    public Instant LastUpdatedTime { get; init; }
+
+    public required string Username { get; init; }
+    public required string Email { get; init; }
+    public bool Disabled { get; init; }
+    public int AvailableInvites { get; init; }
+    public Guid? InviterId { get; init; }
+    public List<InvitedUserDto>? InvitedUsers { get; init; }
+}

FictionArchive.Service.UserService/Models/Database/User.cs

@@ -6,15 +6,14 @@ namespace FictionArchive.Service.UserService.Models.Database;
 [Index(nameof(OAuthProviderId), IsUnique = true)]
 public class User : BaseEntity<Guid>
 {
-    public string Username { get; set; }
-    public string Email { get; set; }
-    public string OAuthProviderId { get; set; }
-    
-    
+    public required string Username { get; set; }
+    public required string Email { get; set; }
+    public required string OAuthProviderId { get; set; }
     public bool Disabled { get; set; }
-    
-    /// <summary>
-    /// The user that generated an invite used by this user.
-    /// </summary>
+    public int AvailableInvites { get; set; } = 0;
+
+    // Navigation properties
+    public Guid? InviterId { get; set; }
     public User? Inviter { get; set; }
+    public ICollection<User> InvitedUsers { get; set; } = new List<User>();
 }

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

@@ -1,16 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserService.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.UserService/Models/IntegrationEvents/UserInvitedEvent.cs

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

FictionArchive.Service.UserService/Program.cs

@@ -1,11 +1,12 @@
+using System.Net.Http.Headers;
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
 using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.UserService.GraphQL;
-using FictionArchive.Service.UserService.Models.IntegrationEvents;
 using FictionArchive.Service.UserService.Services;
-using FictionArchive.Service.UserService.Services.EventHandlers;
+using FictionArchive.Service.UserService.Services.AuthenticationClient;
+using FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
 
 namespace FictionArchive.Service.UserService;
 
@@ -25,19 +26,34 @@ public class Program
             builder.Services.AddRabbitMQ(opt =>
             {
                 builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            })
-            .Subscribe<AuthUserAddedEvent, AuthUserAddedEventHandler>();
+            });
         }
 
         #endregion
-        
+
         #region GraphQL
-        
+
         builder.Services.AddDefaultGraphQl<Query, Mutation>()
             .AddAuthorization();
-        
+
         #endregion
-        
+
+        #region Authentik Client
+
+        builder.Services.Configure<AuthentikConfiguration>(
+            builder.Configuration.GetSection("Authentik"));
+
+        var authentikConfig = builder.Configuration.GetSection("Authentik").Get<AuthentikConfiguration>();
+        builder.Services.AddHttpClient<IAuthenticationServiceClient, AuthentikClient>(client =>
+            {
+                client.BaseAddress = new Uri(authentikConfig?.BaseUrl ?? "https://localhost");
+                client.DefaultRequestHeaders.Authorization =
+                    new AuthenticationHeaderValue("Bearer", authentikConfig?.ApiToken ?? "");
+            })
+            .AddStandardResilienceHandler();
+
+        #endregion
+
         builder.Services.RegisterDbContext<UserServiceDbContext>(
             builder.Configuration.GetConnectionString("DefaultConnection"),
             skipInfrastructure: isSchemaExport);

FictionArchive.Service.UserService/Services/AuthenticationClient/Authentik/AuthentikAddUserRequest.cs

@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+
+namespace FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
+
+public class AuthentikAddUserRequest
+{
+    [JsonProperty("username")]
+    public required string Username { get; set; }
+
+    [JsonProperty("name")]
+    public required string DisplayName { get; set; }
+
+    [JsonProperty("email")]
+    public required string Email { get; set; }
+
+    [JsonProperty("is_active")]
+    public bool IsActive { get; set; } = true;
+
+    [JsonProperty("type")]
+    public string Type { get; } = "external";
+}

FictionArchive.Service.UserService/Services/AuthenticationClient/Authentik/AuthentikClient.cs

@@ -0,0 +1,88 @@
+using System.Text;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
+
+public class AuthentikClient : IAuthenticationServiceClient
+{
+    private readonly HttpClient _httpClient;
+    private readonly ILogger<AuthentikClient> _logger;
+    private readonly AuthentikConfiguration _configuration;
+
+    public AuthentikClient(
+        HttpClient httpClient,
+        ILogger<AuthentikClient> logger,
+        IOptions<AuthentikConfiguration> configuration)
+    {
+        _httpClient = httpClient;
+        _logger = logger;
+        _configuration = configuration.Value;
+    }
+
+    public async Task<AuthentikUserResponse?> CreateUserAsync(string username, string email, string displayName)
+    {
+        var request = new AuthentikAddUserRequest
+        {
+            Username = username,
+            Email = email,
+            DisplayName = displayName,
+            IsActive = true
+        };
+
+        try
+        {
+            var json = JsonConvert.SerializeObject(request);
+            var content = new StringContent(json, Encoding.UTF8, "application/json");
+            var response = await _httpClient.PostAsync("/api/v3/core/users/", content);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                var errorContent = await response.Content.ReadAsStringAsync();
+                _logger.LogError(
+                    "Failed to create user in Authentik. Status: {StatusCode}, Error: {Error}",
+                    response.StatusCode, errorContent);
+                return null;
+            }
+
+            var responseJson = await response.Content.ReadAsStringAsync();
+            var userResponse = JsonConvert.DeserializeObject<AuthentikUserResponse>(responseJson);
+            _logger.LogInformation("Successfully created user {Username} in Authentik with pk {Pk}",
+                username, userResponse?.Pk);
+
+            return userResponse;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Exception while creating user {Username} in Authentik", username);
+            return null;
+        }
+    }
+
+    public async Task<bool> SendRecoveryEmailAsync(int authentikUserId)
+    {
+        try
+        {
+            var response = await _httpClient.PostAsync(
+                $"/api/v3/core/users/{authentikUserId}/recovery_email/?email_stage={_configuration.EmailStageId}",
+                null);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                var errorContent = await response.Content.ReadAsStringAsync();
+                _logger.LogError(
+                    "Failed to send recovery email for user {UserId}. Status: {StatusCode}, Error: {Error}",
+                    authentikUserId, response.StatusCode, errorContent);
+                return false;
+            }
+
+            _logger.LogInformation("Successfully sent recovery email to Authentik user {UserId}", authentikUserId);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Exception while sending recovery email to Authentik user {UserId}", authentikUserId);
+            return false;
+        }
+    }
+}

FictionArchive.Service.UserService/Services/AuthenticationClient/Authentik/AuthentikConfiguration.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
+
+public class AuthentikConfiguration
+{
+    public string BaseUrl { get; set; } = string.Empty;
+    public string ApiToken { get; set; } = string.Empty;
+    public string EmailStageId { get; set; }
+}

FictionArchive.Service.UserService/Services/AuthenticationClient/Authentik/AuthentikUserResponse.cs

@@ -0,0 +1,27 @@
+using Newtonsoft.Json;
+
+namespace FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
+
+public class AuthentikUserResponse
+{
+    [JsonProperty("pk")]
+    public int Pk { get; set; }
+
+    [JsonProperty("username")]
+    public string Username { get; set; } = string.Empty;
+
+    [JsonProperty("name")]
+    public string Name { get; set; } = string.Empty;
+
+    [JsonProperty("email")]
+    public string Email { get; set; } = string.Empty;
+
+    [JsonProperty("is_active")]
+    public bool IsActive { get; set; }
+
+    [JsonProperty("is_superuser")]
+    public bool IsSuperuser { get; set; }
+
+    [JsonProperty("uid")]
+    public string Uid { get; set; } = string.Empty;
+}

FictionArchive.Service.UserService/Services/AuthenticationClient/IAuthenticationServiceClient.cs

@@ -0,0 +1,22 @@
+using FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
+
+namespace FictionArchive.Service.UserService.Services.AuthenticationClient;
+
+public interface IAuthenticationServiceClient
+{
+    /// <summary>
+    /// Creates a new user in the authentication provider.
+    /// </summary>
+    /// <param name="username">The username for the new user</param>
+    /// <param name="email">The email address for the new user</param>
+    /// <param name="displayName">The display name for the new user</param>
+    /// <returns>The created user response, or null if creation failed</returns>
+    Task<AuthentikUserResponse?> CreateUserAsync(string username, string email, string displayName);
+
+    /// <summary>
+    /// Sends a password recovery email to the user.
+    /// </summary>
+    /// <param name="authentikUserId">The Authentik user ID (pk)</param>
+    /// <returns>True if the email was sent successfully, false otherwise</returns>
+    Task<bool> SendRecoveryEmailAsync(int authentikUserId);
+}

FictionArchive.Service.UserService/Services/EventHandlers/AuthUserAddedEventHandler.cs

@@ -1,23 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.UserService.Models.IntegrationEvents;
-using FictionArchive.Service.UserService.Models.Database;
-using Microsoft.EntityFrameworkCore; // Add this line to include the UserModel
-
-namespace FictionArchive.Service.UserService.Services.EventHandlers;
-
-public class AuthUserAddedEventHandler : IIntegrationEventHandler<AuthUserAddedEvent>
-{
-    private readonly UserManagementService _userManagementService;
-    private readonly ILogger<AuthUserAddedEventHandler> _logger;
-
-    public AuthUserAddedEventHandler(UserServiceDbContext dbContext, ILogger<AuthUserAddedEventHandler> logger, UserManagementService userManagementService)
-    {
-        _logger = logger;
-        _userManagementService = userManagementService;
-    }
-
-    public async Task Handle(AuthUserAddedEvent @event)
-    {
-        await _userManagementService.RegisterUser(@event.EventUserUsername, @event.EventUserEmail, @event.OAuthProviderId, @event.InviterOAuthProviderId);
-    }
-}

FictionArchive.Service.UserService/Services/UserManagementService.cs

@@ -1,4 +1,7 @@
+using FictionArchive.Service.Shared.Services.EventBus;
 using FictionArchive.Service.UserService.Models.Database;
+using FictionArchive.Service.UserService.Models.IntegrationEvents;
+using FictionArchive.Service.UserService.Services.AuthenticationClient;
 using Microsoft.EntityFrameworkCore;
 
 namespace FictionArchive.Service.UserService.Services;
@@ -7,39 +10,142 @@ public class UserManagementService
 {
     private readonly ILogger<UserManagementService> _logger;
     private readonly UserServiceDbContext _dbContext;
+    private readonly IAuthenticationServiceClient _authClient;
+    private readonly IEventBus _eventBus;
 
-    public UserManagementService(UserServiceDbContext dbContext, ILogger<UserManagementService> logger)
+    public UserManagementService(
+        UserServiceDbContext dbContext,
+        ILogger<UserManagementService> logger,
+        IAuthenticationServiceClient authClient,
+        IEventBus eventBus)
     {
         _dbContext = dbContext;
         _logger = logger;
+        _authClient = authClient;
+        _eventBus = eventBus;
     }
 
-    public async Task<User> RegisterUser(string username, string email, string oAuthProviderId,
-        string? inviterOAuthProviderId)
+    /// <summary>
+    /// Invites a new user by creating them in Authentik, saving to the database, and sending a recovery email.
+    /// </summary>
+    /// <param name="inviter">The user sending the invite</param>
+    /// <param name="email">Email address of the invitee</param>
+    /// <param name="username">Username for the invitee</param>
+    /// <returns>The created user, or null if the invite failed</returns>
+    public async Task<User?> InviteUserAsync(User inviter, string email, string username)
     {
-        var newUser = new User();
-        User? inviter =
-            await _dbContext.Users.FirstOrDefaultAsync(user => user.OAuthProviderId == inviterOAuthProviderId);
-        if (inviter == null && inviterOAuthProviderId != null)
+        // Check if inviter has available invites
+        if (inviter.AvailableInvites <= 0)
         {
-            _logger.LogCritical(
-                "A user with OAuthProviderId {OAuthProviderId} was marked as having inviter with OAuthProviderId {inviterOAuthProviderId}, but no user was found with that value.",
-                inviterOAuthProviderId, inviterOAuthProviderId);
-            newUser.Disabled = true;
+            _logger.LogWarning("User {InviterId} has no available invites", inviter.Id);
+            return null;
         }
 
-        newUser.Username = username;
-        newUser.Email = email;
-        newUser.OAuthProviderId = oAuthProviderId;
+        // Check if email is already in use
+        var existingUser = await _dbContext.Users
+            .AsQueryable()
+            .FirstOrDefaultAsync(u => u.Email == email);
+
+        if (existingUser != null)
+        {
+            _logger.LogWarning("Email {Email} is already in use", email);
+            return null;
+        }
+
+        // Check if username is already in use
+        var existingUsername = await _dbContext.Users
+            .AsQueryable()
+            .FirstOrDefaultAsync(u => u.Username == username);
+
+        if (existingUsername != null)
+        {
+            _logger.LogWarning("Username {Username} is already in use", username);
+            return null;
+        }
+
+        // Create user in Authentik
+        var authentikUser = await _authClient.CreateUserAsync(username, email, username);
+        if (authentikUser == null)
+        {
+            _logger.LogError("Failed to create user {Username} in Authentik", username);
+            return null;
+        }
+
+        // Send recovery email via Authentik
+        var emailSent = await _authClient.SendRecoveryEmailAsync(authentikUser.Pk);
+        if (!emailSent)
+        {
+            _logger.LogWarning(
+                "User {Username} was created in Authentik but recovery email failed to send. Authentik pk: {Pk}",
+                username, authentikUser.Pk);
+            // Continue anyway - the user is created, admin can resend email manually
+        }
+
+        // Create user in local database
+        var newUser = new User
+        {
+            Username = username,
+            Email = email,
+            OAuthProviderId = authentikUser.Uid,
+            Disabled = false,
+            AvailableInvites = 0,
+            InviterId = inviter.Id
+        };
+
+        _dbContext.Users.Add(newUser);
+
+        // Decrement inviter's available invites
+        inviter.AvailableInvites--;
+
+        await _dbContext.SaveChangesAsync();
+
+        await _eventBus.Publish(new UserInvitedEvent
+        {
+            InvitedUserId = newUser.Id,
+            InvitedUsername = newUser.Username,
+            InvitedEmail = newUser.Email,
+            InvitedOAuthProviderId = newUser.OAuthProviderId,
+            InviterId = inviter.Id,
+            InviterUsername = inviter.Username,
+            InviterOAuthProviderId = inviter.OAuthProviderId
+        });
+
+        _logger.LogInformation(
+            "User {Username} was successfully invited by {InviterId}. New user id: {NewUserId}",
+            username, inviter.Id, newUser.Id);
 
-        _dbContext.Users.Add(newUser); // Add the new user to the DbContext
-        await _dbContext.SaveChangesAsync(); // Save changes to the database
-        
         return newUser;
     }
 
+    /// <summary>
+    /// Gets a user by their OAuth provider ID (Authentik UID).
+    /// </summary>
+    public async Task<User?> GetUserByOAuthProviderIdAsync(string oAuthProviderId)
+    {
+        return await _dbContext.Users
+            .AsQueryable()
+            .FirstOrDefaultAsync(u => u.OAuthProviderId == oAuthProviderId);
+    }
+
+    /// <summary>
+    /// Gets all users as a queryable for GraphQL.
+    /// </summary>
     public IQueryable<User> GetUsers()
     {
         return _dbContext.Users.AsQueryable();
     }
+
+    /// <summary>
+    /// Gets all users invited by a specific user.
+    /// </summary>
+    /// <param name="inviterId">The ID of the user who sent the invites</param>
+    /// <returns>List of users invited by the specified user</returns>
+    public async Task<List<User>> GetInvitedByUserAsync(Guid inviterId)
+    {
+        return await _dbContext.Users
+            .AsQueryable()
+            .Where(u => u.InviterId == inviterId)
+            .OrderByDescending(u => u.CreatedTime)
+            .ToListAsync();
+    }
 }

FictionArchive.Service.UserService/Services/UserServiceDbContext.cs

@@ -7,7 +7,7 @@ namespace FictionArchive.Service.UserService.Services;
 public class UserServiceDbContext : FictionArchiveDbContext
 {
     public DbSet<User> Users { get; set; }
-    
+
     public UserServiceDbContext(DbContextOptions options, ILogger<UserServiceDbContext> logger) : base(options, logger)
     {
     }

FictionArchive.Service.UserService/appsettings.json

@@ -12,6 +12,11 @@
     "ConnectionString": "amqp://localhost",
     "ClientIdentifier": "UserService"
   },
+  "Authentik": {
+    "BaseUrl": "https://auth.orfl.xyz",
+    "ApiToken": "REPLACE_ME",
+    "EmailStageId": "10df0c18-8802-4ec7-852e-3cdd355514d3"
+  },
   "AllowedHosts": "*",
   "OIDC": {
     "Authority": "https://auth.orfl.xyz/application/o/fiction-archive/",

FictionArchive.sln

@@ -1,5 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
+#
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Common", "FictionArchive.Common\FictionArchive.Common.csproj", "{ABF1BA10-9E76-45BE-9947-E20445A68147}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.API", "FictionArchive.API\FictionArchive.API.csproj", "{420CC1A1-9DBC-40EC-B9E3-D4B25D71B9A9}"
@@ -14,12 +15,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.Sche
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.UserService", "FictionArchive.Service.UserService\FictionArchive.Service.UserService.csproj", "{EE4D4795-2F79-4614-886D-AF8DA77120AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.AuthenticationService", "FictionArchive.Service.AuthenticationService\FictionArchive.Service.AuthenticationService.csproj", "{70C4AE82-B01E-421D-B590-C0F47E63CD0C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.FileService", "FictionArchive.Service.FileService\FictionArchive.Service.FileService.csproj", "{EC64A336-F8A0-4BED-9CA3-1B05AD00631D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.NovelService.Tests", "FictionArchive.Service.NovelService.Tests\FictionArchive.Service.NovelService.Tests.csproj", "{166E645E-9DFB-44E8-8CC8-FA249A11679F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.UserService.Tests", "FictionArchive.Service.UserService.Tests\FictionArchive.Service.UserService.Tests.csproj", "{10C38C89-983D-4544-8911-F03099F66AB8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FictionArchive.Service.UserNovelDataService", "FictionArchive.Service.UserNovelDataService\FictionArchive.Service.UserNovelDataService.csproj", "{A278565B-D440-4AB9-B2E2-41BA3B3AD82A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -54,10 +57,6 @@ Global
 		{EE4D4795-2F79-4614-886D-AF8DA77120AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE4D4795-2F79-4614-886D-AF8DA77120AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE4D4795-2F79-4614-886D-AF8DA77120AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70C4AE82-B01E-421D-B590-C0F47E63CD0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70C4AE82-B01E-421D-B590-C0F47E63CD0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70C4AE82-B01E-421D-B590-C0F47E63CD0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70C4AE82-B01E-421D-B590-C0F47E63CD0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC64A336-F8A0-4BED-9CA3-1B05AD00631D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC64A336-F8A0-4BED-9CA3-1B05AD00631D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC64A336-F8A0-4BED-9CA3-1B05AD00631D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -66,5 +65,13 @@ Global
 		{166E645E-9DFB-44E8-8CC8-FA249A11679F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{166E645E-9DFB-44E8-8CC8-FA249A11679F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{166E645E-9DFB-44E8-8CC8-FA249A11679F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10C38C89-983D-4544-8911-F03099F66AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10C38C89-983D-4544-8911-F03099F66AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10C38C89-983D-4544-8911-F03099F66AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10C38C89-983D-4544-8911-F03099F66AB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A278565B-D440-4AB9-B2E2-41BA3B3AD82A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A278565B-D440-4AB9-B2E2-41BA3B3AD82A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A278565B-D440-4AB9-B2E2-41BA3B3AD82A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A278565B-D440-4AB9-B2E2-41BA3B3AD82A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

docker-compose.yml

@@ -4,25 +4,31 @@ services:
   # ===========================================
   postgres:
     image: postgres:16-alpine
+    networks:
+      - fictionarchive
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - /srv/docker_volumes/fictionarchive/postgres:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 5s
       timeout: 5s
       retries: 5
     restart: unless-stopped
+    ports:
+      - 4321:5432
 
   rabbitmq:
     image: rabbitmq:3-management-alpine
+    networks:
+      - fictionarchive
     environment:
       RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER:-guest}
       RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD:-guest}
     volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
+      - /srv/docker_volumes/fictionarchive/rabbitmq:/var/lib/rabbitmq
     healthcheck:
       test: ["CMD", "rabbitmq-diagnostics", "check_running"]
       interval: 10s
@@ -30,6 +36,20 @@ services:
       retries: 5
     restart: unless-stopped
 
+  vpn:
+    image: dperson/openvpn-client  # or gluetun, wireguard, etc.
+    networks:
+      fictionarchive:
+        aliases:
+          - novel-service
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun
+    volumes:
+      - /srv/docker_volumes/korean_vpn:/vpn
+    restart: unless-stopped
+
   # ===========================================
   # Backend Services
   # ===========================================
@@ -37,50 +57,27 @@ services:
     image: git.orfl.xyz/conco/fictionarchive-novel-service:latest
     environment:
       ConnectionStrings__DefaultConnection: Host=postgres;Database=FictionArchive_NovelService;Username=${POSTGRES_USER:-postgres};Password=${POSTGRES_PASSWORD:-postgres}
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
+      RabbitMQ__ConnectionString: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
       Novelpia__Username: ${NOVELPIA_USERNAME}
       Novelpia__Password: ${NOVELPIA_PASSWORD}
-      NovelUpdateService__PendingImageUrl: https://files.fictionarchive.orfl.xyz/api/pendingupload.png
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    depends_on:
-      postgres:
-        condition: service_healthy
-      rabbitmq:
-        condition: service_healthy
-    restart: unless-stopped
-
-  translation-service:
-    image: git.orfl.xyz/conco/fictionarchive-translation-service:latest
-    environment:
-      ConnectionStrings__DefaultConnection: Host=postgres;Database=FictionArchive_TranslationService;Username=${POSTGRES_USER:-postgres};Password=${POSTGRES_PASSWORD:-postgres}
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
-      DeepL__ApiKey: ${DEEPL_API_KEY}
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+      UpdateService__PendingImageUrl: https://files.fictionarchive.orfl.xyz/api/pendingupload.png
     depends_on:
       postgres:
         condition: service_healthy
       rabbitmq:
         condition: service_healthy
+      vpn:
+        condition: service_started
+    network_mode: "service:vpn"
     restart: unless-stopped
 
   scheduler-service:
     image: git.orfl.xyz/conco/fictionarchive-scheduler-service:latest
+    networks:
+      - fictionarchive
     environment:
       ConnectionStrings__DefaultConnection: Host=postgres;Database=FictionArchive_SchedulerService;Username=${POSTGRES_USER:-postgres};Password=${POSTGRES_PASSWORD:-postgres}
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+      RabbitMQ__ConnectionString: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
     depends_on:
       postgres:
         condition: service_healthy
@@ -90,14 +87,14 @@ services:
 
   user-service:
     image: git.orfl.xyz/conco/fictionarchive-user-service:latest
+    networks:
+      - fictionarchive
     environment:
       ConnectionStrings__DefaultConnection: Host=postgres;Database=FictionArchive_UserService;Username=${POSTGRES_USER:-postgres};Password=${POSTGRES_PASSWORD:-postgres}
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+      RabbitMQ__ConnectionString: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
+      Authentik__BaseUrl: https://auth.orfl.xyz
+      Authentik__ApiToken: ${AUTHENTIK_API_TOKEN}
+      Authentik__EmailStageId: 10df0c18-8802-4ec7-852e-3cdd355514d3
     depends_on:
       postgres:
         condition: service_healthy
@@ -105,42 +102,21 @@ services:
         condition: service_healthy
     restart: unless-stopped
 
-  authentication-service:
-    image: git.orfl.xyz/conco/fictionarchive-authentication-service:latest
-    environment:
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    depends_on:
-      rabbitmq:
-        condition: service_healthy
-    restart: unless-stopped
-
   file-service:
     image: git.orfl.xyz/conco/fictionarchive-file-service:latest
+    networks:
+      - web
+      - fictionarchive
     environment:
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
-      S3__Endpoint: ${S3_ENDPOINT:-https://s3.orfl.xyz}
-      S3__Bucket: ${S3_BUCKET:-fictionarchive}
+      RabbitMQ__ConnectionString: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
       S3__AccessKey: ${S3_ACCESS_KEY}
       S3__SecretKey: ${S3_SECRET_KEY}
-      Proxy__BaseUrl: https://files.orfl.xyz/api
-      OIDC__Authority: https://auth.orfl.xyz/application/o/fictionarchive/
-      OIDC__ClientId: fictionarchive-files
-      OIDC__Audience: fictionarchive-api
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+      ProxyConfiguration__BaseUrl: https://files.fictionarchive.orfl.xyz/api
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.file-service.rule=Host(`files.orfl.xyz`)"
-      - "traefik.http.routers.file-service.entrypoints=websecure"
-      - "traefik.http.routers.file-service.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.file-service.rule=Host(`files.fictionarchive.orfl.xyz`)"
+      - "traefik.http.routers.file-service.tls=true"
+      - "traefik.http.routers.file-service.tls.certresolver=lets-encrypt"
       - "traefik.http.services.file-service.loadbalancer.server.port=8080"
     depends_on:
       rabbitmq:
@@ -152,30 +128,22 @@ services:
   # ===========================================
   api-gateway:
     image: git.orfl.xyz/conco/fictionarchive-api:latest
+    networks:
+      - web
+      - fictionarchive
     environment:
-      ConnectionStrings__RabbitMQ: amqp://${RABBITMQ_USER:-guest}:${RABBITMQ_PASSWORD:-guest}@rabbitmq
-      OIDC__Authority: https://auth.orfl.xyz/application/o/fictionarchive/
-      OIDC__ClientId: fictionarchive-api
-      OIDC__Audience: fictionarchive-api
       Cors__AllowedOrigin: https://fictionarchive.orfl.xyz
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.api-gateway.rule=Host(`api.fictionarchive.orfl.xyz`)"
-      - "traefik.http.routers.api-gateway.entrypoints=websecure"
-      - "traefik.http.routers.api-gateway.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.api-gateway.tls=true"
+      - "traefik.http.routers.api-gateway.tls.certresolver=lets-encrypt"
       - "traefik.http.services.api-gateway.loadbalancer.server.port=8080"
     depends_on:
       - novel-service
-      - translation-service
       - scheduler-service
-      - user-service
-      - authentication-service
       - file-service
+      - user-service
     restart: unless-stopped
 
   # ===========================================
@@ -183,20 +151,17 @@ services:
   # ===========================================
   frontend:
     image: git.orfl.xyz/conco/fictionarchive-frontend:latest
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+    networks:
+      - web
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.frontend.rule=Host(`fictionarchive.orfl.xyz`)"
-      - "traefik.http.routers.frontend.entrypoints=websecure"
-      - "traefik.http.routers.frontend.tls.certresolver=letsencrypt"
-      - "traefik.http.services.frontend.loadbalancer.server.port=80"
+      - traefik.http.routers.fafrontend.rule=Host(`fictionarchive.orfl.xyz`)
+      - traefik.http.routers.fafrontend.tls=true
+      - traefik.http.routers.fafrontend.tls.certresolver=lets-encrypt
+      - traefik.http.services.fafrontend.loadbalancer.server.port=80
+      - traefik.enable=true
     restart: unless-stopped
 
-volumes:
-  postgres_data:
-  rabbitmq_data:
-  letsencrypt:
+networks:
+  web:
+    external: yes
+  fictionarchive:

fictionarchive-web-astro/package-lock.json

@@ -12,6 +12,7 @@
         "@astrojs/svelte": "^7.2.2",
         "@tailwindcss/vite": "^4.1.17",
         "@urql/core": "^6.0.1",
+        "@urql/exchange-auth": "^3.0.0",
         "@urql/svelte": "^5.0.0",
         "astro": "^5.16.2",
         "class-variance-authority": "^0.7.1",
@@ -19,6 +20,7 @@
         "date-fns": "^4.1.0",
         "dompurify": "^3.3.0",
         "graphql": "^16.12.0",
+        "isomorphic-dompurify": "^2.33.0",
         "oidc-client-ts": "^3.4.1",
         "svelte": "^5.45.2",
         "tailwind-merge": "^3.4.0",
@@ -59,6 +61,12 @@
         }
       }
     },
+    "node_modules/@acemir/cssom": {
+      "version": "0.9.28",
+      "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.28.tgz",
+      "integrity": "sha512-LuS6IVEivI75vKN8S04qRD+YySP0RmU/cV8UNukhQZvprxF+76Z43TNo/a08eCodaGhT1Us8etqS1ZRY9/Or0A==",
+      "license": "MIT"
+    },
     "node_modules/@ardatan/relay-compiler": {
       "version": "12.0.3",
       "resolved": "https://registry.npmjs.org/@ardatan/relay-compiler/-/relay-compiler-12.0.3.tgz",
@@ -84,6 +92,56 @@
         "graphql": "*"
       }
     },
+    "node_modules/@asamuzakjp/css-color": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.0.tgz",
+      "integrity": "sha512-9xiBAtLn4aNsa4mDnpovJvBn72tNEIACyvlqaNJ+ADemR+yeMJWnBudOi2qGDviJa7SwcDOU/TRh5dnET7qk0w==",
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "lru-cache": "^11.2.2"
+      }
+    },
+    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@asamuzakjp/dom-selector": {
+      "version": "6.7.6",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.6.tgz",
+      "integrity": "sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg==",
+      "license": "MIT",
+      "dependencies": {
+        "@asamuzakjp/nwsapi": "^2.3.9",
+        "bidi-js": "^1.0.3",
+        "css-tree": "^3.1.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "lru-cache": "^11.2.4"
+      }
+    },
+    "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@asamuzakjp/nwsapi": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz",
+      "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==",
+      "license": "MIT"
+    },
     "node_modules/@astrojs/compiler": {
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.13.0.tgz",
@@ -474,6 +532,140 @@
         "node": ">=18"
       }
     },
+    "node_modules/@csstools/color-helpers": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/css-calc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-color-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/color-helpers": "^5.1.0",
+        "@csstools/css-calc": "^2.1.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-syntax-patches-for-csstree": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.14.tgz",
+      "integrity": "sha512-zSlIxa20WvMojjpCSy8WrNpcZ61RqfTfX3XTaOeVlGJrt/8HF3YbzgFZa01yTbT4GWQLwfTcC3EB8i3XnB647Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@emnapi/runtime": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
@@ -4113,6 +4305,19 @@
         "wonka": "^6.3.2"
       }
     },
+    "node_modules/@urql/exchange-auth": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@urql/exchange-auth/-/exchange-auth-3.0.0.tgz",
+      "integrity": "sha512-tj09xiOR2f1J2h8TE9uZWjRZipCdmDoTewEytOacDQ+0Teo+yIZxm3ppHxolQtiA51OHrGYiNTkMte8HtfvaBw==",
+      "license": "MIT",
+      "dependencies": {
+        "@urql/core": "^6.0.0",
+        "wonka": "^6.3.2"
+      },
+      "peerDependencies": {
+        "@urql/core": "^6.0.0"
+      }
+    },
     "node_modules/@urql/svelte": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@urql/svelte/-/svelte-5.0.0.tgz",
@@ -4207,6 +4412,15 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4663,6 +4877,15 @@
         "baseline-browser-mapping": "dist/cli.js"
       }
     },
+    "node_modules/bidi-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz",
+      "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==",
+      "license": "MIT",
+      "dependencies": {
+        "require-from-string": "^2.0.2"
+      }
+    },
     "node_modules/bits-ui": {
       "version": "2.14.4",
       "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-2.14.4.tgz",
@@ -5491,6 +5714,20 @@
       "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
       "license": "CC0-1.0"
     },
+    "node_modules/cssstyle": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.4.tgz",
+      "integrity": "sha512-KyOS/kJMEq5O9GdPnaf82noigg5X5DYn0kZPJTaAsCUaBizp6Xa1y9D4Qoqf/JazEXWuruErHgVXwjN5391ZJw==",
+      "license": "MIT",
+      "dependencies": {
+        "@asamuzakjp/css-color": "^4.1.0",
+        "@csstools/css-syntax-patches-for-csstree": "1.0.14",
+        "css-tree": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -5501,6 +5738,53 @@
         "node": ">= 12"
       }
     },
+    "node_modules/data-urls": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz",
+      "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^15.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/data-urls/node_modules/tr46": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz",
+      "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==",
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/data-urls/node_modules/webidl-conversions": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz",
+      "integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
+      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "^6.0.0",
+        "webidl-conversions": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/dataloader": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.2.3.tgz",
@@ -5548,6 +5832,12 @@
         }
       }
     },
+    "node_modules/decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "license": "MIT"
+    },
     "node_modules/decode-named-character-reference": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.2.0.tgz",
@@ -7205,6 +7495,18 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/html-encoding-sniffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-encoding": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/html-escaper": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-3.0.3.tgz",
@@ -7247,6 +7549,32 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
@@ -7501,6 +7829,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "license": "MIT"
+    },
     "node_modules/is-reference": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
@@ -7591,6 +7925,19 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/isomorphic-dompurify": {
+      "version": "2.33.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-2.33.0.tgz",
+      "integrity": "sha512-pXGR3rAHAXb5Bvr56pc5aV0Lh8laubLo7/60F+soOzDFmwks6MtgDhL7p46VoxLnwgIsjgmVhQpUt4mUlL/XEw==",
+      "license": "MIT",
+      "dependencies": {
+        "dompurify": "^3.3.0",
+        "jsdom": "^27.2.0"
+      },
+      "engines": {
+        "node": ">=20.19.5"
+      }
+    },
     "node_modules/isomorphic-ws": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz",
@@ -7645,6 +7992,91 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsdom": {
+      "version": "27.3.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.3.0.tgz",
+      "integrity": "sha512-GtldT42B8+jefDUC4yUKAvsaOrH7PDHmZxZXNgF2xMmymjUbRYJvpAybZAKEmXDGTM0mCsz8duOa4vTm5AY2Kg==",
+      "license": "MIT",
+      "dependencies": {
+        "@acemir/cssom": "^0.9.28",
+        "@asamuzakjp/dom-selector": "^6.7.6",
+        "cssstyle": "^5.3.4",
+        "data-urls": "^6.0.0",
+        "decimal.js": "^10.6.0",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
+        "is-potential-custom-element-name": "^1.0.1",
+        "parse5": "^8.0.0",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^6.0.0",
+        "w3c-xmlserializer": "^5.0.0",
+        "webidl-conversions": "^8.0.0",
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^15.1.0",
+        "ws": "^8.18.3",
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/parse5": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz",
+      "integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==",
+      "license": "MIT",
+      "dependencies": {
+        "entities": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/jsdom/node_modules/tr46": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz",
+      "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==",
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/jsdom/node_modules/webidl-conversions": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz",
+      "integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/jsdom/node_modules/whatwg-url": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
+      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "^6.0.0",
+        "webidl-conversions": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/jsesc": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
@@ -9940,7 +10372,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -10207,6 +10638,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -10414,7 +10854,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/sax": {
@@ -10423,6 +10862,18 @@
       "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==",
       "license": "BlueOak-1.0.0"
     },
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "license": "ISC",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=v12.22.7"
+      }
+    },
     "node_modules/scule": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
@@ -10945,6 +11396,12 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "license": "MIT"
+    },
     "node_modules/sync-fetch": {
       "version": "0.6.0-2",
       "resolved": "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.6.0-2.tgz",
@@ -11104,6 +11561,24 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/tldts": {
+      "version": "7.0.19",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.19.tgz",
+      "integrity": "sha512-8PWx8tvC4jDB39BQw1m4x8y5MH1BcQ5xHeL2n7UVFulMPH/3Q0uiamahFJ3lXA0zO2SUyRXuVVbWSDmstlt9YA==",
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^7.0.19"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "7.0.19",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.19.tgz",
+      "integrity": "sha512-lJX2dEWx0SGH4O6p+7FPwYmJ/bu1JbcGJ8RLaG9b7liIgZ85itUVEPbMtWRVrde/0fnDPEPHW10ZsKW3kVsE9A==",
+      "license": "MIT"
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -11126,6 +11601,18 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/tough-cookie": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz",
+      "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tldts": "^7.0.5"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -11832,6 +12319,18 @@
         }
       }
     },
+    "node_modules/w3c-xmlserializer": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/web-namespaces": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
@@ -11859,11 +12358,34 @@
       "dev": true,
       "license": "BSD-2-Clause"
     },
+    "node_modules/whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/whatwg-mimetype": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
       "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -12010,7 +12532,6 @@
       "version": "8.18.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
       "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-      "dev": true,
       "license": "MIT",
       "peer": true,
       "engines": {
@@ -12029,6 +12550,21 @@
         }
       }
     },
+    "node_modules/xml-name-validator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "license": "MIT"
+    },
     "node_modules/xxhash-wasm": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.1.0.tgz",

fictionarchive-web-astro/package.json

@@ -16,6 +16,7 @@
     "@astrojs/svelte": "^7.2.2",
     "@tailwindcss/vite": "^4.1.17",
     "@urql/core": "^6.0.1",
+    "@urql/exchange-auth": "^3.0.0",
     "@urql/svelte": "^5.0.0",
     "astro": "^5.16.2",
     "class-variance-authority": "^0.7.1",
@@ -23,6 +24,7 @@
     "date-fns": "^4.1.0",
     "dompurify": "^3.3.0",
     "graphql": "^16.12.0",
+    "isomorphic-dompurify": "^2.33.0",
     "oidc-client-ts": "^3.4.1",
     "svelte": "^5.45.2",
     "tailwind-merge": "^3.4.0",

fictionarchive-web-astro/src/layouts/GatedLayout.astro

@@ -0,0 +1,38 @@
+---
+import AuthInit from '../lib/components/AuthInit.svelte';
+import GatedAuthDisplay from '../lib/components/GatedAuthDisplay.svelte';
+import '../styles/global.css';
+
+interface Props {
+	title?: string;
+}
+
+const { title = 'FictionArchive' } = Astro.props;
+---
+
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<meta name="generator" content={Astro.generator} />
+		<title>{title}</title>
+	</head>
+	<body class="min-h-screen bg-background">
+		<AuthInit client:load />
+		<header class="border-b bg-white/80 backdrop-blur dark:bg-gray-900/80">
+			<nav class="mx-auto flex max-w-6xl items-center gap-4 px-4 py-3 sm:px-6 lg:px-8">
+				<a href="/" class="flex items-center gap-2">
+					<span class="rounded bg-primary px-2 py-1 font-bold text-primary-foreground">FA</span>
+					<span class="font-semibold">FictionArchive</span>
+				</a>
+				<div class="flex-1"></div>
+				<GatedAuthDisplay client:load />
+			</nav>
+		</header>
+		<main class="mx-auto flex max-w-6xl flex-col gap-6 px-4 py-8 sm:px-6 lg:px-8">
+			<slot />
+		</main>
+	</body>
+</html>

fictionarchive-web-astro/src/lib/auth/authStore.ts

@@ -52,6 +52,10 @@ export async function initAuth() {
       user.set(result ?? null);
       if (result) {
         setCookieFromUser(result);
+        // Reload to let server see the new cookie
+        const cleanUrl = `${url.origin}${url.pathname}`;
+        window.location.href = cleanUrl;
+        return;
       }
     } catch (e) {
       console.error('Failed to complete sign-in redirect', e);
@@ -113,3 +117,14 @@ export async function logout() {
     user.set(null);
   }
 }
+
+export async function refreshToken(): Promise<User | null> {
+  if (!userManager) return null;
+  try {
+    const newUser = await userManager.signinSilent();
+    return newUser;
+  } catch (e) {
+    console.error('Token refresh failed:', e);
+    return null;
+  }
+}

fictionarchive-web-astro/src/lib/auth/oidcConfig.ts

@@ -4,7 +4,7 @@ const authority = import.meta.env.PUBLIC_OIDC_AUTHORITY;
 const clientId = import.meta.env.PUBLIC_OIDC_CLIENT_ID;
 const redirectUri = import.meta.env.PUBLIC_OIDC_REDIRECT_URI;
 const postLogoutRedirectUri = import.meta.env.PUBLIC_OIDC_POST_LOGOUT_REDIRECT_URI ?? redirectUri;
-const scope = import.meta.env.PUBLIC_OIDC_SCOPE ?? 'openid profile email';
+const scope = import.meta.env.PUBLIC_OIDC_SCOPE ?? 'openid profile email offline_access';
 
 export const isOidcConfigured =
   Boolean(authority) && Boolean(clientId) && Boolean(redirectUri);
@@ -20,7 +20,7 @@ function buildSettings(): UserManagerSettings | null {
     response_type: 'code',
     scope,
     loadUserInfo: true,
-    automaticSilentRenew: true,
+    automaticSilentRenew: false, // We handle refresh reactively via authExchange
     userStore:
       typeof window !== 'undefined'
         ? new WebStorageStateStore({ store: window.localStorage })

fictionarchive-web-astro/src/lib/components/AuthenticationDisplay.svelte

@@ -4,10 +4,10 @@
 
 	let isOpen = $state(false);
 
-	const email = $derived(
-		$user?.profile?.email ??
+	const name = $derived(
+		$user?.profile?.name ??
 			$user?.profile?.preferred_username ??
-			$user?.profile?.name ??
+			$user?.profile?.email ??
 			$user?.profile?.sub ??
 			'User'
 	);
@@ -38,12 +38,18 @@
 {:else if $user}
 	<div class="auth-dropdown relative">
 		<Button variant="outline" onclick={toggleDropdown}>
-			{email}
+			{name}
 		</Button>
 		{#if isOpen}
 			<div
 				class="absolute right-0 z-50 mt-2 w-48 rounded-md bg-white p-2 shadow-lg dark:bg-gray-800"
 			>
+				<a
+					href="/settings"
+					class="flex w-full items-center justify-start rounded-md px-4 py-2 text-sm font-medium hover:bg-gray-100 dark:hover:bg-gray-700"
+				>
+					Settings
+				</a>
 				<Button variant="ghost" class="w-full justify-start" onclick={handleLogout}>
 					Sign out
 				</Button>

fictionarchive-web-astro/src/lib/components/ChapterNavigation.svelte

@@ -0,0 +1,227 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import { Popover, PopoverTrigger, PopoverContent } from '$lib/components/ui/popover';
+	import { Textarea } from '$lib/components/ui/textarea';
+	import { client } from '$lib/graphql/client';
+	import { UpsertBookmarkDocument, RemoveBookmarkDocument } from '$lib/graphql/__generated__/graphql';
+	import ChevronLeft from '@lucide/svelte/icons/chevron-left';
+	import ChevronRight from '@lucide/svelte/icons/chevron-right';
+	import List from '@lucide/svelte/icons/list';
+	import Bookmark from '@lucide/svelte/icons/bookmark';
+	import BookmarkCheck from '@lucide/svelte/icons/bookmark-check';
+
+	interface Props {
+		novelId: string;
+		chapterId?: number;
+		prevChapterVolumeOrder: number | null | undefined;
+		prevChapterOrder: number | null | undefined;
+		nextChapterVolumeOrder: number | null | undefined;
+		nextChapterOrder: number | null | undefined;
+		showKeyboardHints?: boolean;
+		isBookmarked?: boolean;
+		bookmarkDescription?: string | null;
+		onBookmarkChange?: (isBookmarked: boolean, description?: string | null) => void;
+	}
+
+	let {
+		novelId,
+		chapterId,
+		prevChapterVolumeOrder,
+		prevChapterOrder,
+		nextChapterVolumeOrder,
+		nextChapterOrder,
+		showKeyboardHints = true,
+		isBookmarked = false,
+		bookmarkDescription = null,
+		onBookmarkChange
+	}: Props = $props();
+
+	const hasPrev = $derived(prevChapterOrder != null && prevChapterVolumeOrder != null);
+	const hasNext = $derived(nextChapterOrder != null && nextChapterVolumeOrder != null);
+
+	// Bookmark state
+	let popoverOpen = $state(false);
+	let description = $state(bookmarkDescription ?? '');
+	let saving = $state(false);
+	let removing = $state(false);
+	let error: string | null = $state(null);
+
+	// Reset description when popover opens
+	$effect(() => {
+		if (popoverOpen) {
+			description = bookmarkDescription ?? '';
+			error = null;
+		}
+	});
+
+	async function saveBookmark() {
+		if (!chapterId) return;
+
+		saving = true;
+		error = null;
+
+		try {
+			const result = await client
+				.mutation(UpsertBookmarkDocument, {
+					input: {
+						chapterId,
+						novelId: parseInt(novelId, 10),
+						description: description.trim() || null
+					}
+				})
+				.toPromise();
+
+			if (result.error) {
+				error = result.error.message;
+				return;
+			}
+
+			if (result.data?.upsertBookmark?.errors?.length) {
+				error = result.data.upsertBookmark.errors[0]?.message ?? 'Failed to save bookmark';
+				return;
+			}
+
+			if (result.data?.upsertBookmark?.bookmarkPayload?.success) {
+				popoverOpen = false;
+				onBookmarkChange?.(true, description.trim() || null);
+			}
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Failed to save bookmark';
+		} finally {
+			saving = false;
+		}
+	}
+
+	async function removeBookmark() {
+		if (!chapterId) return;
+
+		removing = true;
+		error = null;
+
+		try {
+			const result = await client
+				.mutation(RemoveBookmarkDocument, {
+					input: { chapterId }
+				})
+				.toPromise();
+
+			if (result.error) {
+				error = result.error.message;
+				return;
+			}
+
+			if (result.data?.removeBookmark?.errors?.length) {
+				error = result.data.removeBookmark.errors[0]?.message ?? 'Failed to remove bookmark';
+				return;
+			}
+
+			if (result.data?.removeBookmark?.bookmarkPayload?.success) {
+				popoverOpen = false;
+				description = '';
+				onBookmarkChange?.(false, null);
+			}
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Failed to remove bookmark';
+		} finally {
+			removing = false;
+		}
+	}
+</script>
+
+<div class="flex flex-col gap-2">
+	<div class="flex items-center justify-between gap-4">
+		<Button
+			variant="outline"
+			href={hasPrev ? `/novels/${novelId}/volumes/${prevChapterVolumeOrder}/chapters/${prevChapterOrder}` : undefined}
+			disabled={!hasPrev}
+			class="gap-2"
+		>
+			<ChevronLeft class="h-4 w-4" />
+			<span class="hidden sm:inline">Previous</span>
+		</Button>
+
+		<div class="flex items-center gap-2">
+			<Button variant="outline" href="/novels/{novelId}" class="gap-2">
+				<List class="h-4 w-4" />
+				<span class="hidden sm:inline">Contents</span>
+			</Button>
+
+			{#if chapterId}
+				<Popover bind:open={popoverOpen}>
+					<PopoverTrigger asChild>
+						{#snippet child({ props })}
+							<Button
+								variant={isBookmarked ? 'default' : 'outline'}
+								class="gap-2"
+								{...props}
+							>
+								{#if isBookmarked}
+									<BookmarkCheck class="h-4 w-4" />
+								{:else}
+									<Bookmark class="h-4 w-4" />
+								{/if}
+								<span class="hidden sm:inline">{isBookmarked ? 'Bookmarked' : 'Bookmark'}</span>
+							</Button>
+						{/snippet}
+					</PopoverTrigger>
+					<PopoverContent class="w-80">
+						<div class="space-y-4">
+							<div class="space-y-2">
+								<h4 class="font-medium leading-none">
+									{isBookmarked ? 'Edit bookmark' : 'Bookmark this chapter'}
+								</h4>
+								<p class="text-sm text-muted-foreground">
+									{isBookmarked ? 'Update your note or remove the bookmark.' : 'Add an optional note to remember why you bookmarked this.'}
+								</p>
+							</div>
+							<Textarea
+								bind:value={description}
+								placeholder="Add a note..."
+								class="min-h-[80px] resize-none"
+							/>
+							{#if error}
+								<p class="text-sm text-destructive">{error}</p>
+							{/if}
+							<div class="flex justify-end gap-2">
+								{#if isBookmarked}
+									<Button
+										variant="destructive"
+										size="sm"
+										onclick={removeBookmark}
+										disabled={removing || saving}
+									>
+										{removing ? 'Removing...' : 'Remove'}
+									</Button>
+								{/if}
+								<Button
+									size="sm"
+									onclick={saveBookmark}
+									disabled={saving || removing}
+								>
+									{saving ? 'Saving...' : 'Save'}
+								</Button>
+							</div>
+						</div>
+					</PopoverContent>
+				</Popover>
+			{/if}
+		</div>
+
+		<Button
+			variant="outline"
+			href={hasNext ? `/novels/${novelId}/volumes/${nextChapterVolumeOrder}/chapters/${nextChapterOrder}` : undefined}
+			disabled={!hasNext}
+			class="gap-2"
+		>
+			<span class="hidden sm:inline">Next</span>
+			<ChevronRight class="h-4 w-4" />
+		</Button>
+	</div>
+
+	{#if showKeyboardHints}
+		<p class="text-muted-foreground hidden text-center text-xs md:block">
+			Use <kbd class="bg-muted rounded px-1 py-0.5 text-xs">←</kbd> and
+			<kbd class="bg-muted rounded px-1 py-0.5 text-xs">→</kbd> arrow keys to navigate
+		</p>
+	{/if}
+</div>

fictionarchive-web-astro/src/lib/components/ChapterProgressBar.svelte

@@ -0,0 +1,21 @@
+<script lang="ts">
+	interface Props {
+		progress: number;
+	}
+
+	let { progress }: Props = $props();
+</script>
+
+<div
+	class="fixed top-0 left-0 right-0 z-50 h-1 bg-muted"
+	role="progressbar"
+	aria-valuenow={Math.round(progress)}
+	aria-valuemin={0}
+	aria-valuemax={100}
+	aria-label="Reading progress"
+>
+	<div
+		class="h-full bg-primary transition-[width] duration-150 ease-out"
+		style="width: {progress}%"
+	></div>
+</div>

fictionarchive-web-astro/src/lib/components/ChapterReaderPage.svelte

@@ -0,0 +1,226 @@
+<script lang="ts" module>
+	import type { GetChapterQuery, GetBookmarksQuery } from '$lib/graphql/__generated__/graphql';
+
+	export type ChapterData = NonNullable<GetChapterQuery['chapter']>;
+	export type BookmarkData = GetBookmarksQuery['bookmarks'][number];
+</script>
+
+<script lang="ts">
+	import { onMount, onDestroy } from 'svelte';
+	import { client } from '$lib/graphql/client';
+	import { GetChapterDocument, GetBookmarksDocument } from '$lib/graphql/__generated__/graphql';
+	import { Card, CardContent } from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import ChapterNavigation from './ChapterNavigation.svelte';
+	import ChapterProgressBar from './ChapterProgressBar.svelte';
+	import { sanitizeChapterHtml } from '$lib/utils/sanitizeChapter';
+
+	interface Props {
+		novelId?: string;
+		volumeOrder?: string;
+		chapterNumber?: string;
+	}
+
+	let { novelId, volumeOrder, chapterNumber }: Props = $props();
+
+	// State
+	let chapter: ChapterData | null = $state(null);
+	let fetching = $state(true);
+	let error: string | null = $state(null);
+	let scrollProgress = $state(0);
+
+	// Bookmark state
+	let isBookmarked = $state(false);
+	let bookmarkDescription: string | null = $state(null);
+
+	// Derived values
+	const sanitizedBody = $derived(chapter?.body ? sanitizeChapterHtml(chapter.body) : '');
+
+	function handleScroll() {
+		const scrollTop = window.scrollY;
+		const docHeight = document.documentElement.scrollHeight - window.innerHeight;
+		scrollProgress = docHeight > 0 ? Math.min(100, (scrollTop / docHeight) * 100) : 0;
+	}
+
+	function handleKeydown(event: KeyboardEvent) {
+		// Don't trigger if user is typing in an input
+		if (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement) {
+			return;
+		}
+
+		if (event.key === 'ArrowLeft' && chapter?.prevChapterOrder != null && chapter?.prevChapterVolumeOrder != null) {
+			window.location.href = `/novels/${novelId}/volumes/${chapter.prevChapterVolumeOrder}/chapters/${chapter.prevChapterOrder}`;
+		} else if (event.key === 'ArrowRight' && chapter?.nextChapterOrder != null && chapter?.nextChapterVolumeOrder != null) {
+			window.location.href = `/novels/${novelId}/volumes/${chapter.nextChapterVolumeOrder}/chapters/${chapter.nextChapterOrder}`;
+		}
+	}
+
+	async function fetchChapter() {
+		if (!novelId || !volumeOrder || !chapterNumber) {
+			error = 'Missing novel ID, volume order, or chapter number';
+			fetching = false;
+			return;
+		}
+
+		fetching = true;
+		error = null;
+
+		try {
+			const result = await client
+				.query(GetChapterDocument, {
+					novelId: parseInt(novelId, 10),
+					volumeOrder: parseInt(volumeOrder, 10),
+					chapterOrder: parseInt(chapterNumber, 10)
+				})
+				.toPromise();
+
+			if (result.error) {
+				error = result.error.message;
+				return;
+			}
+
+			if (result.data?.chapter) {
+				chapter = result.data.chapter;
+				// Update the page title with chapter info
+				document.title = `${chapter.novelName} - ${chapter.order}`;
+				// Fetch bookmark status
+				await fetchBookmarks();
+			} else {
+				error = 'Chapter not found';
+			}
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Unknown error';
+		} finally {
+			fetching = false;
+		}
+	}
+
+	async function fetchBookmarks() {
+		if (!novelId || !chapter) return;
+
+		try {
+			const result = await client
+				.query(GetBookmarksDocument, { novelId: parseInt(novelId, 10) })
+				.toPromise();
+
+			if (result.data?.bookmarks) {
+				const bookmark = result.data.bookmarks.find((b) => b.chapterId === chapter!.id);
+				if (bookmark) {
+					isBookmarked = true;
+					bookmarkDescription = bookmark.description ?? null;
+				} else {
+					isBookmarked = false;
+					bookmarkDescription = null;
+				}
+			}
+		} catch {
+			// Silently fail - bookmark status is non-critical
+		}
+	}
+
+	function handleBookmarkChange(newIsBookmarked: boolean, newDescription?: string | null) {
+		isBookmarked = newIsBookmarked;
+		bookmarkDescription = newDescription ?? null;
+	}
+
+	onMount(() => {
+		fetchChapter();
+		window.addEventListener('scroll', handleScroll, { passive: true });
+		window.addEventListener('keydown', handleKeydown);
+	});
+
+	onDestroy(() => {
+		if (typeof window !== 'undefined') {
+			window.removeEventListener('scroll', handleScroll);
+			window.removeEventListener('keydown', handleKeydown);
+		}
+	});
+</script>
+
+<ChapterProgressBar progress={scrollProgress} />
+
+<div class="space-y-6 pt-2">
+	<!-- Loading State -->
+	{#if fetching}
+		<Card>
+			<CardContent>
+				<div class="flex items-center justify-center py-12">
+					<div
+						class="border-primary h-10 w-10 animate-spin rounded-full border-2 border-t-transparent"
+						aria-label="Loading chapter"
+					></div>
+				</div>
+			</CardContent>
+		</Card>
+	{/if}
+
+	<!-- Error State -->
+	{#if error && !fetching}
+		<Card class="border-destructive/40 bg-destructive/5">
+			<CardContent class="py-8">
+				<div class="text-center">
+					<p class="text-destructive text-lg font-medium">
+						{error === 'Chapter not found' ? 'Chapter Not Found' : 'Error Loading Chapter'}
+					</p>
+					<p class="text-muted-foreground mt-2 text-sm">{error}</p>
+					<Button variant="outline" onclick={fetchChapter} class="mt-4"> Try Again </Button>
+				</div>
+			</CardContent>
+		</Card>
+	{/if}
+
+	<!-- Chapter Content -->
+	{#if chapter && !fetching}
+		<!-- Navigation (top) -->
+		<ChapterNavigation
+			novelId={novelId ?? ''}
+			chapterId={chapter.id}
+			prevChapterVolumeOrder={chapter.prevChapterVolumeOrder}
+			prevChapterOrder={chapter.prevChapterOrder}
+			nextChapterVolumeOrder={chapter.nextChapterVolumeOrder}
+			nextChapterOrder={chapter.nextChapterOrder}
+			{isBookmarked}
+			{bookmarkDescription}
+			onBookmarkChange={handleBookmarkChange}
+		/>
+
+		<!-- Chapter Header -->
+		<Card>
+			<CardContent class="py-6">
+				<div class="space-y-2 text-center">
+					<p class="text-muted-foreground text-sm">
+						{chapter.novelName}
+					</p>
+					<h1 class="text-2xl font-bold">Chapter {chapter.order}: {chapter.name}</h1>
+				</div>
+			</CardContent>
+		</Card>
+
+		<!-- Chapter Body -->
+		<Card>
+			<CardContent class="px-6 py-8 md:px-12">
+				<article
+					class="prose prose-lg dark:prose-invert mx-auto max-w-none
+                    prose-headings:text-foreground
+                    [&>p]:text-foreground [&>p]:mb-6 [&>p]:leading-relaxed"
+				>
+					{@html sanitizedBody}
+				</article>
+			</CardContent>
+		</Card>
+
+		<!-- Navigation (bottom) -->
+		<ChapterNavigation
+			novelId={novelId ?? ''}
+			chapterId={chapter.id}
+			prevChapterVolumeOrder={chapter.prevChapterVolumeOrder}
+			prevChapterOrder={chapter.prevChapterOrder}
+			nextChapterVolumeOrder={chapter.nextChapterVolumeOrder}
+			nextChapterOrder={chapter.nextChapterOrder}
+			showKeyboardHints={false}
+			{isBookmarked}
+			{bookmarkDescription}
+			onBookmarkChange={handleBookmarkChange}
+		/>
+	{/if}
+</div>

fictionarchive-web-astro/src/lib/components/GatedAuthDisplay.svelte

@@ -0,0 +1,12 @@
+<script lang="ts">
+	import { isLoading, isConfigured, login } from '$lib/auth/authStore';
+	import { Button } from '$lib/components/ui/button';
+</script>
+
+{#if $isLoading}
+	<Button variant="outline" disabled>Loading...</Button>
+{:else if !isConfigured}
+	<span class="text-sm text-yellow-600">Auth not configured</span>
+{:else}
+	<Button onclick={login}>Sign in</Button>
+{/if}

fictionarchive-web-astro/src/lib/components/ImportNovelModal.svelte

@@ -0,0 +1,141 @@
+<script lang="ts">
+	import { client } from '$lib/graphql/client';
+	import { ImportNovelDocument } from '$lib/graphql/__generated__/graphql';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Card, CardContent, CardHeader, CardTitle } from '$lib/components/ui/card';
+
+	interface Props {
+		open: boolean;
+		onClose: () => void;
+		onSuccess?: () => void;
+	}
+
+	let { open = $bindable(), onClose, onSuccess }: Props = $props();
+
+	let novelUrl = $state('');
+	let submitting = $state(false);
+	let error: string | null = $state(null);
+	let success = $state(false);
+
+	async function handleSubmit(e: Event) {
+		e.preventDefault();
+
+		if (!novelUrl.trim()) {
+			error = 'Please enter a URL';
+			return;
+		}
+
+		submitting = true;
+		error = null;
+
+		try {
+			const result = await client
+				.mutation(ImportNovelDocument, { input: { novelUrl: novelUrl.trim() } })
+				.toPromise();
+
+			if (result.error) {
+				error = result.error.message;
+				return;
+			}
+
+			if (result.data?.importNovel?.novelUpdateRequestedEvent) {
+				success = true;
+				setTimeout(() => {
+					handleClose();
+					onSuccess?.();
+				}, 1500);
+			}
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Unknown error occurred';
+		} finally {
+			submitting = false;
+		}
+	}
+
+	function handleClose() {
+		novelUrl = '';
+		error = null;
+		success = false;
+		onClose();
+	}
+
+	function handleBackdropClick(e: MouseEvent) {
+		if (e.target === e.currentTarget) {
+			handleClose();
+		}
+	}
+
+	function handleKeydown(e: KeyboardEvent) {
+		if (e.key === 'Escape') {
+			handleClose();
+		}
+	}
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+{#if open}
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm"
+		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
+		role="dialog"
+		aria-modal="true"
+		aria-labelledby="import-modal-title"
+		tabindex="-1"
+	>
+		<Card class="w-full max-w-md mx-4 shadow-xl">
+			<CardHeader>
+				<CardTitle id="import-modal-title">Import Novel</CardTitle>
+				<p class="text-muted-foreground text-sm">
+					Enter the URL of the novel you want to import
+				</p>
+			</CardHeader>
+			<CardContent>
+				<form onsubmit={handleSubmit} class="space-y-4">
+					<div class="space-y-2">
+						<label for="novel-url" class="text-sm font-medium">Novel URL</label>
+						<Input
+							id="novel-url"
+							type="url"
+							placeholder="https://example.com/novel/..."
+							bind:value={novelUrl}
+							disabled={submitting || success}
+						/>
+					</div>
+
+					{#if error}
+						<p class="text-destructive text-sm">{error}</p>
+					{/if}
+
+					{#if success}
+						<p class="text-green-600 dark:text-green-400 text-sm">
+							Import request submitted successfully!
+						</p>
+					{/if}
+
+					<div class="flex justify-end gap-2 pt-2">
+						<Button
+							type="button"
+							variant="outline"
+							onclick={handleClose}
+							disabled={submitting}
+						>
+							Cancel
+						</Button>
+						<Button type="submit" disabled={submitting || success || !novelUrl.trim()}>
+							{#if submitting}
+								Importing...
+							{:else if success}
+								Done
+							{:else}
+								Import
+							{/if}
+						</Button>
+					</div>
+				</form>
+			</CardContent>
+		</Card>
+	</div>
+{/if}

fictionarchive-web-astro/src/lib/components/Navbar.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { Input } from '$lib/components/ui/input';
 	import * as NavigationMenu from '$lib/components/ui/navigation-menu';
 	import AuthenticationDisplay from './AuthenticationDisplay.svelte';
+	import SearchBar from './SearchBar.svelte';
 
 	let pathname = $state(typeof window !== 'undefined' ? window.location.pathname : '/');
 
@@ -27,7 +27,7 @@
 			</NavigationMenu.List>
 		</NavigationMenu.Root>
 		<div class="flex-1"></div>
-		<Input type="search" placeholder="Search..." class="max-w-xs" />
+		<SearchBar />
 		<AuthenticationDisplay />
 	</nav>
 </header>

fictionarchive-web-astro/src/lib/components/NovelCard.svelte

@@ -1,5 +1,6 @@
 <script lang="ts" module>
 	import type { NovelsQuery, NovelStatus } from '$lib/graphql/__generated__/graphql';
+	import { SystemTags } from '$lib/constants/systemTags';
 
 	export type NovelNode = NonNullable<NonNullable<NovelsQuery['novels']>['edges']>[number]['node'];
 
@@ -38,14 +39,8 @@
 
 	let { novel }: NovelCardProps = $props();
 
-	function pickText(novelText?: NovelNode['name'] | NovelNode['description']) {
-		const texts = novelText?.texts ?? [];
-		const english = texts.find((t) => t.language === 'EN');
-		return (english ?? texts[0])?.text ?? 'No description available.';
-	}
-
-	const title = $derived(pickText(novel.name));
-	const descriptionRaw = $derived(pickText(novel.description));
+	const title = $derived(novel.name || 'Untitled');
+	const descriptionRaw = $derived(novel.description || 'No description available.');
 	const descriptionHtml = $derived(sanitizeHtml(descriptionRaw));
 	const coverSrc = $derived(novel.coverImage?.newPath ?? novel.coverImage?.originalPath);
 
@@ -61,6 +56,8 @@
 	const status = $derived(novel.rawStatus ?? 'UNKNOWN');
 	const statusColor = $derived(statusColors[status]);
 	const statusLabel = $derived(statusLabels[status]);
+
+	const isNsfw = $derived(novel.tags?.some((tag) => tag.key === SystemTags.Nsfw) ?? false);
 </script>
 
 <a
@@ -82,6 +79,9 @@
 			>
 				{statusLabel}
 			</Badge>
+			{#if isNsfw}
+				<Badge class="absolute top-9 right-2 bg-red-600 text-white shadow-sm">NSFW</Badge>
+			{/if}
 		</div>
 		<CardHeader class="space-y-2 pt-4">
 			<CardTitle class="line-clamp-2 text-lg leading-tight" title={title}>

fictionarchive-web-astro/src/lib/components/NovelDetailPage.svelte

@@ -1,25 +1,860 @@
+<script lang="ts" module>
+	import type { NovelQuery, NovelStatus, Language, GetBookmarksQuery } from '$lib/graphql/__generated__/graphql';
+	import { TagType } from '$lib/graphql/__generated__/graphql';
+	import { SystemTags } from '$lib/constants/systemTags';
+
+	export type BookmarkData = GetBookmarksQuery['bookmarks'][number];
+
+	export type NovelNode = NonNullable<NonNullable<NovelQuery['novels']>['nodes']>[number];
+
+	const statusColors: Record<NovelStatus, string> = {
+		IN_PROGRESS: 'bg-green-500 text-white',
+		COMPLETED: 'bg-blue-500 text-white',
+		HIATUS: 'bg-amber-500 text-white',
+		ABANDONED: 'bg-gray-500 text-white',
+		UNKNOWN: 'bg-gray-500 text-white'
+	};
+
+	const statusLabels: Record<NovelStatus, string> = {
+		IN_PROGRESS: 'Ongoing',
+		COMPLETED: 'Complete',
+		HIATUS: 'Hiatus',
+		ABANDONED: 'Dropped',
+		UNKNOWN: 'Unknown'
+	};
+
+	const languageLabels: Record<Language, string> = {
+		EN: 'English',
+		KR: 'Korean',
+		JA: 'Japanese',
+		CH: 'Chinese'
+	};
+</script>
+
 <script lang="ts">
-	import { Card, CardContent, CardHeader, CardTitle } from '$lib/components/ui/card';
+	import { onMount } from 'svelte';
+	import { client } from '$lib/graphql/client';
+	import { NovelDocument, ImportNovelDocument, DeleteNovelDocument, GetBookmarksDocument } from '$lib/graphql/__generated__/graphql';
+	import { isAuthenticated } from '$lib/auth/authStore';
+	import { Card, CardContent, CardHeader } from '$lib/components/ui/card';
+	import { Badge } from '$lib/components/ui/badge';
+	import { Button } from '$lib/components/ui/button';
+	import { Tabs, TabsList, TabsTrigger, TabsContent } from '$lib/components/ui/tabs';
+	import {
+		Accordion,
+		AccordionItem,
+		AccordionTrigger,
+		AccordionContent
+	} from '$lib/components/ui/accordion';
+	import {
+		Tooltip,
+		TooltipTrigger,
+		TooltipContent,
+		TooltipProvider
+	} from '$lib/components/ui/tooltip';
+	import { formatRelativeTime, formatAbsoluteTime } from '$lib/utils/time';
+	import { sanitizeHtml } from '$lib/utils/sanitize';
+	// Direct imports for faster builds
+	import ArrowLeft from '@lucide/svelte/icons/arrow-left';
+	import ExternalLink from '@lucide/svelte/icons/external-link';
+	import BookOpen from '@lucide/svelte/icons/book-open';
+	import ChevronDown from '@lucide/svelte/icons/chevron-down';
+	import ChevronUp from '@lucide/svelte/icons/chevron-up';
+	import RefreshCw from '@lucide/svelte/icons/refresh-cw';
+	import Trash2 from '@lucide/svelte/icons/trash-2';
+	import X from '@lucide/svelte/icons/x';
+	import ChevronLeft from '@lucide/svelte/icons/chevron-left';
+	import ChevronRight from '@lucide/svelte/icons/chevron-right';
 
 	interface Props {
 		novelId?: string;
 	}
 
 	let { novelId }: Props = $props();
+
+	let novel: NovelNode | null = $state(null);
+	let fetching = $state(true);
+	let error: string | null = $state(null);
+	let descriptionExpanded = $state(false);
+	let refreshing = $state(false);
+	let refreshError: string | null = $state(null);
+	let refreshSuccess = $state(false);
+
+	// Delete state
+	let showDeleteConfirm = $state(false);
+	let deleting = $state(false);
+	let deleteError: string | null = $state(null);
+
+	// Image viewer state
+	type GalleryImage = {
+		src: string;
+		alt: string;
+		volumeOrder?: number;
+		chapterId?: number;
+		chapterOrder?: number;
+		chapterName?: string;
+		isCover: boolean;
+	};
+	let viewerOpen = $state(false);
+	let viewerIndex = $state(0);
+	let activeTab = $state('chapters');
+	let galleryLoaded = $state(false);
+
+	// Bookmarks state
+	let bookmarks: BookmarkData[] = $state([]);
+	let bookmarksLoaded = $state(false);
+	let bookmarksFetching = $state(false);
+
+	const DESCRIPTION_PREVIEW_LENGTH = 300;
+
+	// Derived values
+	const coverSrc = $derived(novel?.coverImage?.newPath);
+	const status = $derived(novel?.rawStatus ?? 'UNKNOWN');
+	const statusColor = $derived(statusColors[status]);
+	const statusLabel = $derived(statusLabels[status]);
+	const language = $derived(novel?.rawLanguage ?? 'EN');
+	const languageLabel = $derived(languageLabels[language]);
+
+	const lastUpdated = $derived(novel?.lastUpdatedTime ? new Date(novel.lastUpdatedTime) : null);
+	const relativeTime = $derived(lastUpdated ? formatRelativeTime(lastUpdated) : null);
+	const absoluteTime = $derived(lastUpdated ? formatAbsoluteTime(lastUpdated) : null);
+
+	const description = $derived(novel?.description ?? '');
+	const descriptionHtml = $derived(sanitizeHtml(description));
+	const isDescriptionLong = $derived(description.length > DESCRIPTION_PREVIEW_LENGTH);
+	const truncatedDescriptionHtml = $derived(
+		isDescriptionLong && !descriptionExpanded
+			? sanitizeHtml(description.slice(0, DESCRIPTION_PREVIEW_LENGTH) + '...')
+			: descriptionHtml
+	);
+
+	// Volume-aware chapter organization
+	const sortedVolumes = $derived(
+		[...(novel?.volumes ?? [])].sort((a, b) => a.order - b.order)
+	);
+
+	const isSingleVolume = $derived(sortedVolumes.length === 1);
+
+	// Chapter lookup for bookmarks (maps chapterId to chapter details)
+	const chapterLookup = $derived(
+		new Map(
+			sortedVolumes.flatMap((v) =>
+				v.chapters.map((c) => [c.id, { ...c, volumeOrder: v.order }])
+			)
+		)
+	);
+
+	const chapterCount = $derived(
+		sortedVolumes.reduce((sum, v) => sum + v.chapters.length, 0)
+	);
+
+	// Filter out system tags for display, check for NSFW
+	const displayTags = $derived(novel?.tags?.filter((tag) => tag.tagType !== TagType.System) ?? []);
+	const isNsfw = $derived(novel?.tags?.some((tag) => tag.key === SystemTags.Nsfw) ?? false);
+
+	const canRefresh = $derived(() => {
+		if (!lastUpdated) return true;
+		const sixHoursAgo = Date.now() - 6 * 60 * 60 * 1000;
+		return lastUpdated.getTime() < sixHoursAgo;
+	});
+
+	// Gallery images - cover + chapter images
+	const galleryImages = $derived.by(() => {
+		const images: GalleryImage[] = [];
+
+		// Add cover image first
+		if (coverSrc && novel) {
+			images.push({ src: coverSrc, alt: `${novel.name} cover`, isCover: true });
+		}
+
+		// Add chapter images (loop through volumes to preserve volumeOrder)
+		for (const volume of sortedVolumes) {
+			const volumeChapters = [...volume.chapters].sort((a, b) => a.order - b.order);
+			for (const chapter of volumeChapters) {
+				for (const img of chapter.images ?? []) {
+					if (img.newPath) {
+						images.push({
+							src: img.newPath,
+							alt: `Image from ${chapter.name}`,
+							volumeOrder: volume.order,
+							chapterId: chapter.id,
+							chapterOrder: chapter.order,
+							chapterName: chapter.name,
+							isCover: false
+						});
+					}
+				}
+			}
+		}
+
+		return images;
+	});
+
+	const currentImage = $derived(galleryImages[viewerIndex]);
+	const imageCount = $derived(galleryImages.length);
+
+	// Load gallery images when tab is first activated
+	$effect(() => {
+		if (activeTab === 'gallery' && !galleryLoaded) {
+			galleryLoaded = true;
+		}
+	});
+
+	// Load bookmarks when tab is first activated
+	$effect(() => {
+		if (activeTab === 'bookmarks' && !bookmarksLoaded && novelId) {
+			fetchBookmarks();
+		}
+	});
+
+	async function fetchBookmarks() {
+		if (!novelId || bookmarksFetching) return;
+
+		bookmarksFetching = true;
+
+		try {
+			const result = await client
+				.query(GetBookmarksDocument, { novelId: parseInt(novelId, 10) })
+				.toPromise();
+
+			if (result.data?.bookmarks) {
+				bookmarks = result.data.bookmarks;
+			}
+		} catch {
+			// Silently fail - bookmarks are non-critical
+		} finally {
+			bookmarksFetching = false;
+			bookmarksLoaded = true;
+		}
+	}
+
+	// Image viewer functions
+	function openImageViewer(index: number) {
+		viewerIndex = index;
+		viewerOpen = true;
+	}
+
+	function closeViewer() {
+		viewerOpen = false;
+	}
+
+	function nextImage() {
+		if (galleryImages.length > 0) {
+			viewerIndex = (viewerIndex + 1) % galleryImages.length;
+		}
+	}
+
+	function prevImage() {
+		if (galleryImages.length > 0) {
+			viewerIndex = (viewerIndex - 1 + galleryImages.length) % galleryImages.length;
+		}
+	}
+
+	function handleViewerKeydown(e: KeyboardEvent) {
+		if (!viewerOpen) return;
+		if (e.key === 'Escape') closeViewer();
+		if (e.key === 'ArrowRight') nextImage();
+		if (e.key === 'ArrowLeft') prevImage();
+	}
+
+	async function fetchNovel() {
+		if (!novelId) {
+			error = 'No novel ID provided';
+			fetching = false;
+			return;
+		}
+
+		fetching = true;
+		error = null;
+
+		try {
+			const result = await client
+				.query(NovelDocument, { id: parseInt(novelId, 10) })
+				.toPromise();
+
+			if (result.error) {
+				error = result.error.message;
+				return;
+			}
+
+			const nodes = result.data?.novels?.nodes;
+			if (nodes && nodes.length > 0) {
+				novel = nodes[0];
+				document.title = novel.name;
+			} else {
+				error = 'Novel not found';
+			}
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Unknown error';
+		} finally {
+			fetching = false;
+		}
+	}
+
+	async function refreshNovel() {
+		if (!novel?.url) return;
+
+		refreshing = true;
+		refreshError = null;
+		refreshSuccess = false;
+
+		try {
+			const result = await client
+				.mutation(ImportNovelDocument, { input: { novelUrl: novel.url } })
+				.toPromise();
+
+			if (result.error) {
+				refreshError = result.error.message;
+			} else {
+				refreshSuccess = true;
+				setTimeout(() => (refreshSuccess = false), 2000);
+			}
+		} catch (e) {
+			refreshError = e instanceof Error ? e.message : 'Failed to refresh';
+		} finally {
+			refreshing = false;
+		}
+	}
+
+	async function deleteNovel() {
+		if (!novel) return;
+
+		deleting = true;
+		deleteError = null;
+
+		try {
+			const result = await client
+				.mutation(DeleteNovelDocument, { input: { novelId: novel.id } })
+				.toPromise();
+
+			if (result.error) {
+				deleteError = result.error.message;
+			} else if (result.data?.deleteNovel?.errors?.length) {
+				deleteError = result.data.deleteNovel.errors[0].message;
+			} else {
+				// Successfully deleted - redirect to novels list
+				window.location.href = '/novels';
+			}
+		} catch (e) {
+			deleteError = e instanceof Error ? e.message : 'Failed to delete';
+		} finally {
+			deleting = false;
+		}
+	}
+
+	onMount(() => {
+		fetchNovel();
+	});
 </script>
 
-<Card class="shadow-md shadow-primary/10">
-	<CardHeader>
-		<CardTitle>Novel Details</CardTitle>
-	</CardHeader>
-	<CardContent>
-		<p class="text-sm text-muted-foreground">
-			{#if novelId}
-				Viewing novel ID: <code class="rounded bg-muted px-1 py-0.5">{novelId}</code>
+<div class="space-y-6">
+	<!-- Back Navigation -->
+	<Button variant="ghost" href="/novels" class="gap-2 -ml-2">
+		<ArrowLeft class="h-4 w-4" />
+		Back to Novels
+	</Button>
+
+	<!-- Loading State -->
+	{#if fetching}
+		<Card>
+			<CardContent>
+				<div class="flex items-center justify-center py-12">
+					<div
+						class="border-primary h-10 w-10 animate-spin rounded-full border-2 border-t-transparent"
+						aria-label="Loading novel"
+					></div>
+				</div>
+			</CardContent>
+		</Card>
+	{/if}
+
+	<!-- Error State -->
+	{#if error && !fetching}
+		<Card class="border-destructive/40 bg-destructive/5">
+			<CardContent class="py-8">
+				<div class="text-center">
+					<p class="text-destructive text-lg font-medium">
+						{error === 'Novel not found' ? 'Novel Not Found' : 'Error Loading Novel'}
+					</p>
+					<p class="text-muted-foreground mt-2 text-sm">{error}</p>
+					<Button variant="outline" onclick={fetchNovel} class="mt-4">
+						Try Again
+					</Button>
+				</div>
+			</CardContent>
+		</Card>
+	{/if}
+
+	<!-- Novel Content -->
+	{#if novel && !fetching}
+		<!-- Header Section (Metadata + Tags + Description) -->
+		<Card class="shadow-md shadow-primary/10 overflow-hidden">
+			<CardContent class="p-0">
+				<!-- Cover Image + Metadata + Tags -->
+				<div class="flex flex-col sm:flex-row gap-6 p-6 pb-4">
+					<!-- Cover Image -->
+					<div class="shrink-0 sm:w-40">
+						{#if coverSrc}
+							<div class="aspect-[3/4] w-full overflow-hidden rounded-lg bg-muted/50">
+								<img
+									src={coverSrc}
+									alt={novel.name}
+									class="h-full w-full object-cover"
+								/>
+							</div>
+						{:else}
+							<div class="aspect-[3/4] w-full rounded-lg bg-muted/50 flex items-center justify-center">
+								<BookOpen class="h-12 w-12 text-muted-foreground/50" />
+							</div>
+						{/if}
+					</div>
+
+					<!-- Metadata + Tags -->
+					<div class="flex-1 space-y-3">
+						<div>
+							<h1 class="text-2xl font-bold leading-tight">{novel.name}</h1>
+							{#if novel.author}
+								<p class="text-muted-foreground mt-1">
+									by
+									<a
+										href="/novels?author={encodeURIComponent(novel.author.name)}"
+										class="text-primary hover:underline"
+									>
+										{novel.author.name}
+									</a>
+								</p>
+							{/if}
+						</div>
+
+						<!-- Badges -->
+						<div class="flex flex-wrap gap-2 items-center">
+							<Badge class={statusColor}>{statusLabel}</Badge>
+							{#if isNsfw}
+								<Badge class="bg-red-600 text-white">NSFW</Badge>
+							{/if}
+							<Badge variant="outline">{languageLabel}</Badge>
+							{#if $isAuthenticated}
+								<TooltipProvider>
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<Button
+												variant="outline"
+												size="sm"
+												onclick={refreshNovel}
+												disabled={refreshing || !canRefresh()}
+												class="gap-1.5 h-6 text-xs"
+											>
+												<RefreshCw class="h-3 w-3 {refreshing ? 'animate-spin' : ''}" />
+												{refreshing ? 'Refreshing...' : 'Refresh'}
+											</Button>
+										</TooltipTrigger>
+										{#if !canRefresh()}
+											<TooltipContent>
+												Updated less than 6 hours ago
+											</TooltipContent>
+										{/if}
+									</Tooltip>
+								</TooltipProvider>
+								<Button
+									variant="destructive"
+									size="sm"
+									onclick={() => (showDeleteConfirm = true)}
+									class="gap-1.5 h-6 text-xs"
+								>
+									<Trash2 class="h-3 w-3" />
+									Delete
+								</Button>
+							{/if}
+							{#if refreshSuccess}
+								<Badge variant="outline" class="bg-green-500/10 text-green-600 border-green-500/30">
+									Refresh queued
+								</Badge>
+							{/if}
+							{#if refreshError}
+								<Badge variant="outline" class="bg-destructive/10 text-destructive border-destructive/30">
+									{refreshError}
+								</Badge>
+							{/if}
+						</div>
+
+						<!-- Stats (inline) -->
+						<div class="text-sm text-muted-foreground flex flex-wrap gap-x-4 gap-y-1">
+							{#if novel.source}
+								<span>
+									Source:
+									<a
+										href={novel.url}
+										target="_blank"
+										rel="noopener noreferrer"
+										class="text-primary hover:underline inline-flex items-center gap-1"
+									>
+										{novel.source.name}
+										<ExternalLink class="h-3 w-3" />
+									</a>
+								</span>
+							{/if}
+							{#if relativeTime && absoluteTime}
+								<span>
+									Updated:
+									<TooltipProvider>
+										<Tooltip>
+											<TooltipTrigger class="cursor-default hover:text-foreground transition-colors">
+												<time datetime={lastUpdated?.toISOString()}>{relativeTime}</time>
+											</TooltipTrigger>
+											<TooltipContent>{absoluteTime}</TooltipContent>
+										</Tooltip>
+									</TooltipProvider>
+								</span>
+							{/if}
+							<span>{chapterCount} chapters</span>
+						</div>
+
+						<!-- Tags -->
+						{#if displayTags.length > 0}
+							<div class="flex flex-wrap gap-1.5 pt-1">
+								{#each displayTags as tag (tag.key)}
+									<Badge
+										variant="secondary"
+										href="/novels?tags={tag.key}"
+										class="cursor-pointer hover:bg-secondary/80 transition-colors text-xs"
+									>
+										{tag.displayName}
+									</Badge>
+								{/each}
+							</div>
+						{/if}
+					</div>
+				</div>
+
+				<!-- Description (full width below) -->
+				{#if description}
+					<div class="border-t px-6 py-4">
+						<div class="prose prose-sm dark:prose-invert max-w-none text-muted-foreground">
+							{@html truncatedDescriptionHtml}
+						</div>
+						{#if isDescriptionLong}
+							<Button
+								variant="ghost"
+								size="sm"
+								onclick={() => (descriptionExpanded = !descriptionExpanded)}
+								class="mt-2 gap-1 -ml-2"
+							>
+								{#if descriptionExpanded}
+									<ChevronUp class="h-4 w-4" />
+									Show less
+								{:else}
+									<ChevronDown class="h-4 w-4" />
+									Show more
+								{/if}
+							</Button>
+						{/if}
+					</div>
+				{/if}
+			</CardContent>
+		</Card>
+
+		<!-- Tabbed Content -->
+		<Card>
+			<Tabs bind:value={activeTab} class="w-full">
+				<CardHeader class="pb-0">
+					<TabsList class="grid w-full grid-cols-3 bg-muted/50 p-1 rounded-lg">
+						<TabsTrigger
+							value="chapters"
+							class="rounded-md data-[state=active]:bg-background data-[state=active]:shadow-sm px-3 py-1.5 text-sm font-medium transition-all"
+						>
+							Chapters ({chapterCount})
+						</TabsTrigger>
+						<TabsTrigger
+							value="gallery"
+							class="rounded-md data-[state=active]:bg-background data-[state=active]:shadow-sm px-3 py-1.5 text-sm font-medium transition-all"
+						>
+							Gallery ({imageCount})
+						</TabsTrigger>
+						<TabsTrigger
+							value="bookmarks"
+							class="rounded-md data-[state=active]:bg-background data-[state=active]:shadow-sm px-3 py-1.5 text-sm font-medium transition-all"
+						>
+							Bookmarks{bookmarksLoaded ? ` (${bookmarks.length})` : ''}
+						</TabsTrigger>
+					</TabsList>
+				</CardHeader>
+
+				<CardContent class="pt-4">
+					<TabsContent value="chapters" class="mt-0">
+						{#if chapterCount === 0}
+							<p class="text-muted-foreground text-sm py-4 text-center">
+								No chapters available yet.
+							</p>
+						{:else if isSingleVolume}
+							<!-- Single volume: flat chapter list -->
+							{@const singleVolumeChapters = [...(sortedVolumes[0]?.chapters ?? [])].sort((a, b) => a.order - b.order)}
+							<div class="max-h-96 overflow-y-auto -mx-2">
+								{#each singleVolumeChapters as chapter (chapter.id)}
+									{@const chapterDate = chapter.lastUpdatedTime ? new Date(chapter.lastUpdatedTime) : null}
+									<a
+										href="/novels/{novelId}/volumes/{sortedVolumes[0]?.order}/chapters/{chapter.order}"
+										class="flex items-center justify-between px-3 py-2.5 hover:bg-muted/50 rounded-md transition-colors group"
+									>
+										<div class="flex items-center gap-3 min-w-0">
+											<span class="text-muted-foreground text-sm font-medium shrink-0 w-14">
+												Ch. {chapter.order}
+											</span>
+											<span class="text-sm truncate group-hover:text-primary transition-colors">
+												{chapter.name}
+											</span>
+										</div>
+										{#if chapterDate}
+											<span class="text-xs text-muted-foreground/70 shrink-0 ml-2">
+												{formatRelativeTime(chapterDate)}
+											</span>
+										{/if}
+									</a>
+								{/each}
+							</div>
+						{:else}
+							<!-- Multiple volumes: accordion display -->
+							<div class="max-h-96 overflow-y-auto -mx-2">
+								<Accordion type="single">
+									{#each sortedVolumes as volume (volume.id)}
+										{@const volumeChapters = [...volume.chapters].sort((a, b) => a.order - b.order)}
+										<AccordionItem value="volume-{volume.id}">
+											<AccordionTrigger class="px-3">
+												<div class="flex items-center gap-3">
+													<span class="font-medium">{volume.name}</span>
+													<span class="text-xs text-muted-foreground">
+														({volumeChapters.length} chapters)
+													</span>
+												</div>
+											</AccordionTrigger>
+											<AccordionContent>
+												<div class="space-y-0.5">
+													{#each volumeChapters as chapter (chapter.id)}
+														{@const chapterDate = chapter.lastUpdatedTime ? new Date(chapter.lastUpdatedTime) : null}
+														<a
+															href="/novels/{novelId}/volumes/{volume.order}/chapters/{chapter.order}"
+															class="flex items-center justify-between px-3 py-2.5 hover:bg-muted/50 rounded-md transition-colors group"
+														>
+															<div class="flex items-center gap-3 min-w-0">
+																<span class="text-muted-foreground text-sm font-medium shrink-0 w-14">
+																	Ch. {chapter.order}
+																</span>
+																<span class="text-sm truncate group-hover:text-primary transition-colors">
+																	{chapter.name}
+																</span>
+															</div>
+															{#if chapterDate}
+																<span class="text-xs text-muted-foreground/70 shrink-0 ml-2">
+																	{formatRelativeTime(chapterDate)}
+																</span>
+															{/if}
+														</a>
+													{/each}
+												</div>
+											</AccordionContent>
+										</AccordionItem>
+									{/each}
+								</Accordion>
+							</div>
+						{/if}
+					</TabsContent>
+
+					<TabsContent value="gallery" class="mt-0">
+						{#if galleryImages.length === 0}
+							<p class="text-muted-foreground text-sm py-4 text-center">
+								No images available.
+							</p>
+						{:else if galleryLoaded}
+							<div class="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-5 gap-2">
+								{#each galleryImages as image, index (image.src)}
+									<button
+										type="button"
+										onclick={() => openImageViewer(index)}
+										class="relative aspect-square overflow-hidden rounded-md bg-muted/50 hover:ring-2 ring-primary transition-all"
+									>
+										<img src={image.src} alt={image.alt} class="h-full w-full object-cover" loading="lazy" />
+										{#if image.isCover}
+											<Badge class="absolute top-1 left-1 text-xs">Cover</Badge>
+										{/if}
+									</button>
+								{/each}
+							</div>
+						{:else}
+							<div class="flex items-center justify-center py-8">
+								<div
+									class="border-primary h-8 w-8 animate-spin rounded-full border-2 border-t-transparent"
+									aria-label="Loading gallery"
+								></div>
+							</div>
+						{/if}
+					</TabsContent>
+
+					<TabsContent value="bookmarks" class="mt-0">
+						{#if bookmarksFetching}
+							<div class="flex items-center justify-center py-8">
+								<div
+									class="border-primary h-8 w-8 animate-spin rounded-full border-2 border-t-transparent"
+									aria-label="Loading bookmarks"
+								></div>
+							</div>
+						{:else if bookmarks.length === 0}
+							<p class="text-muted-foreground text-sm py-8 text-center">
+								No bookmarks yet. Add bookmarks while reading chapters.
+							</p>
+						{:else}
+							<div class="max-h-96 overflow-y-auto -mx-2">
+								{#each bookmarks as bookmark (bookmark.id)}
+									{@const chapter = chapterLookup.get(bookmark.chapterId)}
+									{#if chapter}
+										{@const bookmarkDate = new Date(bookmark.createdTime)}
+										<a
+											href="/novels/{novelId}/volumes/{chapter.volumeOrder}/chapters/{chapter.order}"
+											class="flex items-center justify-between px-3 py-2.5 hover:bg-muted/50 rounded-md transition-colors group"
+										>
+											<div class="flex-1 min-w-0">
+												<div class="flex items-center gap-3">
+													<span class="text-muted-foreground text-sm font-medium shrink-0 w-14">
+														Ch. {chapter.order}
+													</span>
+													<span class="text-sm truncate group-hover:text-primary transition-colors">
+														{chapter.name}
+													</span>
+												</div>
+												{#if bookmark.description}
+													<p class="text-xs text-muted-foreground/70 mt-1 ml-[4.25rem] truncate">
+														{bookmark.description}
+													</p>
+												{/if}
+											</div>
+											<span class="text-xs text-muted-foreground/70 shrink-0 ml-2">
+												{formatRelativeTime(bookmarkDate)}
+											</span>
+										</a>
+									{/if}
+								{/each}
+							</div>
+						{/if}
+					</TabsContent>
+				</CardContent>
+			</Tabs>
+		</Card>
+	{/if}
+</div>
+
+<!-- Image Viewer Modal -->
+{#if viewerOpen && currentImage}
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/90 backdrop-blur-sm"
+		onclick={closeViewer}
+		onkeydown={handleViewerKeydown}
+		role="dialog"
+		aria-modal="true"
+		tabindex="-1"
+	>
+		<!-- Close button -->
+		<Button
+			variant="ghost"
+			size="icon"
+			class="absolute top-4 right-4 text-white hover:bg-white/10"
+			onclick={closeViewer}
+		>
+			<X class="h-6 w-6" />
+		</Button>
+
+		<!-- Navigation arrows -->
+		{#if galleryImages.length > 1}
+			<Button
+				variant="ghost"
+				size="icon"
+				class="absolute left-4 text-white hover:bg-white/10 h-12 w-12"
+				onclick={(e: MouseEvent) => { e.stopPropagation(); prevImage(); }}
+			>
+				<ChevronLeft class="h-8 w-8" />
+			</Button>
+			<Button
+				variant="ghost"
+				size="icon"
+				class="absolute right-4 top-1/2 -translate-y-1/2 text-white hover:bg-white/10 h-12 w-12"
+				onclick={(e: MouseEvent) => { e.stopPropagation(); nextImage(); }}
+			>
+				<ChevronRight class="h-8 w-8" />
+			</Button>
+		{/if}
+
+		<!-- Image container -->
+		<!-- svelte-ignore a11y_click_events_have_key_events -->
+		<!-- svelte-ignore a11y_no_static_element_interactions -->
+		<div class="flex flex-col items-center max-w-[90vw] max-h-[90vh]" onclick={(e: MouseEvent) => e.stopPropagation()}>
+			<img
+				src={currentImage.src}
+				alt={currentImage.alt}
+				class="max-w-full max-h-[80vh] object-contain rounded-lg"
+			/>
+
+			<!-- Chapter link (if not cover) -->
+			{#if !currentImage.isCover && currentImage.volumeOrder != null && currentImage.chapterOrder}
+				<a
+					href="/novels/{novelId}/volumes/{currentImage.volumeOrder}/chapters/{currentImage.chapterOrder}"
+					class="text-white/80 hover:text-white text-sm inline-flex items-center gap-1 mt-3"
+				>
+					From: Ch. {currentImage.chapterOrder} - {currentImage.chapterName}
+					<ExternalLink class="h-3 w-3" />
+				</a>
 			{/if}
-		</p>
-		<p class="mt-2 text-sm text-muted-foreground">
-			Detail view coming soon. Select a novel to explore chapters and metadata once implemented.
-		</p>
-	</CardContent>
-</Card>
+
+			<!-- Image counter -->
+			<div class="text-white/60 text-sm mt-2">
+				{viewerIndex + 1} / {galleryImages.length}
+			</div>
+		</div>
+	</div>
+{/if}
+
+<!-- Delete Confirmation Modal -->
+{#if showDeleteConfirm && novel}
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm"
+		onclick={() => !deleting && (showDeleteConfirm = false)}
+		onkeydown={(e) => e.key === 'Escape' && !deleting && (showDeleteConfirm = false)}
+		role="dialog"
+		aria-modal="true"
+		aria-labelledby="delete-modal-title"
+		tabindex="-1"
+	>
+		<!-- svelte-ignore a11y_click_events_have_key_events -->
+		<!-- svelte-ignore a11y_no_static_element_interactions -->
+		<div onclick={(e: MouseEvent) => e.stopPropagation()}>
+			<Card class="w-full max-w-md mx-4 shadow-xl">
+				<CardHeader>
+					<h2 id="delete-modal-title" class="text-lg font-semibold">Delete Novel</h2>
+				</CardHeader>
+				<CardContent class="space-y-4">
+					<p class="text-muted-foreground">
+						Are you sure you want to delete <strong class="text-foreground">{novel.name}</strong>?
+					</p>
+					<p class="text-sm text-muted-foreground">
+						This will permanently delete the novel, all chapters, images, and translations. This action cannot be undone.
+					</p>
+					{#if deleteError}
+						<p class="text-sm text-destructive">{deleteError}</p>
+					{/if}
+					<div class="flex justify-end gap-2 pt-2">
+						<Button
+							variant="outline"
+							onclick={() => (showDeleteConfirm = false)}
+							disabled={deleting}
+						>
+							Cancel
+						</Button>
+						<Button
+							variant="destructive"
+							onclick={deleteNovel}
+							disabled={deleting}
+						>
+							{deleting ? 'Deleting...' : 'Delete'}
+						</Button>
+					</div>
+				</CardContent>
+			</Card>
+		</div>
+	</div>
+{/if}

fictionarchive-web-astro/src/lib/components/NovelFilters.svelte

@@ -0,0 +1,320 @@
+<script lang="ts">
+	import { Select } from 'bits-ui';
+	// Direct imports for faster Astro builds
+	import Search from '@lucide/svelte/icons/search';
+	import X from '@lucide/svelte/icons/x';
+	import ChevronDown from '@lucide/svelte/icons/chevron-down';
+	import Check from '@lucide/svelte/icons/check';
+	import { Input } from '$lib/components/ui/input';
+	import { Button } from '$lib/components/ui/button';
+	import { Badge } from '$lib/components/ui/badge';
+	import { type NovelFilters, type SortField, type SortDirection, hasActiveFilters, EMPTY_FILTERS } from '$lib/utils/filterParams';
+	import { NovelStatus, type NovelTagDto } from '$lib/graphql/__generated__/graphql';
+
+	interface Props {
+		filters: NovelFilters;
+		onFilterChange: (filters: NovelFilters) => void;
+		availableTags: Pick<NovelTagDto, 'key' | 'displayName'>[];
+	}
+
+	let { filters, onFilterChange, availableTags }: Props = $props();
+
+	// Local state for search input (for debouncing)
+	let searchInput = $state(filters.search);
+	let authorInput = $state(filters.authorName);
+	let searchTimeout: ReturnType<typeof setTimeout> | null = null;
+	let authorTimeout: ReturnType<typeof setTimeout> | null = null;
+
+	// Status options
+	const statusOptions: { value: NovelStatus; label: string }[] = [
+		{ value: NovelStatus.InProgress, label: 'In Progress' },
+		{ value: NovelStatus.Completed, label: 'Completed' },
+		{ value: NovelStatus.Hiatus, label: 'Hiatus' },
+		{ value: NovelStatus.Abandoned, label: 'Abandoned' },
+		{ value: NovelStatus.Unknown, label: 'Unknown' }
+	];
+
+	// Sort options
+	const sortOptions: { value: `${SortField}-${SortDirection}`; label: string }[] = [
+		{ value: 'lastUpdatedTime-DESC', label: 'Recently Updated' },
+		{ value: 'lastUpdatedTime-ASC', label: 'Oldest Updated' },
+		{ value: 'createdTime-DESC', label: 'Recently Added' },
+		{ value: 'createdTime-ASC', label: 'Oldest Added' },
+		{ value: 'name-ASC', label: 'Name (A-Z)' },
+		{ value: 'name-DESC', label: 'Name (Z-A)' }
+	];
+
+	// Current sort value as combined string for the select
+	const currentSortValue = $derived(`${filters.sort.field}-${filters.sort.direction}` as const);
+
+	// Derived state for display
+	const selectedStatusLabels = $derived(
+		filters.statuses.map((s) => statusOptions.find((o) => o.value === s)?.label ?? s).join(', ')
+	);
+
+	const selectedTagLabels = $derived(
+		filters.tags.map((t) => availableTags.find((tag) => tag.key === t)?.displayName ?? t).join(', ')
+	);
+
+	// Debounced search handler
+	function handleSearchInput(value: string) {
+		searchInput = value;
+		if (searchTimeout) clearTimeout(searchTimeout);
+		searchTimeout = setTimeout(() => {
+			onFilterChange({ ...filters, search: value });
+		}, 300);
+	}
+
+	// Debounced author handler
+	function handleAuthorInput(value: string) {
+		authorInput = value;
+		if (authorTimeout) clearTimeout(authorTimeout);
+		authorTimeout = setTimeout(() => {
+			onFilterChange({ ...filters, authorName: value });
+		}, 300);
+	}
+
+	// Status selection handler
+	function handleStatusChange(selected: NovelStatus[]) {
+		onFilterChange({ ...filters, statuses: selected });
+	}
+
+	// Tag selection handler
+	function handleTagChange(selected: string[]) {
+		onFilterChange({ ...filters, tags: selected });
+	}
+
+	// Sort selection handler
+	function handleSortChange(value: string) {
+		const [field, direction] = value.split('-') as [SortField, SortDirection];
+		onFilterChange({ ...filters, sort: { field, direction } });
+	}
+
+	// Clear all filters
+	function clearFilters() {
+		searchInput = '';
+		authorInput = '';
+		onFilterChange({ ...EMPTY_FILTERS });
+	}
+
+	// Sync search input when filters prop changes externally
+	$effect(() => {
+		if (filters.search !== searchInput && !searchTimeout) {
+			searchInput = filters.search;
+		}
+	});
+
+	// Sync author input when filters prop changes externally
+	$effect(() => {
+		if (filters.authorName !== authorInput && !authorTimeout) {
+			authorInput = filters.authorName;
+		}
+	});
+</script>
+
+<div class="flex flex-wrap items-center gap-3">
+	<!-- Search Input -->
+	<div class="relative min-w-[200px] flex-1">
+		<Search class="text-muted-foreground absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2" />
+		<Input
+			type="text"
+			placeholder="Search novels..."
+			value={searchInput}
+			oninput={(e) => handleSearchInput(e.currentTarget.value)}
+			class="pl-9"
+		/>
+	</div>
+
+	<!-- Author Input -->
+	<div class="min-w-[150px]">
+		<Input
+			type="text"
+			placeholder="Author..."
+			value={authorInput}
+			oninput={(e) => handleAuthorInput(e.currentTarget.value)}
+		/>
+	</div>
+
+	<!-- Status Filter -->
+	<Select.Root
+		type="multiple"
+		value={filters.statuses}
+		onValueChange={(v) => handleStatusChange(v as NovelStatus[])}
+	>
+		<Select.Trigger
+			class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus:ring-ring flex h-9 min-w-[140px] items-center justify-between gap-2 rounded-md border px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-1 disabled:cursor-not-allowed disabled:opacity-50"
+		>
+			<span class="truncate text-left">
+				{filters.statuses.length > 0 ? selectedStatusLabels : 'Status'}
+			</span>
+			<ChevronDown class="h-4 w-4 opacity-50" />
+		</Select.Trigger>
+		<Select.Content
+			class="bg-popover text-popover-foreground z-50 max-h-60 min-w-[140px] overflow-auto rounded-md border p-1 shadow-md"
+		>
+			{#each statusOptions as option (option.value)}
+				<Select.Item
+					value={option.value}
+					class="hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
+				>
+					{#snippet children({ selected })}
+						<div
+							class="border-primary flex h-4 w-4 items-center justify-center rounded-sm border {selected
+								? 'bg-primary text-primary-foreground'
+								: ''}"
+						>
+							{#if selected}
+								<Check class="h-3 w-3" />
+							{/if}
+						</div>
+						<span>{option.label}</span>
+					{/snippet}
+				</Select.Item>
+			{/each}
+		</Select.Content>
+	</Select.Root>
+
+	<!-- Tags Filter -->
+	{#if availableTags.length > 0}
+		<Select.Root
+			type="multiple"
+			value={filters.tags}
+			onValueChange={(v) => handleTagChange(v as string[])}
+		>
+			<Select.Trigger
+				class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus:ring-ring flex h-9 min-w-[120px] items-center justify-between gap-2 rounded-md border px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-1 disabled:cursor-not-allowed disabled:opacity-50"
+			>
+				<span class="truncate text-left">
+					{filters.tags.length > 0 ? selectedTagLabels : 'Tags'}
+				</span>
+				<ChevronDown class="h-4 w-4 opacity-50" />
+			</Select.Trigger>
+			<Select.Content
+				class="bg-popover text-popover-foreground z-50 max-h-60 min-w-[180px] overflow-auto rounded-md border p-1 shadow-md"
+			>
+				{#each availableTags as tag (tag.key)}
+					<Select.Item
+						value={tag.key}
+						class="hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
+					>
+						{#snippet children({ selected })}
+							<div
+								class="border-primary flex h-4 w-4 items-center justify-center rounded-sm border {selected
+									? 'bg-primary text-primary-foreground'
+									: ''}"
+							>
+								{#if selected}
+									<Check class="h-3 w-3" />
+								{/if}
+							</div>
+							<span>{tag.displayName}</span>
+						{/snippet}
+					</Select.Item>
+				{/each}
+			</Select.Content>
+		</Select.Root>
+	{/if}
+
+	<!-- Sort Dropdown -->
+	<Select.Root
+		type="single"
+		value={currentSortValue}
+		onValueChange={(v) => v && handleSortChange(v)}
+	>
+		<Select.Trigger
+			class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus:ring-ring flex h-9 min-w-[160px] items-center justify-between gap-2 rounded-md border px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-1 disabled:cursor-not-allowed disabled:opacity-50"
+		>
+			<span class="truncate text-left">
+				{sortOptions.find((o) => o.value === currentSortValue)?.label ?? 'Sort by'}
+			</span>
+			<ChevronDown class="h-4 w-4 opacity-50" />
+		</Select.Trigger>
+		<Select.Content
+			class="bg-popover text-popover-foreground z-50 max-h-60 min-w-[160px] overflow-auto rounded-md border p-1 shadow-md"
+		>
+			{#each sortOptions as option (option.value)}
+				<Select.Item
+					value={option.value}
+					class="hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
+				>
+					{#snippet children({ selected })}
+						<div class="flex h-4 w-4 items-center justify-center">
+							{#if selected}
+								<Check class="h-3 w-3" />
+							{/if}
+						</div>
+						<span>{option.label}</span>
+					{/snippet}
+				</Select.Item>
+			{/each}
+		</Select.Content>
+	</Select.Root>
+
+	<!-- Clear Filters Button -->
+	{#if hasActiveFilters(filters)}
+		<Button variant="outline" size="sm" onclick={clearFilters} class="gap-1">
+			<X class="h-4 w-4" />
+			Clear
+		</Button>
+	{/if}
+</div>
+
+<!-- Active Filter Badges -->
+{#if hasActiveFilters(filters)}
+	<div class="mt-3 flex flex-wrap gap-2">
+		{#if filters.search}
+			<Badge variant="secondary" class="gap-1">
+				Search: {filters.search}
+				<button
+					onclick={() => {
+						searchInput = '';
+						onFilterChange({ ...filters, search: '' });
+					}}
+					class="hover:bg-secondary-foreground/20 ml-1 rounded-full p-0.5"
+				>
+					<X class="h-3 w-3" />
+				</button>
+			</Badge>
+		{/if}
+
+		{#if filters.authorName}
+			<Badge variant="secondary" class="gap-1">
+				Author: {filters.authorName}
+				<button
+					onclick={() => {
+						authorInput = '';
+						onFilterChange({ ...filters, authorName: '' });
+					}}
+					class="hover:bg-secondary-foreground/20 ml-1 rounded-full p-0.5"
+				>
+					<X class="h-3 w-3" />
+				</button>
+			</Badge>
+		{/if}
+
+		{#each filters.statuses as status (status)}
+			<Badge variant="secondary" class="gap-1">
+				{statusOptions.find((o) => o.value === status)?.label ?? status}
+				<button
+					onclick={() =>
+						onFilterChange({ ...filters, statuses: filters.statuses.filter((s) => s !== status) })}
+					class="hover:bg-secondary-foreground/20 ml-1 rounded-full p-0.5"
+				>
+					<X class="h-3 w-3" />
+				</button>
+			</Badge>
+		{/each}
+
+		{#each filters.tags as tag (tag)}
+			<Badge variant="secondary" class="gap-1">
+				{availableTags.find((t) => t.key === tag)?.displayName ?? tag}
+				<button
+					onclick={() => onFilterChange({ ...filters, tags: filters.tags.filter((t) => t !== tag) })}
+					class="hover:bg-secondary-foreground/20 ml-1 rounded-full p-0.5"
+				>
+					<X class="h-3 w-3" />
+				</button>
+			</Badge>
+		{/each}
+	</div>
+{/if}