Merge branch 'test' into 'dev'

Test

See merge request alpha/sun!216

api/operation.py

@@ -188,3 +188,23 @@ class OperationList(APIView):
             raise
 
         return data
+
+
+class OperationSearchKeyword(APIView):
+    def get(self, request):
+        try:
+            data = self.rpc['venus/sun/operation/search_keyword/get']().unwrap()
+        except Exception as e:
+            error_logger.error(u'获取搜索热门词失败%s', e)
+            raise
+        return data
+
+    def post(self, request):
+        update = json.loads(request.POST.get('update'))
+        try:
+            data = self.rpc['venus/sun/operation/search_keyword/edit'](data=update).unwrap()
+        except Exception as e:
+            error_logger.error(u'获取搜索热门词失败%s', e)
+            raise
+        return data
+

api/pictorial.py

@@ -61,7 +61,8 @@ class PictorialUpdateOrCreate(APIView):
             'collection_tag_ids': collection_tag_ids,
             'is_home_recommend': int(request.POST.get('is_home_recommend', 0)),
             'add_score': int(request.POST.get('add_score', 0)),
-            'is_public': True if request.POST.get('is_public') == "true" else False
+            'is_public': True if request.POST.get('is_public') == "true" else False,
+            'is_feed': int(request.POST.get('is_feed',0))
 
         }
         try:
@@ -94,3 +95,51 @@ class PictorialTopics(APIView):
         return {
             'message': '更新成功'
         }
+
+
+class PictorialFeedlListView(APIView):
+    def get(self, request):
+        order_by = request.GET.get('order_by', "-id")
+        offset = int(request.GET.get('page', 1))
+        limit = int(request.GET.get('limit', 10))
+
+        try:
+            data = self.rpc['venus/sun/pictorial/feed/list'](offset=(offset - 1) * limit, limit=limit,
+                                                             order_by=order_by).unwrap()
+        except Exception as e:
+            error_logger.error(u'获取画报列表失败%s' , e)
+            raise
+        return data
+
+
+class PictorialFeedlRank(APIView):
+    """修改画报首页like流rank"""
+
+    def post(self, request):
+        id_ = request.POST.get('id')
+        rank = int(request.POST.get('rank'))
+
+        try:
+            self.rpc['venus/sun/pictorial/feed/rank'](id_=id_, rank=rank).unwrap()
+        except Exception as e:
+            error_logger.error(u'编辑%信息失败%s' % (e))
+            raise
+        return {
+            'message': '更新成功'
+        }
+
+
+class PictorialFeedDelete(APIView):
+    """删除画报首页like流"""
+
+    def post(self, request):
+        ids = json.loads(request.POST.get('ids', '[]'))
+
+        try:
+            self.rpc['venus/sun/pictorial/feed/delete'](ids=ids).unwrap()
+        except Exception as e:
+            error_logger.error(u'删除信息失败%s' % (e))
+            raise
+        return {
+            'message': '删除成功'
+        }
\ No newline at end of file

api/tag.py

@@ -137,9 +137,10 @@ class TagRegisterUpdateView(APIView):
         return data
 
     def post(self, request):
-        ids = request.POST.get('tag_ids')
+        male_ids = request.POST.get('male_ids')
+        female_ids = request.POST.get('female_ids')
         try:
-            self.rpc['venus/sun/tag/register_tag/update'](ids=ids).unwrap()
+            self.rpc['venus/sun/tag/register_tag/update'](female_ids=female_ids, male_ids=male_ids).unwrap()
         except Exception as e:
             error_logger.error(u'配置失败')
             raise
@@ -198,3 +199,44 @@ class TagFilterDelete(APIView):
                 return {'message': '操作失败'}
 
         return {'message': '操作成功'}
