add

search/utils/topic.py

@@ -929,6 +929,7 @@ class TopicUtils(object):
                         },
                     })
                 elif sort_by == TOPIC_SEARCH_SORT.REAL_VOTE_AEC:
+                    logging.info("hhhhhhhhhhhhhhhhhhhhh")
                     sort_rule.append({
                         "related_billboard.real_vote_cnt": {
                             "order": "asc",
@@ -943,11 +944,13 @@ class TopicUtils(object):
                         },
                     })
                 elif sort_by == TOPIC_SEARCH_SORT.REAL_VOTE_DESC:
+                    logging.info("hhhhhhhhhh3333hhhhhhhhhhh")
+
                     sort_rule.append({
                         "related_billboard.real_vote_cnt": {
                             "order": "desc",
                             "nested_path": "related_billboard",
-                            "missing": "_last",
+                            # "missing": "_last",
                             "nested_filter": {
                                 "term": {
                                     "related_billboard.pictorial_id": pictorial_id
@@ -957,11 +960,13 @@ class TopicUtils(object):
                         },
                     })
                 elif sort_by == TOPIC_SEARCH_SORT.VIRT_VOTE_AEC:
+                    logging.info("hhhhhhhhhhghfhgdggerrhhhhhhhhhhh")
+
                     sort_rule.append({
                         "related_billboard.virt_vote_cnt": {
                             "order": "asc",
                             "nested_path": "related_billboard",
-                            "missing": "_last",
+                            # "missing": "_last",
                             "nested_filter": {
                                 "term": {
                                     "related_billboard.pictorial_id": pictorial_id
@@ -970,11 +975,13 @@ class TopicUtils(object):
                         },
                     })
                 elif sort_by == TOPIC_SEARCH_SORT.VIRT_VOTE_DESC:
+                    logging.info("hhhhhhhhhhhhheeeeeeehhhhhhhh")
+
                     sort_rule.append({
                         "related_billboard.virt_vote_cnt": {
                             "order": "desc",
                             "nested_path": "related_billboard",
-                            "missing": "_last",
+                            # "missing": "_last",
                             "nested_filter": {
                                 "term": {
                                     "related_billboard.pictorial_id": pictorial_id
@@ -982,6 +989,8 @@ class TopicUtils(object):
                             }
                         },
                     })
+        logging.info("get picotirial:%s" % sort_rule)
+
         return sort_rule
 
     @classmethod
@@ -1040,13 +1049,15 @@ class TopicUtils(object):
         }
         if 'pictorial_id' in filters.keys():
             logging.info("get picotirial:%s" % filters["pictorial_id"])
+            logging.info("get picotirial:%s" % sorts_by)
+
             if sorts_by:
                 sorts = cls.process_sort(sorts_by, filters["pictorial_id"])
                 if sorts:
                     q["sort"] = sorts
         else:
             if sorts_by:
-                sorts = cls.process_sort(sorts_by,pictorial_id=None)
+                sorts = cls.process_sort(sorts_by, pictorial_id=None)
                 if sorts:
                     q["sort"] = sorts
 

search/views/group.py

@@ -277,8 +277,13 @@ def pictorial_topic_sort(pictorial_id=-1, offset=0, size=10):
             "sort": [
                 {"related_billboard.total_vote_cnt": {
                     "order": "desc",
-                    # "mode": "min",
-                    "nested_path": "related_billboard"
+                    "nested_path": "related_billboard",
+                    "missing": "_last",
+                    "nested_filter": {
+                        "term": {
+                            "related_billboard.pictorial_id": pictorial_id
+                        }
+                    }
                 }},
                 {"create_time": {"order": "desc"}}
             ]