Merge branch 'test' into 'master'

Alpha 1.8

See merge request alpha/sun!210

api/activity.py

+import json
+from utils.base import APIView, get_offset_count
+from utils.logger import error_logger
+
+
+class ActivityListView(APIView):
+
+    def get(self, request):
+        offset, count = get_offset_count(request)
+        name = request.GET.get('name', None)
+        is_online = request.GET.get('is_online', None)
+        sort_by = request.GET.get('sort_by', None)
+
+        data = self.rpc['venus/sun/activity/list'](offset=offset, count=count, name=name, is_online=is_online, sort_by=sort_by).unwrap()
+        return data
+
+
+class ActivityInfoView(APIView):
+    
+    def get(self, request):
+        id_ = request.GET.get('id')
+
+        data = self.rpc['venus/sun/activity/get'](id_=id_).unwrap()
+        return data
+
+
+class ActivityCreateView(APIView):
+
+    def post(self, request):
+        name = request.POST.get('name', None)
+        un_join_url = request.POST.get('un_join_url', None)
+        in_join_url = request.POST.get('in_join_url', None)
+        agreement_url = request.POST.get('agreement_url', None)
+
+        if not name:
+            return r'缺少参数'
+
+        data = self.rpc['venus/sun/activity/add'](name=name, un_join_url=un_join_url, in_join_url=in_join_url, agreement_url=agreement_url).unwrap()
+
+        return data
+
+
+class ActivityUpdateView(APIView):
+    
+    def post(self, request):
+        id_ = request.POST.get('id', None)
+        name = request.POST.get('name', None)
+        un_join_url = request.POST.get('un_join_url', None)
+        in_join_url = request.POST.get('in_join_url', None)
+        agreement_url = request.POST.get('agreement_url', None)
+        rank = request.POST.get('rank', None)
+
+        if not id_:
+            return r'缺少参数'
+
+        data = self.rpc['venus/sun/activity/edit'](id_=id_, name=name, un_join_url=un_join_url, in_join_url=in_join_url, agreement_url=agreement_url, rank=rank).unwrap()
+        if not data:
+            return r'更新失败'
+
+        return data
+
+
+class ActivityDeleteView(APIView):
+    
+    def post(self, request):
+        ids = json.loads(request.POST.get('ids', '[]'))
+        if not ids:
+            return r'缺少参数'
+
+        for id_ in ids:
+            
+            data = self.rpc['venus/sun/activity/delete'](id_=id_).unwrap()
+            if not data:
+                return r'操作失败'
+
+        return data

api/beauty.py

+import json
+from utils.base import APIView, get_offset_count
+from utils.logger import error_logger
+
+
+class BeautyListView(APIView):
+
+    def get(self, request):
+        offset, count = get_offset_count(request)
+        word_parent_id = request.GET.get('word_parent_id', None)
+        is_online = request.GET.get('is_online', None)
+
+        data = self.rpc['venus/sun/beauty/list'](offset=offset, count=count, word_parent_id=word_parent_id, is_online=is_online).unwrap()
+        return data
+
+
+class BeautyInfoView(APIView):
+    
+    def get(self, request):
+        id_ = request.GET.get('id')
+
+        data = self.rpc['venus/sun/beauty/get'](id_=id_).unwrap()
+        return data
+
+
+class BeautyCreateView(APIView):
+
+    def post(self, request):
+        url = request.POST.get('url', None)
+        word_parent_id = request.POST.get('word_parent_id', None)
+
+        if not url or not word_parent_id:
+            return r'缺少参数'
+
+        data = self.rpc['venus/sun/beauty/add'](url=url, word_parent_id=word_parent_id).unwrap()
+
+        return data
+
+
+class BeautyUpdateView(APIView):
+    
+    def post(self, request):
+        id_ = request.POST.get('id', None)
+        url = request.POST.get('url', None)
+        word_parent_id = request.POST.get('word_parent_id', None)
+
+        if not id_:
+            return r'缺少参数'
+
+        data = self.rpc['venus/sun/beauty/edit'](id_=id_, url=url, word_parent_id=word_parent_id).unwrap()
+        if not data:
+            return r'更新失败'
+
+        return data
+
+
+class BeautyDeleteView(APIView):
+    
+    def post(self, request):
+        ids = json.loads(request.POST.get('ids', '[]'))
+        
+        if not ids:
+            return r'缺少参数'
+
+        for id_ in ids:
+
+            data = self.rpc['venus/sun/beauty/delete'](id_=id_).unwrap()
+            if not data:
+                return r'操作失败'
+
+        return data

api/operation.py

@@ -119,3 +119,72 @@ class PictorialHomeRecommendUpdate(APIView):
             return u'操作失败'
 
         return data
