一旦前の実装に戻す

Author: ippei-fukamatsu

src/common/settings.py

@@ -88,23 +88,19 @@
     },
     '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',
-            'minLength': 1,
             'maxLength': 1000
         },
         'illegal_content': {
             'type': 'string',
-            'minLength': 1,
             'maxLength': 1000
         },
 

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

@@ -25,21 +25,6 @@ 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']
@@ -50,6 +35,7 @@ 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,
@@ -88,3 +74,16 @@ 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.get(item):
+                raise ValidationError("%s is required" % item)