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

Reviewed-on: #51

FictionArchive.Service.NovelService/GraphQL/Mutation.cs

@@ -7,7 +7,6 @@ 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;
@@ -27,12 +26,4 @@ public class Mutation
     {
         return await service.QueueChapterPull(novelId, chapterNumber);
     }
-
-    [Error<KeyNotFoundException>]
-    [Authorize]
-    public async Task<bool> DeleteNovel(uint novelId, NovelUpdateService service)
-    {
-        await service.DeleteNovel(novelId);
-        return true;
-    }
 }

FictionArchive.Service.NovelService/Services/NovelUpdateService.cs

@@ -379,23 +379,12 @@ public class NovelUpdateService
         var chapter = novel.Chapters.Where(chapter => chapter.Order == chapterNumber).FirstOrDefault();
         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)
         {
-            localizationText = new LocalizationText()
+            Text = rawChapter.Text,
-            {
+            Language = novel.RawLanguage
-                Text = rawChapter.Text,
+        };
-                Language = novel.RawLanguage
+        chapter.Body.Texts.Add(localizationText);
-            };
-            chapter.Body.Texts.Add(localizationText);
-        }
-        else
-        {
-            localizationText.Text = rawChapter.Text;
-        }
-        
         chapter.Images = rawChapter.ImageData.Select(img => new Image()
         {
             OriginalPath = img.Url
@@ -488,49 +477,4 @@ public class NovelUpdateService
         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.Chapters).ThenInclude(c => c.Images)
-            .Include(n => n.Chapters).ThenInclude(c => c.Name).ThenInclude(k => k.Texts)
-            .Include(n => n.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 };
-        locKeyIds.AddRange(novel.Chapters.Select(c => c.Name.Id));
-        locKeyIds.AddRange(novel.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 chapter in novel.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 chapter in novel.Chapters)
-            _dbContext.Images.RemoveRange(chapter.Images);
-
-        // 4. Remove novel - cascades: chapters, localization keys, tag mappings
-        _dbContext.Novels.Remove(novel);
-        await _dbContext.SaveChangesAsync();
-    }
 }

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

@@ -32,7 +32,7 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { client } from '$lib/graphql/client';
-	import { NovelDocument, ImportNovelDocument, DeleteNovelDocument } from '$lib/graphql/__generated__/graphql';
+	import { NovelDocument, ImportNovelDocument } 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';
@@ -53,7 +53,6 @@
 	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';
@@ -72,11 +71,6 @@
 	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;
@@ -125,6 +119,7 @@
 	const isNsfw = $derived(novel?.tags?.some((tag) => tag.key === SystemTags.Nsfw) ?? false);
 
 	const canRefresh = $derived(() => {
+		if (status === 'COMPLETED') return false;
 		if (!lastUpdated) return true;
 		const sixHoursAgo = Date.now() - 6 * 60 * 60 * 1000;
 		return lastUpdated.getTime() < sixHoursAgo;
@@ -256,32 +251,6 @@
 		}
 	}
 
-	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();
 	});
