Merge branch 'test' into 'branch_0520'

# Conflicts:
#   search/utils/topic.py

.idea/codeStyles/Project.xml

@@ -24,5 +24,29 @@
         <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
       </formatting-settings>
     </DBN-SQL>
+    <DBN-PSQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
   </code_scheme>
 </component>
\ No newline at end of file

libs/error.py

@@ -18,4 +18,4 @@ def logging_exception(send_to_sentry=True):
         # send exception info to sentry, fail silently
         _sentry_client.captureException()
     except:
-        pass
+        passraven.contrib.django.raven_compat.models

search/utils/topic.py

@@ -14,6 +14,7 @@ from trans2es.models.pictorial import PictorialTopics
 from libs.cache import redis_client
 
 
+
 class TopicUtils(object):
 
     @classmethod
@@ -122,9 +123,11 @@ class TopicUtils(object):
             return {}
 
     @classmethod
-    def get_recommend_topic_ids(cls,user_id,tag_id,offset,size,single_size,query=None,query_type=TopicPageType.HOME_RECOMMEND,
-                                filter_topic_id_list=[],test_score=False,must_topic_id_list=[],recommend_tag_list=[],
-                                user_similar_score_list=[],index_type="topic",routing=None,attention_tag_list=[],linucb_user_id_list = [],disable_collpase=False):
+    def get_recommend_topic_ids(cls, user_id, tag_id, offset, size, single_size, query=None,
+                                query_type=TopicPageType.HOME_RECOMMEND,
+                                filter_topic_id_list=[], test_score=False, must_topic_id_list=[], recommend_tag_list=[],
+                                user_similar_score_list=[], index_type="topic", routing=None, attention_tag_list=[],
+                                linucb_user_id_list=[], disable_collpase=False):
         """
         :remark:获取首页推荐帖子列表
         :param user_id:
@@ -220,7 +223,7 @@ class TopicUtils(object):
                         ],
                         "minimum_should_match": 1,
                         "must_not": [
-                            {"term": {"is_history":True}}
+                            {"term": {"is_history": True}}
                         ]
                     }
                 },
@@ -236,10 +239,10 @@ class TopicUtils(object):
                 }
             if len(filter_topic_id_list) > 0:
                 query_function_score["query"]["bool"]["must_not"] = [
-                    {"terms":{"id":filter_topic_id_list}}
+                    {"terms": {"id": filter_topic_id_list}}
                 ]
 
-            if len(linucb_user_id_list)>0:
+            if len(linucb_user_id_list) > 0:
                 if "must_not" in query_function_score["query"]["bool"]:
                     query_function_score["query"]["bool"]["must_not"] += [
                         {"terms": {"user_id": linucb_user_id_list}}
@@ -322,7 +325,7 @@ class TopicUtils(object):
                 }
             ]
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name=index_type, query_body=q,
-                                                       offset=offset, size=size,routing=routing)
+                                                       offset=offset, size=size, routing=routing)
 
             topic_id_list = list()
 
@@ -335,7 +338,8 @@ class TopicUtils(object):
 
     @classmethod
     def get_topic_detail_recommend_list(cls, user_id, topic_id, topic_tag_list, topic_pictorial_id, topic_user_id,
-                                        filter_topic_user_id, have_read_topic_list, offset, size, es_cli_obj=None,index_type="topic",routing=None):
+                                        filter_topic_user_id, have_read_topic_list, offset, size, es_cli_obj=None,
+                                        index_type="topic", routing=None):
         """
         :remark 帖子详情页推荐列表,缺少按时间衰减
         :param user_id:
@@ -412,7 +416,7 @@ class TopicUtils(object):
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name=index_type, query_body=q,
-                                                       offset=offset, size=size,routing=routing)
+                                                       offset=offset, size=size, routing=routing)
 
             return result_dict["hits"]
         except:
@@ -420,9 +424,10 @@ class TopicUtils(object):
             return []
 
     @classmethod
-    def top_get_topic_detail_recommend_list(cls, user_id, topic_id,have_read_topic_list, size, es_cli_obj=None,
-                                        index_type="topic", routing=None,collection_topic_tag_list = [],topic_tag_list = [],
-                                            topic_user_id =-1):
+    def top_get_topic_detail_recommend_list(cls, user_id, topic_id, have_read_topic_list, size, es_cli_obj=None,
+                                            index_type="topic", routing=None, collection_topic_tag_list=[],
+                                            topic_tag_list=[],
+                                            topic_user_id=-1):
         """
         :remark 帖子详情页推荐列表,缺少按时间衰减
         :param user_id:
@@ -466,7 +471,7 @@ class TopicUtils(object):
             #             "weight": 5000
             #         }
             #     )
-            if len(topic_tag_list) != 0 or topic_user_id!= -1:
+            if len(topic_tag_list) != 0 or topic_user_id != -1:
                 query_function_score = {
                     "query": {
                         "bool": {
@@ -534,7 +539,8 @@ class TopicUtils(object):
             #         {"create_time": {"order": "desc"}}
             #     ]
 
-            result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name=index_type, query_body=q, size=size, routing=routing)
+            result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name=index_type, query_body=q, size=size,
+                                                       routing=routing)
             topic_id_list = list()
 
             for item in result_dict["hits"]:
@@ -677,7 +683,7 @@ class TopicUtils(object):
             {"term": {"is_deleted": False}},
         ]
 
-        logging.info("get filters:%s"%filters)
+        logging.info("get filters:%s" % filters)
         if not filters:
             return f
 
@@ -867,21 +873,23 @@ class TopicUtils(object):
                 query_body=q, offset=offset, size=size
             )
 
-            if len(result_dict["hits"])>0:
+            if len(result_dict["hits"]) > 0:
                 topic_id_list = [item["_source"]["id"] for item in result_dict["hits"]]
 
-                return (topic_id_list,result_dict["total_count"])
-            elif offset==0 and "pictorial_id" in filters: # 防止帖子同步延迟，画报详情页为空
+                return (topic_id_list, result_dict["total_count"])
+            elif offset == 0 and "pictorial_id" in filters:  # 防止帖子同步延迟，画报详情页为空
                 pictorial_id = int(filters["pictorial_id"])
-                topic_id_list = list(PictorialTopics.objects.filter(pictorial_id=pictorial_id,is_online=True,is_deleted=False).values_list("topic_id", flat=True)[offset:size])
+                topic_id_list = list(PictorialTopics.objects.filter(pictorial_id=pictorial_id, is_online=True,
+                                                                    is_deleted=False).values_list("topic_id",
+                                                                                                  flat=True)[
+                                     offset:size])
 
-                return (topic_id_list,len(topic_id_list))
+                return (topic_id_list, len(topic_id_list))
             else:
                 return ([], 0)
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-            return ([],0)
-
+            return ([], 0)
 
     @classmethod
     def business_topic_ids(cls, filters, nfilters, sorts_by, offset=0, size=10, index_name="topic", filter_online=True):
@@ -969,7 +977,20 @@ class TopicUtils(object):
                         }
                     }
                 })
+            elif k == "drop_score":
+                if v == "0":
+                    f.append({
+                        "term": {k: v}
+                    })
 
+                else:
+                    f.append({
+                        "range": {
+                            "drop_score": {
+                                "gte": v,
+                            }
+                        }
+                    })
             else:
 
                 if isinstance(v, list):