modify query

search/utils/topic.py

@@ -173,29 +173,6 @@ class TopicUtils(object):
                 }
             ]
 
-            if user_id and user_id > 0:
-                redis_key_prefix = "physical:user_similar:participant_user_id:"
-                similar_redis_key = redis_key_prefix + str(user_id)
-                redis_user_similar_data = redis_client.get(similar_redis_key)
-                user_similar_list = json.loads(redis_user_similar_data) if redis_user_similar_data else []
-                if len(user_similar_list) > 0:
-                    functions_list.extend(user_similar_list)
-
-            if len(attention_user_id_list) > 0:
-                functions_list.append(
-                    {
-                        "filter": {"constant_score": {"filter": {"terms": {"user_id": attention_user_id_list}}}},
-                        "weight": 100,
-                    }
-                )
-            if len(attention_tag_list) > 0:
-                functions_list.append(
-                    {
-                        "filter": {"bool": {
-                            "should": {"terms": {"tag_list": attention_tag_list}}}},
-                        "weight": 100
-                    }
-                )
             query_function_score = {
                 "query": {
                     "bool": {
@@ -283,16 +260,41 @@ class TopicUtils(object):
                     query_function_score["query"]["bool"]["filter"].append(
                         {"term": {"content_level": 6}}
                     )
-            if not disable_collpase:
-                q["collapse"] = {
-                    "field": "user_id"
-                }
             q["_source"] = {
                 "includes": ["id"]
             }
 
             if query is None:
+                if user_id and user_id > 0:
+                    redis_key_prefix = "physical:user_similar:participant_user_id:"
+                    similar_redis_key = redis_key_prefix + str(user_id)
+                    redis_user_similar_data = redis_client.get(similar_redis_key)
+                    user_similar_list = json.loads(redis_user_similar_data) if redis_user_similar_data else []
+                    if len(user_similar_list) > 0:
+                        functions_list.extend(user_similar_list)
+
+                if len(attention_user_id_list) > 0:
+                    functions_list.append(
+                        {
+                            "filter": {"constant_score": {"filter": {"terms": {"user_id": attention_user_id_list}}}},
+                            "weight": 100,
+                        }
+                    )
+                if len(attention_tag_list) > 0:
+                    functions_list.append(
+                        {
+                            "filter": {"bool": {
+                                "should": {"terms": {"tag_list": attention_tag_list}}}},
+                            "weight": 100
+                        }
+                    )
+                query_function_score["functions"] = functions_list
                 q["query"]["function_score"] = query_function_score
+
+                if not disable_collpase:
+                    q["collapse"] = {
+                        "field": "user_id"
+                    }
                 q["sort"] = [
                     # {
                     #     "_script": {