Merge pull request '[FA-misc] Fix an oversight in the update process' (#51 ) from feature/FA-misc_NovelpiaResiliency into master

Reviewed-on: #51
[FA-misc] Fix an oversight in the update process
2025-12-11 19:16:39 +00:00 · 2025-12-11 14:16:21 -05:00 · 2025-12-11 14:54:12 +00:00 · 2025-12-11 09:53:54 -05:00
3 changed files with 12 additions and 7 deletions
--- a/FictionArchive.Service.NovelService/Program.cs
+++ b/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>();
--- a/FictionArchive.Service.NovelService/Services/NovelUpdateService.cs
+++ b/FictionArchive.Service.NovelService/Services/NovelUpdateService.cs
@@ -289,7 +289,8 @@ public class NovelUpdateService
            .Include(n => n.Description)
            .ThenInclude(lk => lk.Texts)
            .Include(n => n.Tags)
-            .Include(n => n.Chapters)
+            .Include(n => n.Chapters).ThenInclude(chapter => chapter.Body)
+            .ThenInclude(localizationKey => localizationKey.Texts)
            .Include(n => n.CoverImage)
            .FirstOrDefaultAsync(n =>
                n.ExternalId == metadata.ExternalId &&
--- a/FictionArchive.Service.Shared/FictionArchive.Service.Shared.csproj
+++ b/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>
Author	SHA1	Message	Date
conco	c21fe0fbd5	Merge pull request '[FA-misc] Fix an oversight in the update process' (#51 ) from feature/FA-misc_NovelpiaResiliency into master Some checks failed CI / build-backend (push) Successful in 1m2s Details CI / build-frontend (push) Successful in 41s Details Build Gateway / build-subgraphs (map[name:novel-service project:FictionArchive.Service.NovelService subgraph:Novel]) (push) Successful in 1m1s Details Build Gateway / build-subgraphs (map[name:scheduler-service project:FictionArchive.Service.SchedulerService subgraph:Scheduler]) (push) Successful in 48s Details Build Gateway / build-subgraphs (map[name:translation-service project:FictionArchive.Service.TranslationService subgraph:Translation]) (push) Successful in 45s Details Build Gateway / build-subgraphs (map[name:user-service project:FictionArchive.Service.UserService subgraph:User]) (push) Successful in 42s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.AuthenticationService/Dockerfile name:authentication-service]) (push) Successful in 2m12s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.FileService/Dockerfile name:file-service]) (push) Successful in 2m3s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.NovelService/Dockerfile name:novel-service]) (push) Successful in 1m48s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.SchedulerService/Dockerfile name:scheduler-service]) (push) Successful in 1m44s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.TranslationService/Dockerfile name:translation-service]) (push) Successful in 1m58s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.UserService/Dockerfile name:user-service]) (push) Successful in 1m55s Details Release / build-frontend (push) Failing after 59s Details Build Gateway / build-gateway (push) Successful in 3m38s Details Reviewed-on: #51	2025-12-11 19:16:39 +00:00
gamer147	bbc0b5ec7d	[FA-misc] Fix an oversight in the update process All checks were successful CI / build-backend (pull_request) Successful in 1m28s Details CI / build-frontend (pull_request) Successful in 53s Details	2025-12-11 14:16:21 -05:00
conco	5527c15ae7	Merge pull request '[FA-misc] Adds standard Polly Resiliency to Novelpia Http Clients' (#50 ) from feature/FA-misc_NovelpiaResiliency into master All checks were successful CI / build-backend (push) Successful in 1m0s Details CI / build-frontend (push) Successful in 41s Details Build Gateway / build-subgraphs (map[name:novel-service project:FictionArchive.Service.NovelService subgraph:Novel]) (push) Successful in 51s Details Build Gateway / build-subgraphs (map[name:scheduler-service project:FictionArchive.Service.SchedulerService subgraph:Scheduler]) (push) Successful in 48s Details Build Gateway / build-subgraphs (map[name:translation-service project:FictionArchive.Service.TranslationService subgraph:Translation]) (push) Successful in 49s Details Build Gateway / build-subgraphs (map[name:user-service project:FictionArchive.Service.UserService subgraph:User]) (push) Successful in 52s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.AuthenticationService/Dockerfile name:authentication-service]) (push) Successful in 2m23s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.FileService/Dockerfile name:file-service]) (push) Successful in 2m24s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.NovelService/Dockerfile name:novel-service]) (push) Successful in 1m43s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.SchedulerService/Dockerfile name:scheduler-service]) (push) Successful in 1m38s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.TranslationService/Dockerfile name:translation-service]) (push) Successful in 1m51s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.UserService/Dockerfile name:user-service]) (push) Successful in 1m34s Details Release / build-frontend (push) Successful in 1m33s Details Build Gateway / build-gateway (push) Successful in 4m1s Details Reviewed-on: #50	2025-12-11 14:54:12 +00:00
gamer147	1e374e6eeb	[FA-misc] Adds standard Polly Resiliency to Novelpia Http Clients All checks were successful CI / build-backend (pull_request) Successful in 1m28s Details CI / build-frontend (pull_request) Successful in 46s Details	2025-12-11 09:53:54 -05:00