From 2756f553c68082342a784ef716c62da6cea6f3ca Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 22 Feb 2019 11:46:58 +0900
Subject: Improve error handling of API (#4345)

* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* :v:

* Fix
---
 src/server/api/endpoints/notes/watching/create.ts | 28 ++++++++++++-----------
 src/server/api/endpoints/notes/watching/delete.ts | 28 ++++++++++++-----------
 2 files changed, 30 insertions(+), 26 deletions(-)

(limited to 'src/server/api/endpoints/notes/watching')

diff --git a/src/server/api/endpoints/notes/watching/create.ts b/src/server/api/endpoints/notes/watching/create.ts
index 5efe69a3b4..ebba211fc0 100644
--- a/src/server/api/endpoints/notes/watching/create.ts
+++ b/src/server/api/endpoints/notes/watching/create.ts
@@ -1,8 +1,9 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../../misc/cafy-id';
-import Note from '../../../../../models/note';
 import define from '../../../define';
 import watch from '../../../../../services/note/watch';
+import { getValiedNote } from '../../../common/getters';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	stability: 'stable',
@@ -25,21 +26,22 @@ export const meta = {
 				'en-US': 'Target note ID.'
 			}
 		}
+	},
+
+	errors: {
+		noSuchNote: {
+			message: 'No such note.',
+			code: 'NO_SUCH_NOTE',
+			id: 'ea0e37a6-90a3-4f58-ba6b-c328ca206fc7'
+		}
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
-	// Get note
-	const note = await Note.findOne({
-		_id: ps.noteId
+export default define(meta, async (ps, user) => {
+	const note = await getValiedNote(ps.noteId).catch(e => {
+		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
+		throw e;
 	});
 
-	if (note === null) {
-		return rej('note not found');
-	}
-
 	await watch(user._id, note);
-
-	// Send response
-	res();
-}));
+});
diff --git a/src/server/api/endpoints/notes/watching/delete.ts b/src/server/api/endpoints/notes/watching/delete.ts
index 2d99cc8254..63354d4ab2 100644
--- a/src/server/api/endpoints/notes/watching/delete.ts
+++ b/src/server/api/endpoints/notes/watching/delete.ts
@@ -1,8 +1,9 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../../misc/cafy-id';
-import Note from '../../../../../models/note';
 import define from '../../../define';
 import unwatch from '../../../../../services/note/unwatch';
+import { getValiedNote } from '../../../common/getters';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	stability: 'stable',
@@ -25,21 +26,22 @@ export const meta = {
 				'en-US': 'Target note ID.'
 			}
 		}
+	},
+
+	errors: {
+		noSuchNote: {
+			message: 'No such note.',
+			code: 'NO_SUCH_NOTE',
+			id: '09b3695c-f72c-4731-a428-7cff825fc82e'
+		}
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
-	// Get note
-	const note = await Note.findOne({
-		_id: ps.noteId
+export default define(meta, async (ps, user) => {
+	const note = await getValiedNote(ps.noteId).catch(e => {
+		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
+		throw e;
 	});
 
-	if (note === null) {
-		return rej('note not found');
-	}
-
 	await unwatch(user._id, note);
-
-	// Send response
-	res();
-}));
+});
-- 
cgit v1.2.3-freya