From 5de92171a7bbf9c96a74e6d84691f8105bec7748 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 1 Dec 2019 10:28:05 +0100
Subject: [PATCH] use owned attributes where it's a better fit

---
 src/services/handlers.js | 2 +-
 src/services/notes.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/handlers.js b/src/services/handlers.js
index 67bd9ed34..634844e08 100644
--- a/src/services/handlers.js
+++ b/src/services/handlers.js
@@ -81,7 +81,7 @@ eventService.subscribe(eventService.CHILD_NOTE_CREATED, async ({ parentNote, chi
 async function processInverseRelations(entityName, entity, handler) {
     if (entityName === 'attributes' && entity.type === 'relation') {
         const note = await entity.getNote();
-        const attributes = (await note.getAttributes(entity.name)).filter(relation => relation.type === 'relation-definition');
+        const attributes = (await note.getOwnedAttributes(entity.name)).filter(relation => relation.type === 'relation-definition');
 
         for (const attribute of attributes) {
             const definition = attribute.value;
diff --git a/src/services/notes.js b/src/services/notes.js
index 8675666c1..344a60f62 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -514,7 +514,7 @@ async function duplicateNote(noteId, parentNoteId) {
         notePosition: origBranch ? origBranch.notePosition + 1 : null
     }).save();
 
-    for (const attribute of await origNote.getAttributes()) {
+    for (const attribute of await origNote.getOwnedAttributes()) {
         const attr = new Attribute(attribute);
         attr.attributeId = undefined; // force creation of new attribute
         attr.noteId = newNote.noteId;
@@ -530,7 +530,7 @@ async function duplicateNote(noteId, parentNoteId) {
 
 sqlInit.dbReady.then(() => {
     // first cleanup kickoff 5 minutes after startup
-    setTimeout(cls.wrap(eraseDeletedNotes), 0 * 60 * 1000);
+    setTimeout(cls.wrap(eraseDeletedNotes), 5 * 60 * 1000);
 
     setInterval(cls.wrap(eraseDeletedNotes), 4 * 3600 * 1000);
 });