Merge branch 'ycl/location_test' into 'test'

location

See merge request !38

api/views/tag.py

@@ -19,7 +19,7 @@ class CreateTagForBatch(BaseView):
             for tag in tag_list:
                 succ = check_info.get(tag.get("name")) if tag.get("name") else True
                 if not succ:
-                    tags.append(tag)
+                    tags.append({"name": tag})
         else:
             tags = tag_list
         error, data = self.call_rpc('venus/community/tag/batch_create_not_classify', data=tags)

api/views/topic.py

@@ -57,6 +57,7 @@ class CreateTopicForBatch(BaseView):
         if not topics:
             return self.ok()
 
+        locations = []
         tag_names = []
         for item in topics:
             tags = item.get("tags") or []
@@ -65,6 +66,11 @@ class CreateTopicForBatch(BaseView):
             item["card_level"] = card_level
             item["tag_id"] = tag_id if tag_id else None
             item["is_online"] = is_online
+            if item.get("location") and item.get("location").get("name"):
+                locations.append({
+                    "name": item.get("location").get("name"),
+                    "is_location": True
+                })
 
         not_exists_ids = []
         topic_list = []
@@ -92,12 +98,17 @@ class CreateTopicForBatch(BaseView):
 
         # check_info = Sensitive.check(tag_names)
         # tags  = [tag_name for tag_name, succ in check_info.items() if not succ]
-        tags  = tag_names
+        tags = [{
+            "name": item,
+            "is_own": True,
+        } for item in tag_names]
+
+        tags.extend(locations)
 
         # 先创建标签
         _tag_error, _tag_data = self.call_rpc(
             "venus/community/tag/batch_create_tag_by_name",
-            tag_names=tags, is_own=1
+            tags=tags
         )
         if _tag_error:
             return self.error(_tag_error)
@@ -107,6 +118,10 @@ class CreateTopicForBatch(BaseView):
         for item in topic_list:
             tags = item.get("tags") or []
             tags = [tag.replace("#", '').strip() for tag in tags]
+
+            #添加地域标签
+            if item.get("location") and item.get("location").get("name"):
+                tags.append(item.get("location").get("name"))
             content = item["content"]
             for tag_name, tag_id  in _tag_data.items():
                 if tag_name in tags:
@@ -181,12 +196,12 @@ class CreateTopicForBatchByOne(BaseView):
         # check_info = Sensitive.check(tag_names)
         # tags  = [tag_name for tag_name, succ in check_info.items() if not succ]
         # check_info = Sensitive.check(tag_names)
-        tags  = tag_names
+        tags = [{"name": item} for item in tag_names]
 
         # 先创建标签
         _tag_error, _tag_data = self.call_rpc(
             "venus/community/tag/batch_create_tag_by_name",
-            tag_names=tags
+            tags=tags
         )
         if _tag_error:
             return self.error(_tag_error)