+
+
+class TagSearchRecommendKeyword(APIView):
+    def get(self, request):
+        try:
+            data = self.rpc['venus/sun/tag/recommend_keyword/get']().unwrap()
+        except Exception as e:
+            error_logger.error(u'获取搜索热门词失败%s', e)
+            raise
+        return data
+
+    def post(self, request):
+        # 如果有id 走update 。 否则走创建
+        id = request.POST.get('id', None)
+        update = request.POST.get('update', '')
+        try:
+            data = self.rpc['venus/sun/tag/recommend_keyword/edit'](data=update, id=id).unwrap()
+        except Exception as e:
+            error_logger.error(u'获取搜索热门词失败%s', e)
+            raise
+        return data
+
+
+class SearchDefaultKeyword(APIView):
+    def get(self, request):
+        try:
+            data = self.rpc['venus/sun/tag/search_default_keyword/get']().unwrap()
+        except Exception as e:
+            error_logger.error(u'获取搜索默认关键字失败%s', e)
+            raise
+        return data
+
+    def post(self, request):
+        id = request.POST.get('id', None)
+        update = request.POST.get('update', '')
+        try:
+            data = self.rpc['venus/sun/tag/search_default_keyword/edit'](data=update, id=id).unwrap()
+        except Exception as e:
+            error_logger.error(u'更新搜索默认关键字失败%s', e)
+            raise
+        return data

api/topic.py

@@ -40,7 +40,7 @@ class TopicListView(APIView):
 
         try:
             data = self.rpc['venus/sun/topic/list'](
-                topic_ids=topic_ids
+                topic_ids=topic_ids, pictorial_id=pictorial_id
             ).unwrap()
         except Exception as e:
             error_logger.error(u'获取帖子列表失败%s', e)
@@ -227,3 +227,20 @@ class TopicRelatePictorialInfo(APIView):
             error_logger.error(u'获取帖子画报列表失败%s', e)
             raise
         return {'data': data}
+
+
+class TopicBallot(APIView):
+
+    def post(self, request):
+        id_ = request.POST.get('id')
+        pictorial_id = request.POST.get('pictorial_id')
+        ballot_num = request.POST.get('ballot_num')
+
+        try:
+            self.rpc['venus/sun/topic/ballot'](id_=id_, pictorial_id=pictorial_id, ballot_num=ballot_num).unwrap()
+        except Exception as e:
+            error_logger.error(u'批量更新帖子失败%s', e)
+            raise
+        return {
+            "message": "更新成功"
+        }

api/urls.py

@@ -58,6 +58,7 @@ urlpatterns = [
     url(r'^topic/reply/batch_delete$', ReplyUpdateOrCreateView.as_view()),
     url(r'^topic/reply/create$', ReplyCreate.as_view()),
     url(r'^topic/related_pictorial_info$', TopicRelatePictorialInfo.as_view()),
+    url(r'^topic/ballot$', TopicBallot.as_view()),
 
     # star相关
     url(r'^celebrity/list$', CelebrityListView.as_view()),
@@ -94,6 +95,8 @@ urlpatterns = [
     url(r'^tag/filter/list$', TagFilterList.as_view()),
     url(r'^tag/filter/add$', TagFilterCreate.as_view()),
     url(r'^tag/filter/delete$', TagFilterDelete.as_view()),
+    url(r'^tag/search_recommend_keyword$', TagSearchRecommendKeyword.as_view()),
+    url(r'^tag/search_default_keyword$', SearchDefaultKeyword.as_view()),
 
     # 标签类型相关
     url(r'^tag/tagtype/list$', TagTypeListView.as_view()),
@@ -139,6 +142,10 @@ urlpatterns = [
     url(r'^pictorial/create$', PictorialUpdateOrCreate.as_view()),
     url(r'^pictorial/topics$', PictorialTopics.as_view()),
     url(r'^pictorial/user/list$', PictorialUserList.as_view()),
+    url(r'^pictorial/feed/list$', PictorialFeedlListView.as_view()),
+    url(r'^pictorial/feed/rank$', PictorialFeedlRank.as_view()),
+    url(r'^pictorial/feed/delete$', PictorialFeedDelete.as_view()),
+
 
     #运营位
     url(r'^topic/home_recommend/list', TopicHomeRecommendList.as_view()),
@@ -149,6 +156,7 @@ urlpatterns = [
     url(r'^operation/edit', OperationEdit.as_view()),
     url(r'^operation/list', OperationList.as_view()),
     url(r'^operation/delete', OperationDelete.as_view()),
+    url(r'^operation/search_keyword$', OperationSearchKeyword.as_view()),
 
     # 工具
     url(r'^tools/virtual_vote$', VirtualVote.as_view()),

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