modify

search/utils/group.py

@@ -47,7 +47,7 @@ class GroupUtils(object):
             return {"total_count":0, "hits":[]}
 
     @classmethod
-    def get_hot_group_recommend_result_list(cls,offset,size,es_cli_obj=None):
+    def get_hot_pictorial_recommend_result_list(cls,offset,size,es_cli_obj=None):
         try:
             if not es_cli_obj:
                 es_cli_obj = ESPerform.get_cli()
@@ -68,19 +68,19 @@ class GroupUtils(object):
                 "includes":["id"]
             }
 
-            result_dict = ESPerform.get_search_results(es_cli_obj,"group",q,offset,size)
+            result_dict = ESPerform.get_search_results(es_cli_obj,"pictorial",q,offset,size)
 
-            group_ids_list = []
+            pictorial_ids_list = []
             if len(result_dict["hits"]) > 0:
-                group_ids_list = [item["_source"]["id"] for item in result_dict["hits"]]
+                pictorial_ids_list = [item["_source"]["id"] for item in result_dict["hits"]]
 
-            return group_ids_list
+            return pictorial_ids_list
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return []
 
     @classmethod
-    def get_user_attention_group_list(cls,user_id,offset=0,size=10,es_cli_obj=None):
+    def get_user_attention_pictorial_list(cls,user_id,offset=0,size=10,es_cli_obj=None):
         """
         :remark: 获取用户关注小组列表
         :return:
@@ -100,12 +100,12 @@ class GroupUtils(object):
                 }
             }
             q["_source"] = {
-                "includes":["attention_group_id_list"]
+                "includes":["attention_pictorial_id_list"]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj,"user",q,offset,size)
             if len(result_dict["hits"])>0:
-                return result_dict["hits"][0]["_source"]["attention_group_id_list"]
+                return result_dict["hits"][0]["_source"]["attention_pictorial_id_list"]
             else:
                 return []
         except:
@@ -113,7 +113,7 @@ class GroupUtils(object):
             return []
 
     @classmethod
-    def get_group_ids_by_aggs(cls,group_id_list,es_cli_obj=None):
+    def get_pictorial_ids_by_aggs(cls,pictorial_ids_list,es_cli_obj=None):
         """
         :remark:聚合查询获取小组列表
         :param group_id_list:
@@ -127,13 +127,13 @@ class GroupUtils(object):
             q["size"]=0
             q["query"] = {
                 "terms":{
-                    "group_id":group_id_list
+                    "pictorial_id":pictorial_ids_list
                 }
             }
             q["aggs"] = {
-                "group_ids":{
+                "pictorial_ids":{
                     "terms":{
-                        "field":"group_id"
+                        "field":"pictorial_id"
                     },
                     "aggs":{
                         "max_date":{
@@ -146,12 +146,12 @@ class GroupUtils(object):
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj,"topic",q,aggregations_query=True)
-            buckets_list = result_dict["aggregations"]["group_ids"]["buckets"]
+            buckets_list = result_dict["aggregations"]["pictorial_ids"]["buckets"]
 
             sorted_buckets_list = sorted(buckets_list,key=lambda item:item["max_date"]["value"],reverse=True)
-            sorted_group_id_list = [item["key"] for item in sorted_buckets_list]
+            sorted_pictorial_id_list = [item["key"] for item in sorted_buckets_list]
 
-            return sorted_group_id_list
+            return sorted_pictorial_id_list
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return []
\ No newline at end of file