Update API

myapp/ns_api/__init__.py

@@ -32,6 +32,7 @@ def login_required(func):
 jsonrpc = JSONRPC(app, '/api')
 
 from . import (
+    login,
     page,
     tag,
     user

myapp/ns_api/login.py

@@ -0,0 +1,30 @@
+__author__ = 'RemiZOffAlex'
+__email__ = 'remizoffalex@mail.ru'
+__url__ = 'https://remizoffalex.ru/'
+
+import string
+
+from flask import session
+from flask_jsonrpc.exceptions import InvalidRequestError
+
+from . import jsonrpc
+from .. import app, lib, models
+
+
+@jsonrpc.method('login(username=str, password=str)')
+def login(username, password):
+    user = models.db_session.query(
+        models.User
+    ).filter(
+        models.User.name==username,
+        models.User.password==lib.get_hash_password(
+            password,
+            app.config['SECRET_KEY']
+        ),
+        models.User.disabled==False
+    ).first()
+    if user is None:
+        raise ValueError
+    session['logged_in'] = True
+    session['user_id'] = user.id
+    return 'ok'

myapp/ns_api/page.py

@@ -1,11 +1,30 @@
 __author__ = 'RemiZOffAlex'
-__copyright__ = '(c) RemiZOffAlex'
-__license__ = 'MIT'
 __email__ = 'remizoffalex@mail.ru'
 __url__ = 'https://remizoffalex.ru'
 
 from . import jsonrpc, login_required
-from .. import models
+from .. import app, lib, models
+
+
+@jsonrpc.method('page(id=int)')
+def page_id(id):
+    """
+    Статья
+    """
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        raise ValueError
+
+    result = page.as_dict()
+    result['user'] = page.user.as_dict()
+    result['tags'] = []
+    for tagLink in page.tags:
+        result['tags'].append(tagLink.tag.as_dict())
+    return result
 
 
 @jsonrpc.method('page.update(title=str, text=str)')
@@ -14,8 +33,99 @@ def page_update(title, text):
     """
     Обновить статью
     """
-    result = {
+    page = models.db_session.query(
-        "title": title,
+        models.Page
-        "text": text
+    ).filter(
-    }
+        models.Page.id==id
+    ).first()
+    if page is None:
+        raise ValueError
+
+    page.title = title
+    page.text = text
+
+    result = page.as_dict()
+    result['user'] = page.user.as_dict()
+    result['tags'] = []
+    for tagLink in page.tags:
+        result['tags'].append(tagLink.tag.as_dict())
+    return result
+
+
+@jsonrpc.method('page.add(title=str, body=str)')
+@login_required
+def page_add(title, body):
+    """
+    Добавление новой статьи
+    """
+    newPage = models.Page(
+        lib.get_user(),
+        title
+    )
+    newPage.body = body
+    models.db_session.add(newPage)
+    models.db_session.commit()
+
+    result = newPage.as_dict()
+    result['user'] = newPage.user.as_dict()
+    result['tags'] = []
+    return result
+
+
+@jsonrpc.method('page.destroy(id=int)')
+@login_required
+def page_destroy(id):
+    """Полное уничтожение статьи
+
+    Аргументы:
+    id -- ID статьи
+    """
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        raise ValueError
+
+    models.db_session.delete(page)
+    models.db_session.commit()
+
+    return 'Статья #{} уничтожена'.format(id)
+
+
+@jsonrpc.method('pages(page=int)')
+def pages_list(page):
+    """
+    Список статей
+    """
+    pages = models.db_session.query(
+        models.Page
+    ).order_by(
+        models.Page.title.asc()
+    )
+    pages = lib.getpage(
+        pages,
+        page,
+        app.config['ITEMS_ON_PAGE']
+    ).all()
+
+    result = []
+    for page in pages:
+        newRow = page.as_dict()
+        newRow['user'] = page.user.as_dict()
+        newRow['tags'] = []
+        for tagLink in page.tags:
+            newRow['tags'].append(tagLink.tag.as_dict())
+        result.append(newRow)
+    return result
+
+
+@jsonrpc.method('pages.count')
+def pages_count():
+    """Общее количество статей
+    """
+    result = models.db_session.query(
+        models.Page
+    ).count()
     return result

myapp/ns_api/tag.py

@@ -5,7 +5,7 @@ __email__ = 'remizoffalex@mail.ru'
 __url__ = 'https://remizoffalex.ru'
 
 from . import jsonrpc, login_required
-from .. import models
+from .. import lib, models
 
 
 @jsonrpc.method('tag.add(name=str)')
@@ -47,6 +47,26 @@ def tag_delete(id):
     return 'OK'
 
 
+@jsonrpc.method('tag.exist(name=str)')
+def tag_exist(name):
+    """
+    Проверить существует ли тег и вернуть информацию о нём
+    """
+    text = name.lower().strip()
+    tagRow = models.db_session.query(
+        models.Tag
+    ).filter(
+        models.Tag.name==text
+    ).first()
+    if tagRow is None:
+        raise ValueError
+    result = {
+        'id': tagRow.id,
+        'name': tagRow.name
+    }
+    return result
+
+
 @jsonrpc.method('tags()')
 @login_required
 def tags_list():
@@ -62,3 +82,80 @@ def tags_list():
         newRow = tag.as_dict()
         result.append(newRow)
     return result
+
+
+@jsonrpc.method('tag.addToPage')
+@login_required
+def tag_addToPage(tag, id):
+    """
+    Добавление тега на страницы
+    """
+    tagRow = models.db_session.query(
+        models.Tag
+    ).filter(
+        models.Tag.id==tag
+    ).first()
+    if tagRow is None:
+        raise ValueError
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        raise ValueError
+    exist = models.db_session.query(
+        models.TagPage
+    ).filter(
+        models.TagPage.tag_id==tagRow.id,
+        models.TagPage.page_id==page.id
+    ).first()
+    if exist:
+        raise ValueError
+    newtagpage = models.TagPage(
+        page,
+        tagRow
+    )
+    models.db_session.add(newtagpage)
+    models.db_session.commit()
+    result = tagRow.as_dict()
+    return result
+
+
+@jsonrpc.method('tag.deleteFromPage')
+@login_required
+def tag_deleteFromPage(tag, id):
+    """
+    Удаление тега со страницы
+    """
+    exist = models.db_session.query(
+        models.TagPage
+    ).filter(
+        models.TagPage.tag_id==tag,
+        models.TagPage.page_id==id
+    ).first()
+    if exist is None:
+        raise ValueError
+    models.db_session.delete(exist)
+    models.db_session.commit()
+    return 'Тег {} удален'.format(id)
+
+
+@jsonrpc.method('tags.groups')
+def tags_groups():
+    """
+    Облако тегов
+    """
+    tags = models.db_session.query(
+        models.Tag
+    ).order_by(
+        models.Tag.name
+    ).all()
+    result = {}
+    for tag in tags:
+        tag_json = tag.as_dict()
+        if tag.name[0] in result:
+            result[tag.name[0]].append(tag_json)
+        else:
+            result[tag.name[0]] = [tag_json]
+    return result

myapp/ns_api/user.py

@@ -4,7 +4,7 @@ __license__ = 'MIT'
 __email__ = 'remizoffalex@mail.ru'
 __url__ = 'https://remizoffalex.ru'
 
-from . import jsonrpc
+from . import jsonrpc, login_required
 from .. import models
 
 
@@ -21,3 +21,14 @@ def users_list():
     for item in users:
         result.append(item.as_dict())
     return result
+
+
+@jsonrpc.method('users.count')
+def users_count():
+    """Количество список пользователей
+    """
+    result = models.db_session.query(
+        models.User
+    ).count()
+
+    return result