filter have read topic id list

search/utils/topic.py

@@ -231,7 +231,7 @@ class TopicUtils(object):
 
             q["query"]["function_score"] = query_function_score
             q["_source"] = {
-                "includes":["id","group_id","offline_score"]
+                "includes":["id","group_id","offline_score","user_id"]
             }
             q["sort"] = [
                 {
@@ -253,7 +253,7 @@ class TopicUtils(object):
 
             topic_id_dict = dict()
             for item in result_dict["hits"]:
-                topic_id_dict[item["_source"]["id"]] = item["_source"]["group_id"]
+                topic_id_dict[item["_source"]["id"]] = [item["_source"]["group_id"],item["_source"]["user_id"]]
 
             return topic_id_dict
         except:

search/views/topic.py

@@ -42,6 +42,79 @@ def get_discover_page_topic_ids(user_id,device_id,size,query_type=TopicPageType.
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
         return []
 
+def get_home_recommend_topic_ids(user_id,device_id,offset,size,query=None,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)
+        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_field_list = [b'have_read_topic_list']
+        redis_field_val_list = redis_client.hmget(redis_key,redis_field_list)
+
+        recommend_topic_ids = []
+        have_read_topic_id_set = set()
+
+        if redis_field_val_list[0]:
+            have_read_topic_id_set = set(json.loads(redis_field_val_list[0]))
+
+        topic_id_dict = TopicUtils.get_recommend_topic_ids(user_id, offset, size*size,query,query_type=query_type,filter_topic_id_list=have_read_topic_id_set)
+        have_read_group_id_set = set()
+        have_read_user_id_set = set()
+        unread_topic_id_dict = dict()
+
+        # 当前页小组数量
+        cur_page_group_num = 0
+        # 当前页用户数量
+        cur_page_user_num = 0
+
+        for topic_id in topic_id_dict:
+            if topic_id_dict[topic_id][0] in have_read_group_id_set or topic_id_dict[topic_id][1] in have_read_user_id_set:
+                unread_topic_id_dict[topic_id] = topic_id_dict[topic_id]
+            else:
+                if isinstance(topic_id_dict[topic_id][0],int) and topic_id_dict[topic_id][0]>0 and cur_page_group_num<(size*0.9):
+                    have_read_group_id_set.add(topic_id_dict[topic_id][0])
+                    have_read_user_id_set.add(topic_id_dict[topic_id][1])
+                    have_read_topic_id_set.add(topic_id)
+                    cur_page_group_num += 1
+                    recommend_topic_ids.append(topic_id)
+                elif topic_id_dict[topic_id] and cur_page_user_num<(size*0.1):
+                    have_read_user_id_set.add(topic_id_dict[topic_id][1])
+                    cur_page_user_num += 1
+                    recommend_topic_ids.append(topic_id)
+                else:
+                    unread_topic_id_dict[topic_id] = topic_id_dict[topic_id]
+
+                if len(recommend_topic_ids) >= size:
+                    break
+
+
+        if len(recommend_topic_ids) < size and len(unread_topic_id_dict)>0:
+            for unread_topic_id in unread_topic_id_dict:
+                if len(recommend_topic_ids)<size:
+                    recommend_topic_ids.append(unread_topic_id)
+                    have_read_user_id_set.add(unread_topic_id)
+                else:
+                    break
+        redis_dict = {
+            "have_read_topic_list":json.dumps(have_read_user_id_set),
+        }
+        redis_client.hmset(redis_key,redis_dict)
+        # 每个session key保存15分钟
+        redis_client.expire(redis_key,15*60)
+
+        return recommend_topic_ids
+    except:
+        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+        return []
+
+"""
 def get_home_recommend_topic_ids(user_id,device_id,offset,size,query=None,query_type=TopicPageType.HOME_RECOMMEND):
     try:
         if query is None:
@@ -125,6 +198,8 @@ def get_home_recommend_topic_ids(user_id,device_id,offset,size,query=None,query_
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
         return []
 
+"""
+
 @bind("physical/search/home_recommend")
 def home_recommend(device_id="",user_id=-1,offset=0,size=10,query_type=TopicPageType.HOME_RECOMMEND):
     """