From c3db55b5b6c3bc35ca1bdd6b412da7f0d47b58cc Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 20 Sep 2023 11:29:10 +0900 Subject: [PATCH] fix --- packages/backend/src/core/ClipService.ts | 7 ++++++- .../backend/src/server/api/endpoints/clips/add-note.ts | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/core/ClipService.ts b/packages/backend/src/core/ClipService.ts index 59f213c00..27f3013d4 100644 --- a/packages/backend/src/core/ClipService.ts +++ b/packages/backend/src/core/ClipService.ts @@ -15,6 +15,7 @@ import type { MiLocalUser } from '@/models/entities/User.js'; @Injectable() export class ClipService { + public static NoSuchNoteError = class extends Error {}; public static NoSuchClipError = class extends Error {}; public static AlreadyAddedError = class extends Error {}; public static TooManyClipNotesError = class extends Error {}; @@ -118,10 +119,14 @@ export class ClipService { noteId: noteId, clipId: clip.id, }); - } catch (e) { + } catch (e: any) { if (isDuplicateKeyValueError(e)) { throw new ClipService.AlreadyAddedError(); + } else if (e.detail.includes('is not present in table "note".')) { + throw new ClipService.NoSuchNoteError(); } + + throw e; } this.clipsRepository.update(clip.id, { diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts index a3777e3ba..749593aa6 100644 --- a/packages/backend/src/server/api/endpoints/clips/add-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts @@ -70,6 +70,8 @@ export default class extends Endpoint { // eslint- } catch (e) { if (e instanceof ClipService.NoSuchClipError) { throw new ApiError(meta.errors.noSuchClip); + } else if (e instanceof ClipService.NoSuchNoteError) { + throw new ApiError(meta.errors.noSuchNote); } else if (e instanceof ClipService.AlreadyAddedError) { throw new ApiError(meta.errors.alreadyClipped); } else if (e instanceof ClipService.TooManyClipNotesError) {