modify query

search/views/topic.py

@@ -46,18 +46,11 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
                                  query_type=TopicPageType.HOME_RECOMMEND):
     try:
         if query is None:
-            if user_id == -1:
-                redis_key = "physical:home_recommend" + ":user_id:" + str(
-                    user_id) + ":device_id:" + device_id + ":query_type:" + str(query_type)
-            else:
-                redis_key = "physical:home_recommend" + ":user_id:" + str(user_id) + ":query_type:" + str(query_type)
+            redis_key = "physical:home_recommend" + ":user_id:" + str(
+                user_id) + ":device_id:" + device_id + ":query_type:" + str(query_type)
         else:
-            if user_id == -1:
-                redis_key = "physical:home_query" + ":user_id:" + str(
-                    user_id) + ":device_id:" + device_id + ":query:" + str(query) + ":query_type:" + str(query_type)
-            else:
-                redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":query:" + str(
-                    query) + ":query_type:" + str(query_type)
+            redis_key = "physical:home_query" + ":user_id:" + str(
+                user_id) + ":device_id:" + device_id + ":query:" + str(query) + ":query_type:" + str(query_type)
 
         redis_field_list = [b'have_read_topic_list']
         redis_field_val_list = redis_client.hmget(redis_key, redis_field_list)
@@ -72,8 +65,12 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         recommend_topic_ids = []
         have_read_topic_id_list = list()
 
-        if redis_field_val_list[0] and query is None:
-            have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
+        if redis_field_val_list[0]:
+            if query is None:
+                have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
+            else:
+                if offset>0:
+                    have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
 
         user_similar_score_redis_key = "physical:user_similar_score:user_id:" + str(user_id)
         redis_user_similar_score_redis_val = redis_client.get(user_similar_score_redis_key)