modify physical-search-topic

search/utils/topic.py

@@ -10,7 +10,7 @@ from alpha_types.venus import TOPIC_SEARCH_SORT
 from libs.es import ESPerform
 from .common import TopicDocumentField
 from search.utils.common import *
-
+from trans2es.models.pictorial import PictorialTopics
 
 class TopicUtils(object):
 
@@ -860,38 +860,41 @@ class TopicUtils(object):
 
     @classmethod
     def list_topic_ids(cls, filters, nfilters, sorts_by, offset=0, size=10, index_name="topic", filter_online=True):
-
-        must = cls.process_filters(filters, filter_online=filter_online)
-        q = {
-            "query": {
-                "bool": {
-                    "must": must,
-                    "must_not": cls.process_nfilters(nfilters),
+        try:
+            must = cls.process_filters(filters, filter_online=filter_online)
+            q = {
+                "query": {
+                    "bool": {
+                        "must": must,
+                        "must_not": cls.process_nfilters(nfilters),
+                    }
                 }
             }
-        }
 
-        if sorts_by:
-            sorts = cls.process_sort(sorts_by)
-            if sorts:
-                q["sort"] = sorts
+            if sorts_by:
+                sorts = cls.process_sort(sorts_by)
+                if sorts:
+                    q["sort"] = sorts
 
-        try:
             result_dict = ESPerform.get_search_results(
                 ESPerform.get_cli(), sub_index_name=index_name,
                 query_body=q, offset=offset, size=size
             )
 
-            return {
-                "hits": result_dict["hits"],
-                "total_count": result_dict["total_count"]
-            }
+            if len(result_dict["hits"])>0:
+                topic_id_list = [item["_source"]["id"] for item in result_dict["hits"]]
+
+                return (topic_id_list,result_dict["total_count"])
+            elif offset==0 and "pictorial_id" in filters: # 防止帖子同步延迟，画报详情页为空
+                pictorial_id = int(filters["pictorial_id"])
+                topic_id_list = list(PictorialTopics.objects.filter(pictorial_id=pictorial_id,is_online=True,is_deleted=False).values_list("topic_id", flat=True)[offset:size])
+
+                return (topic_id_list,len(topic_id_list))
+            else:
+                return ([], 0)
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-            return {
-                "hits": [],
-                "total_count": 0
-            }
+            return ([],0)
 
     @classmethod
     def business_topic_ids(cls, filters, nfilters, sorts_by, offset=0, size=10, index_name="topic", filter_online=True):

search/views/topic.py

@@ -398,13 +398,12 @@ def topic_search(filters, nfilters=None, sorts_by=None, offset=0, size=10):
     """帖子搜索。"""
 
     try:
-        result_list = TopicUtils.list_topic_ids(filters=filters, nfilters=nfilters,
+        (topic_id_list,total_count) = TopicUtils.list_topic_ids(filters=filters, nfilters=nfilters,
                                                 sorts_by=sorts_by, offset=offset, size=size)
-        logging.info("get result_list:%s"%result_list)
-        topic_ids = [item["_source"]["id"] for item in result_list["hits"]]
+
         return {
-            "topic_ids": topic_ids,
-            "total_count": result_list["total_count"]
+            "topic_ids": topic_id_list,
+            "total_count": total_count
         }
     except:
         logging.error("catch exception, err_msg:%s" % traceback.format_exc())