From 664a87cdd518d5022e8c544a4388c1c42201c07e Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Tue, 2 Jan 2018 19:56:45 -0500
Subject: [PATCH] checks against moving note to where it already exists

---
 routes/api/notes_move.js | 49 ++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/routes/api/notes_move.js b/routes/api/notes_move.js
index 00d555308..84b43d118 100644
--- a/routes/api/notes_move.js
+++ b/routes/api/notes_move.js
@@ -14,6 +14,15 @@ router.put('/:noteTreeId/move-to/:parentNoteId', auth.checkApiAuth, async (req,
 
     const noteToMove = await sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
 
+    const existing = await getExistingNoteTree(parentNoteId, noteToMove.note_id);
+
+    if (existing && !existing.is_deleted && existing.note_tree_id !== noteTreeId) {
+        return res.send({
+            success: false,
+            message: 'This note already exists in target parent note.'
+        });
+    }
+
     if (!await checkTreeCycle(parentNoteId, noteToMove.note_id)) {
         return res.send({
             success: false,
@@ -44,6 +53,15 @@ router.put('/:noteTreeId/move-before/:beforeNoteTreeId', auth.checkApiAuth, asyn
     const noteToMove = await sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
     const beforeNote = await sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [beforeNoteTreeId]);
 
+    const existing = await getExistingNoteTree(beforeNote.parent_note_id, noteToMove.note_id);
+
+    if (existing && !existing.is_deleted && existing.note_tree_id !== noteTreeId) {
+        return res.send({
+            success: false,
+            message: 'This note already exists in target parent note.'
+        });
+    }
+
     if (!await checkTreeCycle(beforeNote.parent_note_id, noteToMove.note_id)) {
         return res.send({
             success: false,
@@ -83,6 +101,15 @@ router.put('/:noteTreeId/move-after/:afterNoteTreeId', auth.checkApiAuth, async
     const noteToMove = await sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
     const afterNote = await sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [afterNoteTreeId]);
 
+    const existing = await getExistingNoteTree(afterNote.parent_note_id, noteToMove.note_id);
+
+    if (existing && !existing.is_deleted && existing.note_tree_id !== noteTreeId) {
+        return res.send({
+            success: false,
+            message: 'This note already exists in target parent note.'
+        });
+    }
+
     if (!await checkTreeCycle(afterNote.parent_note_id, noteToMove.note_id)) {
         return res.send({
             success: false,
@@ -118,7 +145,7 @@ router.put('/:childNoteId/clone-to/:parentNoteId', auth.checkApiAuth, async (req
     const prefix = req.body.prefix;
     const sourceId = req.headers.source_id;
 
-    const existing = await sql.getFirst('SELECT * FROM notes_tree WHERE note_id = ? AND parent_note_id = ?', [childNoteId, parentNoteId]);
+    const existing = await getExistingNoteTree(parentNoteId, childNoteId);
 
     if (existing && !existing.is_deleted) {
         return res.send({
@@ -170,14 +197,7 @@ router.put('/:noteId/clone-after/:afterNoteTreeId', auth.checkApiAuth, async (re
         return res.status(500).send("After note " + afterNoteTreeId + " doesn't exist.");
     }
 
-    if (!await checkTreeCycle(afterNote.parent_note_id, noteId)) {
-        return res.send({
-            success: false,
-            message: 'Cloning note here would create cycle.'
-        });
-    }
-
-    const existing = await sql.getFirstValue('SELECT * FROM notes_tree WHERE note_id = ? AND parent_note_id = ?', [noteId, afterNote.parent_note_id]);
+    const existing = await getExistingNoteTree(afterNote.parent_note_id, noteId);
 
     if (existing && !existing.is_deleted) {
         return res.send({
@@ -186,6 +206,13 @@ router.put('/:noteId/clone-after/:afterNoteTreeId', auth.checkApiAuth, async (re
         });
     }
 
+    if (!await checkTreeCycle(afterNote.parent_note_id, noteId)) {
+        return res.send({
+            success: false,
+            message: 'Cloning note here would create cycle.'
+        });
+    }
+
     await sql.doInTransaction(async () => {
         // we don't change date_modified so other changes are prioritized in case of conflict
         // also we would have to sync all those modified note trees otherwise hash checks would fail
@@ -222,6 +249,10 @@ async function loadSubTreeNoteIds(parentNoteId, subTreeNoteIds) {
     }
 }
 
+async function getExistingNoteTree(parentNoteId, childNoteId) {
+    return await sql.getFirst('SELECT * FROM notes_tree WHERE note_id = ? AND parent_note_id = ?', [childNoteId, parentNoteId]);
+}
+
 /**
  * Tree cycle can be created when cloning or when moving existing clone. This method should detect both cases.
  */