Fix count bug for ranking.

Author: keillera

src/common/es_util.py

@@ -40,14 +40,15 @@ def search_tag(elasticsearch, word, limit, page):
         return tags
 
     @staticmethod
-    def search_tags_count(elasticsearch, size=500, term=604800):
+    def search_tags_count(elasticsearch, tags, size=500, term=604800):
         from_time = round(time.time()) - term
         body = {
           'size': 0,
           'query': {
             'bool': {
               'must': [
-                {'range': {'published_at': {'gte': from_time}}}
+                {'range': {'published_at': {'gte': from_time}}},
+                {'terms': {'tags.keyword': tags}}
               ]
             }
           },

src/handlers/search/tags_count/search_tags_count.py

@@ -30,7 +30,7 @@ def exec_main_proc(self):
         search_size = len(self.params['tags']) * settings.parameters['tags']['maxItems']
         search_days = self.params.get('search_days') if self.params.get('search_days') else 7
         from_time = 86400 * search_days
-        search_result = ESUtil.search_tags_count(self.elasticsearch, search_size, from_time)
+        search_result = ESUtil.search_tags_count(self.elasticsearch, self.params['tags'], search_size, from_time)
 
         # 集計結果より指定タグの件数を取得
         temp = []