modify home_recommend star_filter

search/utils/topic.py

@@ -221,7 +221,7 @@ class TopicUtils(object):
                 "query": {
                     "bool": {
                         "filter": [
-                            {"range": {"content_level": {"gte": 4, "lte": 6}}},
+                            # {"term": {"content_level": 6}},
                             # {"term": {"has_image":True}},
                             {"term": {"is_online": True}},
                             {"term": {"is_deleted": False}}
@@ -293,6 +293,9 @@ class TopicUtils(object):
                     {"term": {"user_nick_name_pre": query.lower()}}
                 ]
                 query_function_score["query"]["bool"]["minimum_should_match"] = 1
+                query_function_score["query"]["bool"]["filter"].append(
+                    {"range": {"content_level": {"gte":4,"lte":6}}}
+                )
             else:
                 if "must_not" in query_function_score["query"]["bool"]:
                     query_function_score["query"]["bool"]["must_not"] += [
@@ -302,6 +305,9 @@ class TopicUtils(object):
                     query_function_score["query"]["bool"]["must_not"] = [
                         {"term": {"is_operation_home_recommend": True}}
                     ]
+                query_function_score["query"]["bool"]["filter"].append(
+                    {"term": {"content_level": 6}}
+                )
             q["query"]["function_score"] = query_function_score
             if not disable_collpase:
                 q["collapse"] = {
@@ -396,7 +402,7 @@ class TopicUtils(object):
                 "query": {
                     "bool": {
                         "must": [
-                            {"range": {"content_level": {"gte": 4, "lte": 5}}},
+                            {"range": {"content_level": {"gte": 4, "lte": 6}}},
                             {"term": {"is_online": True}},
                             {"term": {"is_deleted": False}}
                         ],

search/views/topic.py

@@ -48,12 +48,14 @@ def get_discover_page_topic_ids(user_id, device_id, size, query_type=TopicPageTy
 def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query=None,
                                  query_type=TopicPageType.HOME_RECOMMEND,promote_topic_list = [],disable_collpase=False):
     try:
+        topic_star_routing = "6"
         if query is None:
             if user_id>0:
                 redis_key = "physical:home_recommend" + ":user_id:" + str(user_id) + ":query_type:" + str(query_type)
             else:
                 redis_key = "physical:home_recommend" + ":device_id:" + device_id + ":query_type:" + str(query_type)
         else:
+            topic_star_routing = "4,5,6"
             if user_id>0:
                 redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":query:" + str(query) + ":query_type:" + str(query_type)
             else:
@@ -122,7 +124,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=0, size=size,
                                                            single_size=size,query=query, query_type=query_type,
                                                            filter_topic_id_list=have_read_topic_id_list,
-                                                           index_type="topic-high-star",routing="4,5,6",attention_tag_list=attention_tag_list,linucb_user_id_list=recommend_topic_user_list,disable_collpase=disable_collpase)
+                                                           index_type="topic-high-star",routing=topic_star_routing,attention_tag_list=attention_tag_list,linucb_user_id_list=recommend_topic_user_list,disable_collpase=disable_collpase)
 
         # if len(recommend_topic_list) == 6 and query is None:
         #     if (size < 11):