Merge branch 'feature/sun_topic2es' into 'test'

添加排序

See merge request !188

search/utils/topic.py

@@ -631,6 +631,7 @@ class TopicUtils(object):
         """处理排序部分。"""
 
         sort_rule = []
+        if isinstance(sorts_by, int):
             if sorts_by == TOPIC_SEARCH_SORT.VOTE_NUM:
                 sort_rule.append({
                     "vote_num":{
@@ -641,12 +642,28 @@ class TopicUtils(object):
                     },
                 })
 
-        elif sorts_by == TOPIC_SEARCH_SORT.VOTE_NUM:
-            pass
-
-        elif sorts_by == '2':
+        elif isinstance(sorts_by, list):
+            if sorts_by == TOPIC_SEARCH_SORT.ID_ASC:
                 sort_rule.append({
                     "id":{
+                        "order":"asc"
+                    },
+                })
+            elif sorts_by == TOPIC_SEARCH_SORT.ID_DESC:
+                sort_rule.append({
+                    "id":{
+                        "order":"desc"
+                    },
+                })
+            elif sorts_by == TOPIC_SEARCH_SORT.SCORE_AEC:
+                sort_rule.append({
+                    "sort_score":{
+                        "order":"asc"
+                    },
+                })
+            elif sorts_by == TOPIC_SEARCH_SORT.SCORE_DESC:
+                sort_rule.append({
+                    "sort_score":{
                         "order":"desc"
                     },
                 })