diff --git a/api/group.py b/api/group.py
deleted file mode 100644
index a3f7cd6775c15955fc351d8d58f62f35a59b7026..0000000000000000000000000000000000000000
--- a/api/group.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-# __author__ = "chenwei"
-# Date: 2018/11/15
-
-import json
-from utils.base import APIView
-from utils.logger import error_logger
-
-
-class GroupListView(APIView):
- def get(self, request):
- star_id = request.GET.get('star_id')
- user_id = request.GET.get('user_id')
- offset = int(request.GET.get('page', 0))
- limit = int(request.GET.get('limit', 10))
- filters = self.handle_filter(request.GET.get('filter', ""))
- if star_id:
- filters.update({'star_id': star_id})
- if user_id:
- filters.update({'user_id': user_id})
- try:
- data = self.rpc['venus/sun/group/list'](filters=filters, offset=(offset-1)*limit, limit=limit).unwrap()
- except Exception as e:
- error_logger.error(u'获å–å°ç»„列表失败%s' , e)
- raise
- return data
-
- def post(self, request):
- ids = json.loads(request.POST.get('ids', '[]'))
- updates = json.loads(request.POST.get('updates', '{}'))
- try:
- self.rpc['venus/sun/group/batch/update'](updates=updates, ids=ids).unwrap()
- except Exception as e:
- error_logger.error(u'批é‡æ›´æ–°å¤±è´¥%s', e)
- raise
- return {
- "message": "æ›´æ–°æˆåŠŸ"
- }
-
-
-class GroupUpdateOrCreate(APIView):
- def get(self, request):
- id = request.GET.get('id').split(':')[0]
- try:
- data = self.rpc['venus/sun/group/get'](id=id).unwrap()
- except Exception as e:
- error_logger.error(u'获å–%s用户信æ¯å¤±è´¥%s'%(id, e))
- raise
- return data
-
- def post(self, request):
- id = request.POST.get('id')
- star_ids = list(map(lambda x: x.split(":")[0], json.loads(request.POST.get('star', '[]'))))
- group_user_ids = list(map(lambda x: x.split(":")[0], json.loads(request.POST.get('group_users', '[]'))))
- data = {
- 'name': request.POST.get('name', ''),
- 'description': request.POST.get('description', ''),
- 'creator_id': request.POST.get('user', '').split(':')[0],
- 'celebrity_ids': star_ids,
- 'is_online': int(request.POST.get('is_online', 0)),
- 'is_recommend': int(request.POST.get('is_recommend', 0)),
- 'group_user_ids':group_user_ids,
- 'icon': request.POST.get('icon', '')[:-2]
- }
- try:
- self.rpc['venus/sun/group/edit'](id=id, data=data).unwrap()
- except Exception as e:
- error_logger.error(u'编辑%s用户信æ¯å¤±è´¥%s' % (id, e))
- raise
- return {
- 'message': 'æ›´æ–°æˆåŠŸ'
- }
-
-
-class GroupRelatedUser(APIView):
- def get(self, request):
- id = request.GET.get('id')
- offset = int(request.GET.get('page', 0))
- count = int(request.GET.get('limit', 10))
- filters = {'group_id': id}
- try:
- data = self.rpc['venus/sun/group/user/list'](filters=filters, offset=(offset - 1) * count, limit=count).unwrap()
- except Exception as e:
- error_logger.error(u'获å–å°ç»„用户信æ¯å¤±è´¥%s' , e)
- raise
- return data
-
-
-class GroupRelatedUserGET(APIView):
- def get(self, request):
- id = request.GET.get('id', '').split(':')[0]
- try:
- data = self.rpc['venus/sun/group/user/get'](id=id).unwrap()
- except Exception as e:
- error_logger.error(u'获å–å°ç»„用户信æ¯å¤±è´¥%s', e)
- raise
- return [data, ]
-
- def post(self, request):
- group_id = request.POST.get('group_id')
- user_id = request.POST.get('user_id')
- data = {
- 'role_id': request.POST.get('original_group_identify'),
- }
- try:
- self.rpc['venus/sun/group/user/edit'](id=group_id, user_id=user_id, data=data).unwrap()
- except Exception as e:
- error_logger.error(u'编辑å°ç»„用户%sä¿¡æ¯å¤±è´¥%s'%(user_id, e))
- raise
- return
\ No newline at end of file
diff --git a/api/push.py b/api/push.py
index e957c953b4bdc85dbab9e31dcbc770c8d73be509..75716048b5e0f77e81fe60ebf86356aae42840ed 100644
--- a/api/push.py
+++ b/api/push.py
@@ -33,7 +33,7 @@ class PushUpdateOrCreateView(APIView):
def post(self, request):
id = request.POST.get('id', '')
creator_id = request.POST.get('creator_id')
- group_topic_id = request.POST.get('group_topic_id', '')
+ pictorial_topic_id = request.POST.get('pictorial_topic_id', '')
icon = request.POST.get('icon', '')
if icon.endswith('-w'):
icon = request.POST.get('icon', '')[:-2]
@@ -42,8 +42,8 @@ class PushUpdateOrCreateView(APIView):
if url == '推é€å¸–å':
url = 'alpha://topic_detail?topic_id='
elif url == '推é€å°ç»„':
- url = 'alpha://group_detail?group_id='
- full_url = url + group_topic_id
+ url = 'alpha://pictorial_detail?pictorial_id='
+ full_url = url + pictorial_topic_id
data = {
'url': full_url,
diff --git a/api/search.py b/api/search.py
index 7c9f366dd950d4fb472e3cbe9fa6a51dad7b912d..5510b096705feaaf55f8305d5759f7b76338da73 100644
--- a/api/search.py
+++ b/api/search.py
@@ -6,19 +6,6 @@
from utils.base import APIView, get_offset_count
-class GroupSearchView(APIView):
- def get(self, request):
- name = request.GET.get('name')
- try:
- data = self.rpc['venus/sun/group/search'](name=name).unwrap()
- except Exception as e:
- raise e
-
- return {
- 'data': ['{id}:{name}'.format(id=search_data['id'], name=search_data['name']) for search_data in data]
- }
-
-
class CountrySearchView(APIView):
def get(self, request):
name = request.GET.get('name')
diff --git a/api/star.py b/api/star.py
index a1e6aee0e581e9e9cba0368e1d4880f38f2415f1..7244fa006303b9c9a5fcd113c78645059fd34866 100644
--- a/api/star.py
+++ b/api/star.py
@@ -47,7 +47,7 @@ class CelebrityUpdateOrCreate(APIView):
def post(self, request):
id = request.POST.get('id', '')
gender = request.POST.get('gender')
- group_ids = list(set(map(lambda x: x.split(":")[0], json.loads(request.POST.get('groups', '[]')))))
+ pictorial_ids = list(set(map(lambda x: x.split(":")[0], json.loads(request.POST.get('pictorials', '[]')))))
updates = {
'gender': ''
}
@@ -66,7 +66,7 @@ class CelebrityUpdateOrCreate(APIView):
'is_online': int(request.POST.get('is_online')),
'desc': request.POST.get('description'),
'portrait': request.POST.get('avatar')[:-2],
- 'group_ids': group_ids,
+ 'pictorial_ids': pictorial_ids,
}
try:
self.rpc['venus/sun/celebrity/edit'](id=id, data=data).unwrap()
diff --git a/api/topic.py b/api/topic.py
index 43dcfdb7ce73f321e63828e0cebd1fb64a6e317d..cbd5da31f1d212b9101e0512443d12e649b7362e 100644
--- a/api/topic.py
+++ b/api/topic.py
@@ -11,15 +11,15 @@ from utils.logger import error_logger
class TopicListView(APIView):
def get(self, request):
user_id = request.GET.get('user_id', '')
- group_id = request.GET.get('group_id', '')
+ pictorial_id = request.GET.get('pictorial_id', '')
offset = int(request.GET.get('page', 0))
limit = int(request.GET.get('limit', 10))
filter = self.handle_filter(request.GET.get('filter', ""))
sort_params = request.GET.getlist('sort[]')
if user_id:
filter.update({'user_id': user_id})
- if group_id:
- filter.update({'group_id': group_id})
+ if pictorial_id:
+ filter.update({'pictorial_id': pictorial_id})
try:
data = self.rpc['venus/sun/topic/list'](
offset=(offset - 1) * limit,
diff --git a/api/urls.py b/api/urls.py
index 40b5aa3acb112bbb828b253f88a9177f46530e0d..3c80963859ce5cdf991dd7d2e4ad41d08060cbe0 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -8,7 +8,6 @@ from django.conf.urls import url
from .pick import *
from .push import *
-from .group import *
from .user import *
from .topic import *
from .star import *
@@ -34,24 +33,16 @@ urlpatterns = [
url(r'^account/list/update$', AccountList.as_view()),
url(r'^account/detail$', AccountUpdateOrCreateView.as_view()),
url(r'^account/create$', AccountUpdateOrCreateView.as_view()),
+
# user相关
url(r'^user/list$', UserListView.as_view()),
url(r'^user/list/update$', UserListView.as_view()),
url(r'^user/get$', UserUpdateOrCreate.as_view()),
url(r'^user/create$', UserUpdateOrCreate.as_view()),
- url(r'^user/group/list$', UserGroupView.as_view()),
+ url(r'^user/pictorial/list$', UserPictorialView.as_view()),
url(r'^user/images/get$', UserImage.as_view()),
url(r'^user/images/create$', UserImage.as_view()),
- # group相关
- url(r'^group/list$', GroupListView.as_view()),
- url(r'^group/list/update$', GroupListView.as_view()),
- url(r'^group/get$', GroupUpdateOrCreate.as_view()),
- url(r'^group/create$', GroupUpdateOrCreate.as_view()),
- url(r'^group/user/list$', GroupRelatedUser.as_view()),
- url(r'^group/user/get$', GroupRelatedUserGET.as_view()),
- url(r'^group/user/edit_group_identify', GroupRelatedUserGET.as_view()),
-
# topic相关
url(r'^topic/list$', TopicListView.as_view()),
url(r'^topic/detail$', TopicUpdateOrCreateView.as_view()),
@@ -139,7 +130,6 @@ urlpatterns = [
]
search_urlpatterns = [
- url(r'search/group$', GroupSearchView.as_view()),
url(r'search/country$', CountrySearchView.as_view()),
url(r'search/user$', UserSearchView.as_view()),
url(r'search/tag$', TagSearchView.as_view()),
diff --git a/api/user.py b/api/user.py
index 5eb801de8d6d403c1d19e533ce8c39a6175b216f..ad71323cc3cf7905b6846df5c35193942d741e1d 100644
--- a/api/user.py
+++ b/api/user.py
@@ -18,12 +18,12 @@ from utils.pic_tools import tailor_image
class UserListView(APIView):
def get(self, request):
- group_id = request.GET.get('group_id', '')
+ pictorial_id = request.GET.get('pictorial_id', '')
page = int(request.GET.get('page', 1))
limit = int(request.GET.get('limit', 10))
filter = self.handle_filter(request.GET.get('filter', ""))
- if group_id:
- filter.update({'group_id': group_id})
+ if pictorial_id:
+ filter.update({'pictorial_id': pictorial_id})
try:
data = self.rpc['venus/sun/user/list'](offset=(page-1)*limit, limit=limit, filters=filter).unwrap()
except Exception as e:
@@ -85,16 +85,16 @@ class UserUpdateOrCreate(APIView):
}
-class UserGroupView(APIView):
+class UserPictorialView(APIView):
def get(self, request):
user_id = request.GET.get('id')
offset = int(request.GET.get('page', 0))
count = int(request.GET.get('limit', 10))
filters = {'user_id': user_id}
try:
- data = self.rpc['venus/sun/group/user/list'](filters=filters, offset=(offset - 1) * count, limit=count).unwrap()
+ data = self.rpc['venus/sun/pictorial/user/list'](filters=filters, offset=(offset - 1) * count, limit=count).unwrap()
except Exception as e:
- error_logger.error(u'获å–å°ç»„用户详情失败%s' , e)
+ error_logger.error(u'获å–画报用户详情失败%s' , e)
raise
return data