+
+
+class OperationDelete(APIView):
+    """删除运营位"""
+
+    def post(self, request):
+        operation_id = request.POST.get('id')
+
+        try:
+            data = self.rpc['venus/sun/operation/delete'](id_=operation_id).unwrap()
+        except Exception as e:
+            error_logger.error(u'操作失败', e)
+            raise
+
+        if not data:
+            return u'操作失败'
+
+        return data
+
+
+class OperationEdit(APIView):
+    """编辑运营位"""
+
+    def post(self, request):
+
+        operation_id = request.POST.get('id')
+        operation_type = int(request.POST.get('operation_type'))
+        image_url = request.POST.get('image_url')
+        url = request.POST.get('url')
+        start_time = int(request.POST.get('start_time'))
+        end_time = int(request.POST.get('end_time'))
+        long_image_url = request.POST.get('long_image_url')
+        is_repeat_read = int(request.POST.get('is_repeat_read', 1))
+
+        data = {
+            "operation_type": operation_type,
+            "image_url": image_url,
+            "long_image_url": long_image_url,
+            "url": url,
+            "start_time": start_time,
+            "end_time": end_time,
+            "is_repeat_read": is_repeat_read
+        }
+
+        try:
+            data = self.rpc['venus/sun/operation/edit'](id_=operation_id, data=data).unwrap()
+        except Exception as e:
+            error_logger.error(u'操作失败', e)
+            raise
+
+        if not data:
+            return u'操作失败'
+
+        return data
+
+
+class OperationList(APIView):
+    """获取运营位列表"""
+
+    def get(self, request):
+        operation_type = request.GET.get('operation_type')
+
+        try:
+            data = self.rpc['venus/sun/operation/list'](operation_type=operation_type).unwrap()
+        except Exception as e:
+            error_logger.error(u'获取失败', e)
+            raise
+
+        return data

api/topic.py

@@ -115,11 +115,14 @@ class TopicUpdateOrCreateView(APIView):
         return {'data': data}
 
     def post(self, request):
+
         id = request.POST.get('id', '')
         topic_images = list(map(lambda x: x[:-2], json.loads(request.POST.get('topic_images', '[]'))))
         tag_ids = list(map(lambda x: x.split(':')[0], json.loads(request.POST.get('tags', '[]'))))
         collection_tag_ids = list(map(lambda x: x.split(':')[0], json.loads(request.POST.get('collection_tags', '[]'))))
         cut_word_tag_ids = list(map(lambda x: x.split(':')[0], json.loads(request.POST.get('cut_word_tags', '[]'))))
+        body_esthetics_tag_ids = list(
+            map(lambda x: x.split(':')[0], json.loads(request.POST.get('body_esthetics_tags', '[]'))))
         pictorial_ids = list(json.loads(request.POST.get('pictorial_ids', '[]')))
 
         data = {
@@ -141,6 +144,7 @@ class TopicUpdateOrCreateView(APIView):
             'virtual_vote_num': request.POST.get('virtual_vote_num', ''),
             'is_home': int(request.POST.get('is_home', 0)),
             'is_recommend': int(request.POST.get('is_recommend', 0)),
+            'body_esthetics_tag_ids': body_esthetics_tag_ids,
         }
         try:
             self.rpc['venus/sun/topic/edit'](id=id, data=data).unwrap()

api/urls.py

@@ -23,6 +23,9 @@ from .commons import *
 from .pictorial import *
 from .operation import *
 from .tools import *
