[Codebase improvement] Reuse handlers base require_fields (#3577)

getredash · Mar 15, 2019 · a8cb709 · a8cb709
1 parent 852636f
commit a8cb709
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/redash/handlers/data_sources.py b/redash/handlers/data_sources.py
@@ -7,7 +7,7 @@
 from sqlalchemy.exc import IntegrityError
 
 from redash import models
-from redash.handlers.base import BaseResource, get_object_or_404
+from redash.handlers.base import BaseResource, get_object_or_404, require_fields
 from redash.permissions import (require_access, require_admin,
                                 require_permission, view_only)
 from redash.query_runner import (get_configuration_schema_for_query_runner_type,
@@ -107,10 +107,7 @@ def get(self):
     @require_admin
     def post(self):
         req = request.get_json(True)
-        required_fields = ('options', 'name', 'type')
-        for f in required_fields:
-            if f not in req:
-                abort(400)
+        require_fields(req, ('options', 'name', 'type'))
 
         schema = get_configuration_schema_for_query_runner_type(req['type'])
         if schema is None:

diff --git a/redash/handlers/destinations.py b/redash/handlers/destinations.py
@@ -4,7 +4,7 @@
 from redash import models
 from redash.destinations import (destinations,
                                  get_configuration_schema_for_destination_type)
-from redash.handlers.base import BaseResource
+from redash.handlers.base import BaseResource, require_fields
 from redash.permissions import require_admin
 from redash.utils.configuration import ConfigurationContainer, ValidationError
 
@@ -86,10 +86,7 @@ def get(self):
     @require_admin
     def post(self):
         req = request.get_json(True)
-        required_fields = ('options', 'name', 'type')
-        for f in required_fields:
-            if f not in req:
-                abort(400)
+        require_fields(req, ('options', 'name', 'type'))
 
         schema = get_configuration_schema_for_destination_type(req['type'])
         if schema is None: