notes are now soft-deleted

migrations/0003__add_is_deleted_to_note.sql

@@ -0,0 +1 @@
+ALTER TABLE notes ADD COLUMN is_deleted INTEGER NOT NULL DEFAULT 0

routes/api/notes.js

@@ -104,22 +104,24 @@ router.put('/:noteId', async (req, res, next) => {
 });
 
 router.delete('/:noteId', async (req, res, next) => {
-    await deleteNote(req.params.noteId);
+    await sql.beginTransaction();
+
+    await deleteNote(req.params.noteId, req);
 
     await sql.commit();
 
     res.send({});
 });
 
-async function deleteNote(noteId) {
+async function deleteNote(noteId, req) {
     const children = await sql.getResults("select note_id from notes_tree where note_pid = ?", [noteId]);
 
     for (const child of children) {
         await deleteNote(child['note_id']);
     }
 
-    await sql.delete("notes_tree", noteId);
+    await sql.remove("notes_tree", noteId);
-    await sql.delete("notes", noteId);
+    await sql.execute("update notes set is_deleted = 1 where note_id = ?", [noteId]);
 
     await sql.addAudit(audit_category.DELETE_NOTE, req, noteId);
 }

routes/api/tree.js

@@ -19,6 +19,7 @@ router.get('/', auth.checkApiAuth, async (req, res, next) => {
         + "from notes_tree "
         + "join notes on notes.note_id = notes_tree.note_id "
         + "left join notes as clone on notes.note_clone_id = clone.note_id "
+        + "where notes.is_deleted = 0 "
         + "order by note_pid, note_pos");
 
     const root_notes = [];

services/migration.js

@@ -2,7 +2,7 @@ const backup = require('./backup');
 const sql = require('./sql');
 const fs = require('fs-extra');
 
-const APP_DB_VERSION = 2;
+const APP_DB_VERSION = 3;
 const MIGRATIONS_DIR = "./migrations";
 
 async function migrate() {

views/migration.ejs

@@ -10,6 +10,8 @@
 
       <div id="up-to-date" style="display:none;">
         <p>Your database is up-to-date with the application.</p>
+
+        <a href="/" class="btn btn-success">Continue to app</a>
       </div>
 
       <div id="need-to-migrate" style="display:none;">
@@ -40,6 +42,8 @@
             <th>Error</th>
           </tr>
         </table>
+
+        <a href="/" class="btn btn-success">Continue to app</a>
       </div>
     </div>