+from .beauty import *
+from .word_parent import *
+from .activity import *
 
 
 urlpatterns = [
@@ -143,12 +146,36 @@ urlpatterns = [
     url(r'^operation/home_fix', TopicHomeFixOperation.as_view()),
     url(r'^operation/pictorial/recommend/list', PictorialHomeRecommendList.as_view()),
     url(r'^operation/pictorial/recommend/update', PictorialHomeRecommendUpdate.as_view()),
+    url(r'^operation/edit', OperationEdit.as_view()),
+    url(r'^operation/list', OperationList.as_view()),
+    url(r'^operation/delete', OperationDelete.as_view()),
 
     # 工具
     url(r'^tools/virtual_vote$', VirtualVote.as_view()),
     url(r'^tools/batch_update_topic_tag$', BatchUpdateTopicTag.as_view()),
     url(r'^tools/batch_create_topic_with_ai_fashion_tag$', BatchCreateTopicWithAiFashionTag.as_view()),
 
+    # 母词
+    url(r'^word_parent/list$', WordParentListView.as_view()),
+    url(r'^word_parent/get$', WordParentInfoView.as_view()),
+    url(r'^word_parent/create$', WordParentCreateView.as_view()),
+    url(r'^word_parent/update$', WordParentUpdateView.as_view()),
+    url(r'^word_parent/delete$', WordParentDeleteView.as_view()),
+
+    # 美图
+    url(r'^beauty/list$', BeautyListView.as_view()),
+    url(r'^beauty/get$', BeautyInfoView.as_view()),
+    url(r'^beauty/create$', BeautyCreateView.as_view()),
+    url(r'^beauty/update$', BeautyUpdateView.as_view()),
+    url(r'^beauty/delete$', BeautyDeleteView.as_view()),
+
+    # 活动
+    url(r'^activity/list$', ActivityListView.as_view()),
+    url(r'^activity/get$', ActivityInfoView.as_view()),
+    url(r'^activity/create$', ActivityCreateView.as_view()),
+    url(r'^activity/update$', ActivityUpdateView.as_view()),
+    url(r'^activity/delete$', ActivityDeleteView.as_view()),
+
 ]
 
 search_urlpatterns = [

api/user.py

@@ -19,13 +19,16 @@ from utils.pic_tools import tailor_image
 class UserListView(APIView):
     def get(self, request):
         pictorial_id = request.GET.get('pictorial_id', '')
+        gender = request.GET.get('gender', None)
         page = int(request.GET.get('page', 1))
         limit = int(request.GET.get('limit', 10))
-        filter = self.handle_filter(request.GET.get('filter', '{}'))
+        filters = self.handle_filter(request.GET.get('filter', '{}'))
         if pictorial_id:
-            filter.update({'pictorial_id': pictorial_id})
+            filters.update({'pictorial_id': pictorial_id})
+        if gender:
+            filters.update({'gender': gender})
         try:
-            data = self.rpc['venus/sun/user/list'](offset=(page-1)*limit, limit=limit, filters=filter).unwrap()
+            data = self.rpc['venus/sun/user/list'](offset=(page-1)*limit, limit=limit, filters=filters).unwrap()
         except Exception as e:
             error_logger.error(u'获取用户列表失败%s', e)
             raise
@@ -55,10 +58,13 @@ class UserUpdateOrCreate(APIView):
         return data
 
     def post(self, request):
+
         id = request.POST.get('id', '')
         user_id = request.POST.get('user_id', '')
         tag_ids = list(map(lambda x: x.split(":")[0], json.loads(request.POST.get('tags', '[]'))))
         password = make_password(settings.PUPPET_PASSWORD, None, 'pbkdf2_sha256')
+        body_esthetics_tag_ids = list(
+            map(lambda x: x.split(':')[0], json.loads(request.POST.get('body_esthetics_tags', '[]'))))
 
         data = {
             'user_id': user_id,
@@ -73,6 +79,7 @@ class UserUpdateOrCreate(APIView):
             'email': request.POST.get('email'),
             'gender': request.POST.get('gender'),
             'is_tcc': int(request.POST.get('is_tcc', 0)),
+            'body_esthetics_tag_ids': body_esthetics_tag_ids,
         }
 
         try:

api/word_parent.py

+import json
+from utils.base import APIView, get_offset_count
+from utils.logger import error_logger
+
+
+class WordParentListView(APIView):
+
+    def get(self, request):
+        offset, count = get_offset_count(request)
+        name = request.GET.get('name', None)
+        is_online = request.GET.get('is_online', None)
+
+        data = self.rpc['venus/sun/word_parent/list'](offset=offset, count=count, name=name, is_online=is_online).unwrap()
+        return data
+
+
+class WordParentInfoView(APIView):
+    
+    def get(self, request):
+        
+        id_ = request.GET.get('id')
+
+        data = self.rpc['venus/sun/word_parent/get'](id_=id_).unwrap()
+        return data
+
+
+class WordParentCreateView(APIView):
+
+    def post(self, request):
+        name = request.POST.get('name', None)
+        children_words = json.loads(request.POST.get('children_words', '[]'))
+        content_ad = request.POST.get('content_ad', '')
+        makeup_ad = request.POST.get('makeup_ad', '')
+        dress_ad = request.POST.get('dress_ad', '')
+        gender = request.POST.get('gender', 0)
+
+        if not name:
+            return r'缺少参数'
+
+        data = self.rpc['venus/sun/word_parent/add'](name=name, children_words=children_words, content_ad=content_ad, makeup_ad=makeup_ad, dress_ad=dress_ad, gender=gender).unwrap()
+
+        return data
+
+
+class WordParentUpdateView(APIView):
+    
+    def post(self, request):
+        id_ = request.POST.get('id', None)
+        name = request.POST.get('name', None)
+        children_words = json.loads(request.POST.get('children_words', '[]'))
+        content_ad = request.POST.get('content_ad', None)
+        makeup_ad = request.POST.get('makeup_ad', None)
+        dress_ad = request.POST.get('dress_ad', None)
+        gender = request.POST.get('gender', None)
+
+        if not id_:
+            return r'缺少参数'
+
+        data = self.rpc['venus/sun/word_parent/edit'](id_=id_, name=name, children_words=children_words, content_ad=content_ad, makeup_ad=makeup_ad, dress_ad=dress_ad, gender=gender).unwrap()
+        if not data:
+            return r'更新失败'
+
+        return data
+
+
+class WordParentDeleteView(APIView):
+    
+    def post(self, request):
+        ids = json.loads(request.POST.get('ids', '[]'))
+
+        if not ids:
+            return r'缺少参数'
+
+        for id_ in ids:
+            data = self.rpc['venus/sun/word_parent/delete'](id_=id_).unwrap()
+            if not data:
+                return r'操作失败'
+
+        return data