リファクタリングついでにテストFIX

Author: ippei-fukamatsu

src/common/settings.py

@@ -85,6 +85,25 @@
             'minLength': 12,
             'maxLength': 12
         }
+    },
+    'fraud_user': {
+        'reason': {
+            'type': 'string',
+        },
+        'plagiarism_url': {
+            'type': 'string',
+            'format': 'uri',
+            'maxLength': 2048
+        },
+        'plagiarism_description': {
+            'type': 'string',
+            'maxLength': 65535
+        },
+        'illegal_content': {
+            'type': 'string',
+            'maxLength': 65535
+        },
+
     }
 }
 

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

@@ -15,20 +15,21 @@ def get_schema(self):
             'type': 'object',
             'properties': {
                 'article_id': settings.parameters['article_id'],
-                'reason': {
-                    'type': 'string',
-                    'enum': settings.FRAUD_REASONS
-                },
-                'plagiarism_url': {
-                    'type': 'string',
-                },
-                'plagiarism_description': {
-                    'type': 'string'
-                },
-                'illegal_content': {
-                    'type': 'string'
-                },
+                'reason': settings.parameters['fraud_user']['reason'],
+                'plagiarism_url': settings.parameters['fraud_user']['plagiarism_url'],
+                'plagiarism_description': settings.parameters['fraud_user']['plagiarism_description'],
+                'illegal_content': settings.parameters['fraud_user']['illegal_content']
             },
+            'anyOf': [
+                {
+                    'properties': {
+                        'reason': {
+                            'enum': settings.FRAUD_REASONS
+                        },
+                    }
+
+                }
+            ],
             'required': ['article_id']
         }
 

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

@@ -84,6 +84,12 @@ def test_main_ok_exist_article_id(self):
             'pathParameters': {
                 'article_id': self.article_fraud_user_table_items[0]['article_id']
             },
+            'body': json.dumps({
+                'reason': 'plagiarism',
+                'plagiarism_url': 'http://test.com',
+                'plagiarism_description': 'plagiarism description',
+                'illegal_content': 'illegal content'
+            }),
             'requestContext': {
                 'authorizer': {
                     'claims': {
@@ -103,12 +109,21 @@ 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']
 
         article_fraud_user = self.get_article_fraud_user(target_article_id, target_user_id)
 
         expected_items = {
             'article_id': target_article_id,
             'user_id': target_user_id,
+            'reason': target_reason,
+            'plagiarism_url': target_plagiarism_url,
+            'plagiarism_description': target_plagiarism_description,
+            'illegal_content': target_illegal_content,
             'created_at': 1520150272000003
         }
 
@@ -185,38 +200,63 @@ def test_validation_article_id_min(self):
 
     def test_validation_invalid_reason(self):
         params = {
-            'pathParameters': {
-                'article_id': self.article_fraud_user_table_items[1]['article_id']
-            },
-            'body': json.dumps({'reason': 'abcde'}),
-            'requestContext': {
-                'authorizer': {
-                    'claims': {
-                        'cognito:username': 'test03'
-                    }
-                }
-            }
+            'body': json.dumps({'reason': 'abcde'})
         }
         self.assert_bad_request(params)
 
     def test_validation_required_plagiarism_url_when_reason_is_plagiarism(self):
         params = {
-            'pathParameters': {
-                'article_id': self.article_fraud_user_table_items[2]['article_id']
-            },
             'body': json.dumps(
                 {
                     'reason': 'plagiarism',
                     'plagiarism_url': '',
                 }
-            ),
-            'requestContext': {
-                'authorizer': {
-                    'claims': {
-                        'cognito:username': 'test03'
-                    }
+            )
+        }
+        self.assert_bad_request(params)
+
+    def test_validation_required_plagiarism_description_when_reason_is_plagiarism(self):
+        params = {
+            'body': json.dumps(
+                {
+                    'reason': 'plagiarism',
+                    'plagiarism_url': 'http://test.com',
+                    'plagiarism_description': '',
                 }
-            }
+            )
+        }
+        self.assert_bad_request(params)
+
+    def test_validation_invalid_plagiarism_url_when_reason_is_plagiarism(self):
+        params = {
+            'body': json.dumps(
+                {
+                    'reason': 'plagiarism',
+                    'plagiarism_url': 'aaa'
+                }
+            )
+        }
+        self.assert_bad_request(params)
+
+    def test_validation_required_illegal_content_when_reason_is_illegal(self):
+        params = {
+            'body': json.dumps(
+                {
+                    'reason': 'illegal',
+                    'illegal_content': '',
+                }
+            )
+        }
+        self.assert_bad_request(params)
+
+    def test_validation_required_illegal_content_when_reason_is_other(self):
+        params = {
+            'body': json.dumps(
+                {
+                    'reason': 'other',
+                    'illegal_content': '',
+                }
+            )
         }
         self.assert_bad_request(params)