Add a search_day param for tags_count.

Author: keillera

src/common/settings.py

@@ -283,7 +283,12 @@
     },
     'pin_code': {
         'type': 'string'
-    }
+    },
+    'tags_count_search_days': {
+        'type': 'integer',
+        'minimum': 1,
+        'maximum': 10000
+    },
 }
 
 # ログに出力されてはいけないパラメータ(ログ出力時に値がマスクされる)

src/handlers/search/tags_count/search_tags_count.py

@@ -6,26 +6,30 @@
 from decimal_encoder import DecimalEncoder
 from es_util import ESUtil
 from lambda_base import LambdaBase
+from parameter_util import ParameterUtil
 
 
 class SearchTagsCount(LambdaBase):
     def get_schema(self):
         return {
             'type': 'object',
             'properties': {
-                'tags': settings.parameters['tags_count']
+                'tags': settings.parameters['tags_count'],
+                'search_days': settings.parameters['tags_count_search_days']
             },
             'required': ['tags']
         }
 
     def validate_params(self):
+        ParameterUtil.cast_parameter_to_int(self.params, self.get_schema())
         self.params['tags'] = self.event['multiValueQueryStringParameters'].get('tags')
         validate(self.params, self.get_schema())
 
     def exec_main_proc(self):
         # 直近１週間分のタグを集計
         search_size = len(self.params['tags']) * settings.parameters['tags']['maxItems']
-        from_time = 86400 * 7
+        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)
 
         # 集計結果より指定タグの件数を取得

swagger/swagger.yaml

@@ -516,6 +516,11 @@ paths:
         type: array
         items:
           type: string
+      - name: "search_days"
+        in: "query"
+        description: "検索対象の日数"
+        required: false
+        type: "integer"
       responses:
         "200":
           description: "タグ件数一覧"

tests/handlers/search/tags_count/test_search_tags_count.py

@@ -88,6 +88,27 @@ def test_search_request(self):
         self.assertEqual(response['statusCode'], 200)
         self.assertEqual(expected, actual)
 
+    @patch('time.time', MagicMock(return_value=1530112710 + 86400 * 7))
+    def test_search_request_exists_search_days(self):
+        params = {
+                'multiValueQueryStringParameters': {
+                    'tags': ['A', 'B', 'C', 'D']
+                },
+                'queryStringParameters': {
+                    'search_days': '8',
+                }
+        }
+        response = SearchTagsCount(params, {}, elasticsearch=self.elasticsearch).main()
+        actual = json.loads(response['body'])
+        expected = [
+             {'count': 4, 'tag': 'A'},
+             {'count': 3, 'tag': 'B'},
+             {'count': 2, 'tag': 'C'},
+             {'count': 0, 'tag': 'D'}
+        ]
+        self.assertEqual(response['statusCode'], 200)
+        self.assertEqual(expected, actual)
+
     def test_search_request_not_exists(self):
         params = {
                 'multiValueQueryStringParameters': {
@@ -160,3 +181,26 @@ def test_invalid_tag_parmas(self):
         }
         response = SearchTagsCount(params, {}, elasticsearch=self.elasticsearch).main()
         self.assertEqual(response['statusCode'], 400)
+
+    def test_invalid_search_days_parmas(self):
+        params = {
+            'multiValueQueryStringParameters': {
+                'tags': ['aaa']
+            },
+            'queryStringParameters': {
+                'search_days': '0',
+            }
+        }
+        response = SearchTagsCount(params, {}, elasticsearch=self.elasticsearch).main()
+        self.assertEqual(response['statusCode'], 400)
+
+        params = {
+            'multiValueQueryStringParameters': {
+                'tags': ['aaa']
+            },
+            'queryStringParameters': {
+                'search_days': '10001',
+            }
+        }
+        response = SearchTagsCount(params, {}, elasticsearch=self.elasticsearch).main()
+        self.assertEqual(response['statusCode'], 400)