From 17b23d92efd78f8302ecbc2a177df5308b71e213 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 3 Jan 2020 13:41:44 +0100
Subject: [PATCH] delete/undelete fixes

---
 src/services/notes.js  | 12 +++++++-----
 src/services/script.js |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/services/notes.js b/src/services/notes.js
index 8bd488450..123b9df9c 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -418,14 +418,16 @@ async function deleteBranch(branch, deleteId, taskContext) {
     const notDeletedBranches = await note.getBranches();
 
     if (notDeletedBranches.length === 0) {
-        note.isDeleted = true;
-        note.deleteId = deleteId;
-        await note.save();
-
         for (const childBranch of await note.getChildBranches()) {
             await deleteBranch(childBranch, deleteId, taskContext);
         }
 
+        // first delete children and then parent - this will show up better in recent changes
+
+        note.isDeleted = true;
+        note.deleteId = deleteId;
+        await note.save();
+
         for (const attribute of await note.getOwnedAttributes()) {
             attribute.isDeleted = true;
             attribute.deleteId = deleteId;
@@ -508,7 +510,7 @@ async function undeleteBranch(branch, deleteId, taskContext) {
               AND branches.parentNoteId = ?`, [deleteId, note.noteId]);
 
         for (const childBranch of childBranches) {
-            await deleteBranch(childBranch, deleteId, taskContext);
+            await undeleteBranch(childBranch, deleteId, taskContext);
         }
     }
 }
diff --git a/src/services/script.js b/src/services/script.js
index 153d535aa..51b456eb9 100644
--- a/src/services/script.js
+++ b/src/services/script.js
@@ -2,7 +2,6 @@ const sql = require('./sql');
 const ScriptContext = require('./script_context');
 const repository = require('./repository');
 const cls = require('./cls');
-const sourceIdService = require('./source_id');
 const log = require('./log');
 
 async function executeNote(note, apiParams) {