Merge branch 'master' into 'test'

Master

See merge request !280

search/views/topic.py

@@ -50,12 +50,12 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
     try:
         if query is None:
             if user_id>0:
-                redis_key = "physical:home_recommend" + ":user_id:" + user_id + ":query_type:" + str(query_type)
+                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:
             if user_id>0:
-                redis_key = "physical:home_query" + ":user_id:" + user_id + ":query:" + str(query) + ":query_type:" + str(query_type)
+                redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":query:" + str(query) + ":query_type:" + str(query_type)
             else:
                 redis_key = "physical:home_query" + ":device_id:" + device_id + ":query:" + str(query) + ":query_type:" + str(query_type)
 
@@ -119,12 +119,13 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             have_read_topic_id_list.extend(recommend_topic_list)
 
         have_read_topic_id_list_add_promote = list()
+        promote_recommend_topic_id_list = list()
         have_read_topic_id_list_add_promote.extend(have_read_topic_id_list)
-        # promote_recommend_topic_id_list = TopicHomeRecommend.objects.using(settings.SLAVE_DB_NAME).filter(
-        #     is_online=1).values_list("topic_id")
-        # if len(have_read_topic_id_list)>0:
-        #   for topic_id in promote_recommend_topic_id_list:
-        #      have_read_topic_id_list_add_promote.extend(topic_id)
+        promote_recommend_topic_id_list = TopicHomeRecommend.objects.using(settings.SLAVE_DB_NAME).filter(
+            is_online=1).values_list("topic_id",flat=True)
+        if len(promote_recommend_topic_id_list)>0:
+          for topic_id in promote_recommend_topic_id_list:
+             have_read_topic_id_list_add_promote.append(topic_id)
         topic_id_list = list()
 
         rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,
@@ -136,14 +137,14 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         if (len(recommend_topic_list) == 6):
             if (size < 11):
                 topic_id_list.extend(rank_topic_id_list[0:3])
-                topic_id_list.extend(recommend_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_id_list[3:6])
+                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_id_list[0:3])
+                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_id_list[3:6])
+                topic_id_list.extend(recommend_topic_list[3:6])
         else:
             topic_id_list.extend(rank_topic_id_list)