Merge branch 'test' into 'master'

Test

See merge request alpha/physical!359

libs/es.py

@@ -416,13 +416,13 @@ class ESPerform(object):
                 "sort": [
                     {"_score": {"order": "desc"}},
                     {"create_time_val": {"order": "desc"}},
-                    {"language_type": {"order": "asc"}}
+                    {"language_type": {"order": "asc"}},
                 ],
                 "collapse": {
                     "field": "user_id"
               }
-
             }
+
             if len(have_read_topic_id_list) > 0:
                 q["query"]["function_score"]["query"]["bool"]["must_not"] = {
                     "terms": {

linucb/views/collect_data.py

@@ -219,7 +219,9 @@ class CollectData(object):
 
                                 topic_tag_id_dict = dict()
                                 tag_list = list()
-                                exposure_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id__in=exposure_topic_id_list).values_list("topic_id","tag_id","is_online","is_collection")
+                                exposure_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).\
+                                    filter(topic_id__in=exposure_topic_id_list).\
+                                    values_list("topic_id","tag_id","is_online","is_collection")
                                 # if len(exposure_sql_query_results)>0:
                                 for topic_id,tag_id,is_online,is_collection in exposure_sql_query_results:
                                     if is_online and is_collection == 1:

search/utils/topic.py

@@ -354,7 +354,7 @@ class TopicUtils(object):
             q = dict()
             q["query"] = {
                 "term": {
-                    "id": user_id
+                    "user_id": user_id
                 }
             }
 
@@ -370,15 +370,13 @@ class TopicUtils(object):
                 return []
             else:
                 q = dict()
-                q["query"] = dict()
-                # logging.warning("topic_tag_list:%s"%str(topic_tag_list))
-                query_function_score = {
-                        "query": {
+                q["query"] = {
                             "bool": {
                                 "must": [
                                     {"term": {"is_online": True}},
                                     {"term": {"is_deleted": False}},
-                                    {"terms": {"tag_list": useful_tag_list}}
+                                    {"terms": {"tag_list": useful_tag_list}},
+                                    {"term":{"content_level":6}}
                                 ],
                                 "must_not": {
                                     "terms": {
@@ -387,7 +385,23 @@ class TopicUtils(object):
                                 }
                             }
                         }
-                   }
+                # logging.warning("topic_tag_list:%s"%str(topic_tag_list))
+                # query_function_score = {
+                #         "query": {
+                #             "bool": {
+                #                 "must": [
+                #                     {"term": {"is_online": True}},
+                #                     {"term": {"is_deleted": False}},
+                #                     {"terms": {"tag_list": useful_tag_list}}
+                #                 ],
+                #                 "must_not": {
+                #                     "terms": {
+                #                         "id": have_read_topic_list
+                #                     }
+                #                 }
+                #             }
+                #         }
+                #    }
                 q["_source"] = {
                     "includes": ["id"]
                 }