update

search/views/topic.py

@@ -46,7 +46,7 @@ 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):
+                                 query_type=TopicPageType.HOME_RECOMMEND,promote_topic_list =[]):
     try:
         if query is None:
             if user_id>0:
@@ -77,7 +77,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         # redis_user_similar_score_redis_val = redis_client.get(user_similar_score_redis_key)
         # user_similar_score_redis_list = json.loads(
         #     redis_user_similar_score_redis_val) if redis_user_similar_score_redis_val else []
-
+        have_read_topic_id_list.extend(promote_topic_list)
         attention_tag_list = list()
         recommend_topic_list = list()
         if query is None:
@@ -115,19 +115,19 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
                                                            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)
 
-        if len(recommend_topic_list) == 6 and query is None:
-            if (size < 11):
-                topic_id_list.extend(rank_topic_id_list[0:3])
-                topic_id_list.extend(recommend_topic_list[0:3])
-                topic_id_list.extend(rank_topic_id_list[3:size])
-                topic_id_list.extend(recommend_topic_list[3:6])
-            else:
-                topic_id_list.extend(rank_topic_id_list[0:size - 7])
-                topic_id_list.extend(recommend_topic_list[0:3])
-                topic_id_list.extend(rank_topic_id_list[size - 7:size])
-                topic_id_list.extend(recommend_topic_list[3:6])
-        else:
-            topic_id_list.extend(rank_topic_id_list)
+        # if len(recommend_topic_list) == 6 and query is None:
+        #     if (size < 11):
+        #         topic_id_list.extend(rank_topic_id_list[0:3])
+        #         topic_id_list.extend(recommend_topic_list[0:3])
+        #         topic_id_list.extend(rank_topic_id_list[3:size])
+        #         topic_id_list.extend(recommend_topic_list[3:6])
+        #     else:
+        #         topic_id_list.extend(rank_topic_id_list[0:size - 7])
+        #         topic_id_list.extend(recommend_topic_list[0:3])
+        #         topic_id_list.extend(rank_topic_id_list[size - 7:size])
+        #         topic_id_list.extend(recommend_topic_list[3:6])
+        # else:
+        #     topic_id_list.extend(rank_topic_id_list)
 
         have_read_topic_id_list.extend(topic_id_list)
         if len(have_read_topic_id_list) > 30000:
@@ -140,7 +140,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         # 每个session key保存30天
         redis_client.expire(redis_key, 60 * 60 * 24 * 30)
 
-        return topic_id_list
+        return recommend_topic_list,rank_topic_id_list
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
         return []