Fix #13162: Add schema and introduce new approach for saving multiple images in suggestion handler.

core/controllers/domain_objects_validator.py

@@ -21,18 +21,36 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from core import feconf
 from core import python_utils
 from core.constants import constants
 from core.controllers import base
 from core.domain import blog_domain
 from core.domain import collection_domain
 from core.domain import config_domain
 from core.domain import exp_domain
+from core.domain import question_domain
 from core.domain import state_domain
 
 from typing import Dict, Optional, Union
 
 
+def validate_change(obj):
+    """Validates Exploration and Question domain change.
+
+    Args:
+        obj: dict. Data that needs to be validated.
+    """
+    if obj['cmd'] in feconf.LIST_CMD_EXPLORATION_CHANGE:
+        exp_domain.ExplorationChange(obj)
+    elif obj['cmd'] in feconf.LIST_CMD_QUESTION_CHANGE:
+        question_domain.QuestionSuggestionChange(obj)
+    else:
+        raise base.BaseHandler.InvalidInputException(
+            '%s cmd is not allowed.' % obj['cmd']
+        )
+
+
 def validate_exploration_change(obj):
     """Validates exploration change.
 

core/controllers/payload_validator.py

@@ -197,7 +197,6 @@ def convert_string_to_bool(param: str) -> Optional[Union[bool, str]]:
     'SubtopicPageDataHandler',
     'SubtopicViewerPage',
     'SuggestionEmailHandler',
-    'SuggestionHandler',
     'SuggestionListHandler',
     'SuggestionToExplorationActionHandler',
     'SuggestionToSkillActionHandler',

core/controllers/suggestion.py

@@ -27,6 +27,7 @@
 from core.constants import constants
 from core.controllers import acl_decorators
 from core.controllers import base
+from core.controllers import domain_objects_validator
 from core.domain import exp_fetchers
 from core.domain import fs_services
 from core.domain import html_cleaner
@@ -40,21 +41,68 @@
 class SuggestionHandler(base.BaseHandler):
     """"Handles operations relating to suggestions."""
 
+    URL_PATH_ARGS_SCHEMAS = {}
+    HANDLER_ARGS_SCHEMAS = {
+        'POST': {
+            'suggestion_type': {
+                'schema': {
+                    'type': 'basestring',
+                    'choices': feconf.SUGGESTION_TYPE_CHOICES
+                }
+            },
+            'target_type': {
+                'schema': {
+                    'type': 'basestring',
+                    'choices': feconf.SUGGESTION_TARGET_TYPE_CHOICES
+                }
+            },
+            'target_id': {
+                'schema': {
+                    'type': 'basestring'
+                }
+            },
+            'target_version_at_submission':
+            {
+                'schema': {
+                    'type': 'int',
+                    'validators': [{
+                        'id': 'is_at_least',
+                        'min_value': 1
+                    }]
+                }
+            },
+            'change': {
+               'schema': {
+                   'type': 'object_dict',
+                    'validation_method': (
+                        domain_objects_validator.validate_change
+                    )
+               }
+            },
+            'description': {
+                'schema': {
+                    'type': 'basestring'
+                }
+            }
+        }
+    }
+
     @acl_decorators.can_suggest_changes
     def post(self):
         """Handles POST requests."""
-        if (self.payload.get('suggestion_type') ==
+        if (self.normalized_payload.get('suggestion_type') ==
                 feconf.SUGGESTION_TYPE_EDIT_STATE_CONTENT):
             raise self.InvalidInputException(
                 'Content suggestion submissions are no longer supported.')
 
         try:
             suggestion = suggestion_services.create_suggestion(
-                self.payload.get('suggestion_type'),
-                self.payload.get('target_type'), self.payload.get('target_id'),
-                self.payload.get('target_version_at_submission'),
-                self.user_id, self.payload.get('change'),
-                self.payload.get('description'))
+                self.normalized_payload.get('suggestion_type'),
+                self.normalized_payload.get('target_type'),
+                self.normalized_payload.get('target_id'),
+                self.normalized_payload.get('target_version_at_submission'),
+                self.user_id, self.normalized_payload.get('change'),
+                self.normalized_payload.get('description'))
         except utils.ValidationError as e:
             raise self.InvalidInputException(e)
 

core/feconf.py

@@ -1479,6 +1479,22 @@ def get_empty_ratings() -> Dict[str, int]:
     SUGGESTION_TYPE_ADD_QUESTION
 ]
 
+# Constants defining various domain commands.
+CMD_ADD_WRITTEN_TRANSLATION = 'add_written_translation'
+CMD_EDIT_STATE_PROPERTY = 'edit_state_property'
+CMD_CREATE_NEW_FULLY_SPECIFIED_QUESTION = 'create_new_fully_specified_question'
+
+# Possible allowed commands for exploration change.
+LIST_CMD_EXPLORATION_CHANGE = [
+    CMD_ADD_WRITTEN_TRANSLATION,
+    CMD_EDIT_STATE_PROPERTY
+]
+
+# Possible allowed commands for question change.
+LIST_CMD_QUESTION_CHANGE = [
+    CMD_CREATE_NEW_FULLY_SPECIFIED_QUESTION
+]
+
 # Prefix for all access validation handlers.
 # The naming scheme for access validation handlers is
 # '/access_validation_handler/<handler_name>'