Add notes

myapp/ns_api/__init__.py

@@ -33,6 +33,7 @@ jsonrpc = JSONRPC(app, '/api')
 
 from . import (
     login,
+    note,
     page,
     tag,
     user

myapp/ns_api/note.py

@@ -0,0 +1,127 @@
+__author__ = 'RemiZOffAlex'
+__email__ = 'remizoffalex@mail.ru'
+__url__ = 'https://remizoffalex.ru'
+
+from . import jsonrpc, login_required
+from .. import app, lib, models
+
+
+@jsonrpc.method('note(id=int)')
+def note_id(id):
+    """Заметка
+    """
+    note = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.id==id
+    ).first()
+    if note is None:
+        raise ValueError
+
+    result = note.as_dict()
+    result['user'] = note.user.as_dict()
+    result['tags'] = []
+    for tagLink in note.tags:
+        result['tags'].append(tagLink.tag.as_dict())
+    return result
+
+
+@jsonrpc.method('note.update(title=str, body=str)')
+@login_required
+def note_update(title, body):
+    """Обновить заметку
+    """
+    note = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.id==id
+    ).first()
+    if note is None:
+        raise ValueError
+
+    note.title = title
+    note.body = body
+
+    result = note.as_dict()
+    result['user'] = note.user.as_dict()
+    result['tags'] = []
+    for tagLink in note.tags:
+        result['tags'].append(tagLink.tag.as_dict())
+    return result
+
+
+@jsonrpc.method('note.add(title=str, body=str)')
+@login_required
+def note_add(title, body):
+    """Добавление новой заметки
+    """
+    newNote = models.Note(
+        lib.get_user(),
+        title
+    )
+    newNote.body = body
+    models.db_session.add(newNote)
+    models.db_session.commit()
+
+    result = newNote.as_dict()
+    result['user'] = newNote.user.as_dict()
+    result['tags'] = []
+    return result
+
+
+@jsonrpc.method('note.destroy(id=int)')
+@login_required
+def note_destroy(id):
+    """Полное уничтожение заметки
+
+    Аргументы:
+    id -- ID заметки
+    """
+    note = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.id==id
+    ).first()
+    if note is None:
+        raise ValueError
+
+    models.db_session.delete(note)
+    models.db_session.commit()
+
+    return 'ok'
+
+
+@jsonrpc.method('notes(page=int)')
+def notes_list(page):
+    """Список заметок
+    """
+    notes = models.db_session.query(
+        models.Note
+    ).order_by(
+        models.Note.title.asc()
+    )
+    notes = lib.getpage(
+        notes,
+        page,
+        app.config['ITEMS_ON_PAGE']
+    ).all()
+
+    result = []
+    for note in notes:
+        newRow = note.as_dict()
+        newRow['user'] = note.user.as_dict()
+        newRow['tags'] = []
+        for tagLink in note.tags:
+            newRow['tags'].append(tagLink.tag.as_dict())
+        result.append(newRow)
+    return result
+
+
+@jsonrpc.method('notes.count')
+def notes_count():
+    """Количество заметок
+    """
+    result = models.db_session.query(
+        models.Note
+    ).count()
+    return result

myapp/ns_api/tag.py

@@ -132,6 +132,73 @@ def tag_pages_count(id):
     return result
 
 
+@jsonrpc.method('tag.notes(id=int, page=int)')
+@login_required
+def tag_notes_list(id, page):
+    """Список заметок
+    """
+    tag = models.db_session.query(
+        models.Tag
+    ).filter(
+        models.Tag.id==id
+    ).first()
+    if tag is None:
+        raise ValueError
+    indexes = models.db_session.query(
+        models.TagNote.note_id
+    ).filter(
+        models.TagNote.tag_id==id
+    )
+    notes = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.user_id==lib.get_user().id,
+        models.Note.id.in_(indexes)
+    ).order_by(
+        models.Note.title.asc()
+    )
+    notes = lib.getpage(
+        notes,
+        page,
+        app.config['ITEMS_ON_PAGE']
+    ).all()
+
+    result = []
+    for note in notes:
+        newRow = note.as_dict()
+        newRow['tags'] = []
+        for tagLink in note.tags:
+            newRow['tags'].append(tagLink.tag.as_dict())
+        result.append(newRow)
+    return result
+
+
+@jsonrpc.method('tag.notes.count(id=int)')
+@login_required
+def tag_notes_count(id):
+    """Общее количество заметок
+    """
+    tag = models.db_session.query(
+        models.Tag
+    ).filter(
+        models.Tag.id==id
+    ).first()
+    if tag is None:
+        raise ValueError
+    indexes = models.db_session.query(
+        models.TagNote.note_id
+    ).filter(
+        models.TagNote.tag_id==id
+    )
+    result = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.user_id==lib.get_user().id,
+        models.Note.id.in_(indexes)
+    ).count()
+    return result
+
+
 @jsonrpc.method('tags()')
 def tags_list():
     """
@@ -205,6 +272,79 @@ def tag_deleteFromPage(tag, id):
     return 'Тег {} удален'.format(id)
 
 
+@jsonrpc.method('tag.addToNote(tag=int, id=int)')
+@login_required
+def tag_addToNote(tag, id):
+    """
+    Добавление тега в заметку
+    """
+    noteRow = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.id==id,
+        models.Note.user_id==lib.get_user().id
+    ).first()
+    if noteRow is None:
+        raise ValueError
+    tagRow = models.db_session.query(
+        models.Tag
+    ).filter(
+        models.Tag.id==tag
+    ).first()
+    if tagRow is None:
+        raise ValueError
+    exist = models.db_session.query(
+        models.TagNote
+    ).filter(
+        models.TagNote.tag_id==tagRow.id,
+        models.TagNote.note_id==noteRow.id
+    ).first()
+    if exist:
+        raise ValueError
+    newtagNote = models.TagNote(
+        noteRow,
+        tagRow
+    )
+    models.db_session.add(newtagNote)
+    models.db_session.commit()
+    result = tagRow.as_dict()
+    return result
+
+
+@jsonrpc.method('tag.deleteFromNote(tag=int, id=int)')
+@login_required
+def tag_deleteFromNote(tag, id):
+    """
+    Удаление тега из заметки
+    """
+    noteRow = models.db_session.query(
+        models.Note
+    ).filter(
+        models.Note.id==id,
+        models.Note.user_id==lib.get_user().id
+    ).first()
+    if noteRow is None:
+        raise ValueError
+    tagRow = models.db_session.query(
+        models.Tag
+    ).filter(
+        models.Tag.id==tag
+    ).first()
+    if tagRow is None:
+        raise ValueError
+    exist = models.db_session.query(
+        models.TagNote
+    ).filter(
+        models.TagNote.tag_id==tag,
+        models.TagNote.note_id==id
+    ).first()
+    if exist is None:
+        raise ValueError
+    models.db_session.delete(exist)
+    models.db_session.commit()
+    return 'ok'
+
+
 @jsonrpc.method('tags.groups')
 def tags_groups():
     """