From ef8d5215e8115ac47d058a667a93b27bc0887a7f Mon Sep 17 00:00:00 2001
From: piotrruss <mail@pruss.it>
Date: Fri, 6 May 2022 17:19:48 +0100
Subject: small fixes

---
 apps/Notes/models/Note.js     |  4 ++--
 apps/Notes/models/NoteList.js | 29 +++++++++++++++++++----------
 2 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'apps')

diff --git a/apps/Notes/models/Note.js b/apps/Notes/models/Note.js
index 0f4b3f9..c8cf854 100644
--- a/apps/Notes/models/Note.js
+++ b/apps/Notes/models/Note.js
@@ -11,7 +11,7 @@ noteSchema.statics.getNote = async (id) => {
 
   const content = decrypt(note.content)
 
-  return { ...note, content }
+  return { _id: note._id, content }
 }
 
 noteSchema.statics.updateNote = async (id, content) => {
@@ -19,7 +19,7 @@ noteSchema.statics.updateNote = async (id, content) => {
 
   if (!note) throw new Error('Could not update note')
 
-  return { ...note, content }
+  return { _id: note._id, content }
 }
 
 noteSchema.pre('save', async function (next) {
diff --git a/apps/Notes/models/NoteList.js b/apps/Notes/models/NoteList.js
index 0af648a..7bad163 100644
--- a/apps/Notes/models/NoteList.js
+++ b/apps/Notes/models/NoteList.js
@@ -49,16 +49,25 @@ noteListSchema.statics.removeNote = async (_id, id) => {
 }
 
 noteListSchema.statics.updateList = async (_id, noteId, title) => {
-  const noteList = await NoteList.findOneAndUpdate(
-    { _id, 'notes.noteId': noteId },
-    {
-      $set: {
-        'notes.$.title': encrypt(title || 'No title'),
-        'notes.$.updated_at': Date.now()
-      }
-    },
-    { new: true }
-  ).lean()
+  const noteList = title
+    ? await NoteList.findOneAndUpdate(
+      { _id, 'notes.noteId': noteId },
+      {
+        $set: {
+          'notes.$.title': encrypt(title || 'No title'),
+          'notes.$.updated_at': Date.now()
+        }
+      },
+      { new: true }
+    ).lean() : await NoteList.findOneAndUpdate(
+      { _id, 'notes.noteId': noteId },
+      {
+        $set: {
+          'notes.$.updated_at': Date.now()
+        }
+      },
+      { new: true }
+    ).lean()
 
   return decryptTitles(noteList)
 }
-- 
cgit v1.2.3