Merge branch 'ycl/like18' into 'dev'

BODY_ESTHETICS

See merge request !199

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 = {
@@ -140,6 +143,8 @@ class TopicUpdateOrCreateView(APIView):
             'has_video': 1 if request.POST.get('video_url', '') else 0,
             '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/user.py

@@ -55,10 +55,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 +76,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: