桁数、入力チェックルールの変更

Author: ippei-fukamatsu

src/common/settings.py

@@ -88,20 +88,24 @@
     },
     'fraud_user': {
         'reason': {
-            'type': 'string',
+            'type': ['string'],
         },
         'plagiarism_url': {
             'type': 'string',
             'format': 'uri',
+            'pattern': r'^(https?|http?)://',
+            'minLength': 1,
             'maxLength': 2048
         },
         'plagiarism_description': {
             'type': 'string',
-            'maxLength': 65535
+            'minLength': 1,
+            'maxLength': 1000
         },
         'illegal_content': {
             'type': 'string',
-            'maxLength': 65535
+            'minLength': 1,
+            'maxLength': 1000
         },
 
     }

src/handlers/me/articles/fraud/create/me_articles_fraud_create.py

@@ -25,6 +25,21 @@ def get_schema(self):
                     'properties': {
                         'reason': {'enum': settings.FRAUD_REASONS}
                     }
+                },
+                {
+                    'properties': {
+                        'reason': {'enum': settings.FRAUD_NEED_ORIGINAL_REASONS}
+                    },
+                    'anyOf': [
+                        {'required': ['plagiarism_url']},
+                        {'required': ['plagiarism_description']}
+                    ]
+                },
+                {
+                    'properties': {
+                        'reason': {'enum': settings.FRAUD_NEED_DETAIL_REASONS}
+                    },
+                    'required': ['illegal_content']
                 }
             ],
             'required': ['article_id']
@@ -35,7 +50,6 @@ def validate_params(self):
         if self.event.get('pathParameters') is None:
             raise ValidationError('pathParameters is required')
         validate(self.params, self.get_schema())
-        self.__validate_reason_dependencies(self.params)
         # relation
         DBUtil.validate_article_existence(
             self.dynamodb,
@@ -74,16 +88,3 @@ def __create_article_fraud_user(self, article_fraud_user_table):
             Item=article_fraud_user,
             ConditionExpression='attribute_not_exists(article_id)'
         )
-
-    def __validate_reason_dependencies(self, params):
-        reason = params.get('reason', '')
-        if reason in settings.FRAUD_NEED_ORIGINAL_REASONS:
-            self.__validate_dependencies(params, ['plagiarism_url', 'plagiarism_description'])
-
-        if reason in settings.FRAUD_NEED_DETAIL_REASONS:
-            self.__validate_dependencies(params, ['illegal_content'])
-
-    def __validate_dependencies(self, params, required_items):
-        for item in required_items:
-            if not params[item]:
-                raise ValidationError("%s is required" % item)

tests/handlers/me/articles/fraud/create/test_me_articles_fraud_create.py

@@ -105,10 +105,10 @@ def test_main_ok_exist_article_id(self):
         target_article_id = params['pathParameters']['article_id']
         target_user_id = params['requestContext']['authorizer']['claims']['cognito:username']
         body = json.loads(params['body'])
-        target_reason = body['reason']
-        target_plagiarism_url = body['plagiarism_url']
-        target_plagiarism_description = body['plagiarism_description']
-        target_illegal_content = body['illegal_content']
+        target_reason = body.get('reason')
+        target_plagiarism_url = body.get('plagiarism_url')
+        target_plagiarism_description = body.get('plagiarism_description')
+        target_illegal_content = body.get('illegal_content')
 
         article_fraud_user = self.get_article_fraud_user(target_article_id, target_user_id)
 
@@ -202,65 +202,83 @@ def test_validation_article_id_min(self):
         self.assert_bad_request(params)
 
     def test_validation_invalid_reason(self):
-        params = {
+        body = {
             'body': json.dumps({'reason': 'abcde'})
         }
+        params = dict(self.get_parameters_other_than_body(), **body)
         self.assert_bad_request(params)
 
-    def test_validation_required_plagiarism_url_when_reason_is_plagiarism(self):
-        params = {
+    def test_validation_required_plagiarism_detail_when_reason_is_plagiarism(self):
+        body = {
             'body': json.dumps(
                 {
                     'reason': 'plagiarism',
                     'plagiarism_url': '',
+                    'plagiarism_description': ''
                 }
             )
         }
+        params = dict(self.get_parameters_other_than_body(), **body)
         self.assert_bad_request(params)
 
-    def test_validation_required_plagiarism_description_when_reason_is_plagiarism(self):
-        params = {
+    def test_validation_invalid_plagiarism_url_when_reason_is_plagiarism(self):
+        body = {
             'body': json.dumps(
                 {
                     'reason': 'plagiarism',
-                    'plagiarism_url': 'http://test.com',
-                    'plagiarism_description': '',
+                    'plagiarism_url': 'aaa'
                 }
             )
         }
+        params = dict(self.get_parameters_other_than_body(), **body)
         self.assert_bad_request(params)
 
-    def test_validation_invalid_plagiarism_url_when_reason_is_plagiarism(self):
-        params = {
+    def test_validation_required_illegal_content_when_reason_is_illegal(self):
+        body = {
             'body': json.dumps(
                 {
-                    'reason': 'plagiarism',
-                    'plagiarism_url': 'aaa'
+                    'reason': 'illegal',
+                    'illegal_content': ''
                 }
             )
         }
+        params = dict(self.get_parameters_other_than_body(), **body)
         self.assert_bad_request(params)
 
-    def test_validation_required_illegal_content_when_reason_is_illegal(self):
-        params = {
+    def test_validation_required_illegal_content_when_reason_is_other(self):
+        body = {
             'body': json.dumps(
                 {
-                    'reason': 'illegal',
-                    'illegal_content': '',
+                    'reason': 'other',
+                    'illegal_content': ''
                 }
             )
         }
+        params = dict(self.get_parameters_other_than_body(), **body)
         self.assert_bad_request(params)
 
-    def test_validation_required_illegal_content_when_reason_is_other(self):
-        params = {
+    def test_validation_plagiarism_description_max(self):
+        body = {
             'body': json.dumps(
                 {
-                    'reason': 'other',
-                    'illegal_content': '',
+                    'reason': 'plagiarism',
+                    'plagiarism_description': u'あ' * 1001
                 }
             )
         }
+        params = dict(self.get_parameters_other_than_body(), **body)
+        self.assert_bad_request(params)
+
+    def test_validation_illegal_content_max(self):
+        body = {
+            'body': json.dumps(
+                {
+                    'reason': 'illegal',
+                    'illegal_content': u'あ' * 1001
+                }
+            )
+        }
+        params = dict(self.get_parameters_other_than_body(), **body)
         self.assert_bad_request(params)
 
     def get_article_fraud_user(self, article_id, user_id):
@@ -269,3 +287,18 @@ def get_article_fraud_user(self, article_id, user_id):
         }
         article_fraud_user_table = self.dynamodb.Table(os.environ['ARTICLE_FRAUD_USER_TABLE_NAME'])
         return article_fraud_user_table.query(**query_params)['Items'][0]
+
+    def get_parameters_other_than_body(self):
+        basic_params = {
+            'pathParameters': {
+                'article_id': self.article_fraud_user_table_items[1]['article_id']
+            },
+            'requestContext': {
+                'authorizer': {
+                    'claims': {
+                        'cognito:username': 'test03'
+                    }
+                }
+            }
+        }
+        return basic_params