add possibility to change clipper parent to a fixed note instead of day notes, fixes #854

This commit is contained in:
zadam 2020-02-09 10:12:02 +01:00
parent 402718d293
commit 7abaedbf31

View file

@ -1,5 +1,6 @@
"use strict"; "use strict";
const attributeService = require("../../services/attributes");
const noteService = require('../../services/notes'); const noteService = require('../../services/notes');
const dateNoteService = require('../../services/date_notes'); const dateNoteService = require('../../services/date_notes');
const dateUtils = require('../../services/date_utils'); const dateUtils = require('../../services/date_utils');
@ -23,16 +24,26 @@ async function findClippingNote(todayNote, pageUrl) {
return null; return null;
} }
async function getClipperInboxNote() {
let clipperInbox = await attributeService.getNoteWithLabel('clipperInbox');
if (!clipperInbox) {
clipperInbox = await dateNoteService.getDateNote(dateUtils.localNowDate());
}
return clipperInbox;
}
async function addClipping(req) { async function addClipping(req) {
const {title, content, pageUrl, images} = req.body; const {title, content, pageUrl, images} = req.body;
const todayNote = await dateNoteService.getDateNote(dateUtils.localNowDate()); const clipperInbox = await getClipperInboxNote();
let clippingNote = await findClippingNote(todayNote, pageUrl); let clippingNote = await findClippingNote(clipperInbox, pageUrl);
if (!clippingNote) { if (!clippingNote) {
clippingNote = (await noteService.createNewNote({ clippingNote = (await noteService.createNewNote({
parentNoteId: todayNote.noteId, parentNoteId: clipperInbox.noteId,
title: title, title: title,
content: '', content: '',
type: 'text' type: 'text'
@ -54,10 +65,10 @@ async function addClipping(req) {
async function createNote(req) { async function createNote(req) {
const {title, content, pageUrl, images, clipType} = req.body; const {title, content, pageUrl, images, clipType} = req.body;
const todayNote = await dateNoteService.getDateNote(dateUtils.localNowDate()); const clipperInbox = await getClipperInboxNote();
const {note} = await noteService.createNewNote({ const {note} = await noteService.createNewNote({
parentNoteId: todayNote.noteId, parentNoteId: clipperInbox.noteId,
title, title,
content, content,
type: 'text' type: 'text'