Update users

myapp/ns_api/user.py

@@ -5,16 +5,75 @@ __email__ = 'remizoffalex@mail.ru'
 __url__ = 'https://remizoffalex.ru'
 
 from . import jsonrpc, login_required
-from .. import models
+from .. import app, lib, models
 
 
-@jsonrpc.method('users')
-def users_list():
+@jsonrpc.method('user.pages(id=int, page=int)')
+def user_pages_list(id, page):
+    """Список статей пользователя
+    """
+    user = models.db_session.query(
+        models.User
+    ).filter(
+        models.User.id==id
+    ).first()
+    if user is None:
+        raise ValueError
+    pages = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.user_id==id
+    ).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('user.pages.count(id=int)')
+def user_pages_count(id):
+    """Общее количество статей
+    """
+    user = models.db_session.query(
+        models.User
+    ).filter(
+        models.User.id==id
+    ).first()
+    if user is None:
+        raise ValueError
+    result = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.user_id==id
+    ).count()
+    return result
+
+
+@jsonrpc.method('users(page=int)')
+def users_list(page):
     """
     Показать список пользователей
     """
     users = models.db_session.query(
         models.User
+    )
+    users = lib.getpage(
+        users,
+        page,
+        app.config['ITEMS_ON_PAGE']
     ).all()
 
     result = []