@@ -390,20 +359,11 @@
 										</TooltipTrigger>
 										{#if !canRefresh()}
 											<TooltipContent>
-												Updated less than 6 hours ago
+												{status === 'COMPLETED' ? 'Cannot refresh completed novels' : '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">
@@ -662,54 +622,3 @@
 		</div>
 	</div>
 {/if}
-
-<!-- Delete Confirmation Modal -->
-{#if showDeleteConfirm && novel}
-	<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
-	<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/graphql/__generated__/graphql.ts

@@ -88,17 +88,6 @@ export type DeleteJobPayload = {
   errors: Maybe<Array<DeleteJobError>>;
 };
 
-export type DeleteNovelError = KeyNotFoundError;
-
-export type DeleteNovelInput = {
-  novelId: Scalars['UnsignedInt']['input'];
-};
-
-export type DeleteNovelPayload = {
-  boolean: Maybe<Scalars['Boolean']['output']>;
-  errors: Maybe<Array<DeleteNovelError>>;
-};
-
 export type DuplicateNameError = Error & {
   message: Scalars['String']['output'];
 };
@@ -212,7 +201,6 @@ export type ListFilterInputTypeOfNovelTagDtoFilterInput = {
 
 export type Mutation = {
   deleteJob: DeleteJobPayload;
-  deleteNovel: DeleteNovelPayload;
   fetchChapterContents: FetchChapterContentsPayload;
   importNovel: ImportNovelPayload;
   registerUser: RegisterUserPayload;
@@ -227,11 +215,6 @@ export type MutationDeleteJobArgs = {
 };
 
 
-export type MutationDeleteNovelArgs = {
-  input: DeleteNovelInput;
-};
-
-
 export type MutationFetchChapterContentsArgs = {
   input: FetchChapterContentsInput;
 };
@@ -724,13 +707,6 @@ export type UuidOperationFilterInput = {
   nlte?: InputMaybe<Scalars['UUID']['input']>;
 };
 
-export type DeleteNovelMutationVariables = Exact<{
-  input: DeleteNovelInput;
-}>;
-
-
-export type DeleteNovelMutation = { deleteNovel: { boolean: boolean | null, errors: Array<{ message: string }> | null } };
-
 export type ImportNovelMutationVariables = Exact<{
   input: ImportNovelInput;
 }>;
@@ -764,7 +740,6 @@ export type NovelsQueryVariables = Exact<{
 export type NovelsQuery = { novels: { edges: Array<{ cursor: string, node: { id: any, url: string, name: string, description: string, rawStatus: NovelStatus, lastUpdatedTime: any, coverImage: { newPath: string | null } | null, chapters: Array<{ order: any, name: string }>, tags: Array<{ key: string, displayName: string, tagType: TagType }> } }> | null, pageInfo: { hasNextPage: boolean, endCursor: string | null } } | null };
 
 
-export const DeleteNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"boolean"}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<DeleteNovelMutation, DeleteNovelMutationVariables>;
 export const ImportNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ImportNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ImportNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"importNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUpdateRequestedEvent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUrl"}}]}}]}}]}}]} as unknown as DocumentNode<ImportNovelMutation, ImportNovelMutationVariables>;
 export const GetChapterDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChapter"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"novelId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"chapterOrder"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"novelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"novelId"}}},{"kind":"Argument","name":{"kind":"Name","value":"chapterOrder"},"value":{"kind":"Variable","name":{"kind":"Name","value":"chapterOrder"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"body"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"revision"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"images"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}},{"kind":"Field","name":{"kind":"Name","value":"novelId"}},{"kind":"Field","name":{"kind":"Name","value":"novelName"}},{"kind":"Field","name":{"kind":"Name","value":"totalChapters"}},{"kind":"Field","name":{"kind":"Name","value":"prevChapterOrder"}},{"kind":"Field","name":{"kind":"Name","value":"nextChapterOrder"}}]}}]}}]} as unknown as DocumentNode<GetChapterQuery, GetChapterQueryVariables>;
 export const NovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Novel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}]}}]}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"nodes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"rawLanguage"}},{"kind":"Field","name":{"kind":"Name","value":"rawStatus"}},{"kind":"Field","name":{"kind":"Name","value":"statusOverride"}},{"kind":"Field","name":{"kind":"Name","value":"externalId"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"author"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"externalUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"source"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"coverImage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"tagType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"chapters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"images"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<NovelQuery, NovelQueryVariables>;

fictionarchive-web-astro/src/lib/graphql/mutations/deleteNovel.graphql

@@ -1,10 +0,0 @@
-mutation DeleteNovel($input: DeleteNovelInput!) {
-  deleteNovel(input: $input) {
-    boolean
-    errors {
-      ... on Error {
-        message
-      }
-    }
-  }
-}