POP-2419 drying validation & passing kwargs to _api_get

Author: wogsland

dynatademand/api.py

@@ -146,48 +146,38 @@ def get_attributes(self, country_code, language_code, **kwargs):
                 'languageCode': '{}'.format(language_code)
             },
             query_params=kwargs,
-            request_body={},
         )
-        return self._api_get('/attributes/{}/{}'.format(country_code, language_code))
+        return self._api_get('/attributes/{}/{}'.format(country_code, language_code), kwargs)
 
     def get_countries(self, **kwargs):
         self.validator.validate_request(
             'get_countries',
-            path_data={},
             query_params=kwargs,
-            request_body={},
         )
-        return self._api_get('/countries')
+        return self._api_get('/countries', kwargs)
 
     def get_event(self, event_id):
         self.validator.validate_request(
             'get_event',
             path_data={'eventId': '{}'.format(event_id)},
-            query_params={},
-            request_body={},
         )
         return self._api_get('/events/{}'.format(event_id))
 
     def get_events(self, **kwargs):
         self.validator.validate_request(
             'get_events',
-            path_data={},
             query_params=kwargs,
-            request_body={},
         )
-        return self._api_get('/events')
+        return self._api_get('/events', kwargs)
 
     def create_project(self, project_data):
         '''
             #TODO: Waiting on a valid request body schema.
             self.validator.validate_request(
                 'create_project',
-                path_data={},
-                query_params={},
                 request_body=project_data,
             )
         '''
-
         response_data = self._api_post('/projects', project_data)
         if response_data.get('status').get('message') != 'success':
             raise DemandAPIError(
@@ -201,27 +191,22 @@ def get_project(self, project_id):
         self.validator.validate_request(
             'get_project',
             path_data={'extProjectId': '{}'.format(project_id)},
-            query_params={},
-            request_body={},
         )
         return self._api_get('/projects/{}'.format(project_id))
 
     def get_projects(self, **kwargs):
         self.validator.validate_request(
             'get_projects',
-            path_data={},
             query_params=kwargs,
-            request_body={},
         )
-        return self._api_get('/projects')
+        return self._api_get('/projects', kwargs)
 
     def update_project(self, project_id, update_data):
         '''
             #TODO: Waiting on a valid request body schema and path schema.
             self.validator.validate_request(
                 'update_project',
                 path_data={'extProjectId': '{}'.format(project_id)},
-                query_params={},
                 request_body=update_data,
             )
         '''
@@ -238,8 +223,6 @@ def get_project_detailed_report(self, project_id):
         self.validator.validate_request(
             'get_project_detailed_report',
             path_data={'extProjectId': '{}'.format(project_id)},
-            query_params={},
-            request_body={},
         )
         return self._api_get('/projects/{}/detailedReport'.format(project_id))
 
@@ -250,8 +233,6 @@ def get_line_item(self, project_id, line_item_id):
                 'extProjectId': '{}'.format(project_id),
                 'extLineItemId': '{}'.format(line_item_id)
             },
-            query_params={},
-            request_body={},
         )
         return self._api_get('/projects/{}/lineItems/{}'.format(project_id, line_item_id))
 
@@ -268,7 +249,6 @@ def update_line_item(self, project_id, line_item_id, line_item_data):
                     'extProjectId': '{}'.format(project_id),
                     'extLineItemId': '{}'.format(line_item_id),
                 },
-                query_params={},
                 request_body=line_item_data,
             )
         '''
@@ -286,9 +266,8 @@ def get_line_items(self, project_id, **kwargs):
             'get_line_items',
             path_data={'extProjectId': '{}'.format(project_id)},
             query_params=kwargs,
-            request_body={},
         )
-        return self._api_get('/projects/{}/lineItems'.format(project_id))
+        return self._api_get('/projects/{}/lineItems'.format(project_id), kwargs)
 
     def get_line_item_detailed_report(self, project_id, line_item_id):
         self.validator.validate_request(
@@ -297,34 +276,25 @@ def get_line_item_detailed_report(self, project_id, line_item_id):
                 'extProjectId': '{}'.format(project_id),
                 'extLineItemId': '{}'.format(line_item_id),
             },
-            query_params={},
-            request_body={},
         )
         return self._api_get('/projects/{}/lineItems/{}/detailedReport'.format(project_id, line_item_id))
 
     def get_feasibility(self, project_id):
         self.validator.validate_request(
             'get_feasibility',
             path_data={'extProjectId': '{}'.format(project_id)},
-            query_params={},
-            request_body={},
         )
         return self._api_get('/projects/{}/feasibility'.format(project_id))
 
     def get_survey_topics(self, **kwargs):
         self.validator.validate_request(
             'get_survey_topics',
-            path_data={},
             query_params=kwargs,
-            request_body={},
         )
-        return self._api_get('/categories/surveyTopics')
+        return self._api_get('/categories/surveyTopics', kwargs)
 
     def get_sources(self):
         self.validator.validate_request(
             'get_sources',
-            path_data={},
-            query_params={},
-            request_body={},
         )
         return self._api_get('/sources')

dynatademand/validator.py

@@ -56,22 +56,13 @@ def __init__(self, ):
     def _validate_object(self, schema_type, endpoint_name, data):
         jsonschema.validate(schema=self.schemas[schema_type][endpoint_name], instance=data)
 
-    def validate_path(self, endpoint_name, data):
-        self._validate_object('path', endpoint_name, data)
-
-    def validate_query(self, endpoint_name, data):
-        self._validate_object('query', endpoint_name, data)
-
-    def validate_body(self, endpoint_name, data):
-        self._validate_object('body', endpoint_name, data)
-
-    def validate_request(self, endpoint_name, path_data=None, query_params=None, request_body=None):
+    def validate_request(self, endpoint_name, path_data={}, query_params={}, request_body={}):
         '''
             # TODO: None of the path schemas from the documentation are currently valid.
             if 'path' in ENDPOINTS[endpoint_name]:
-                self.validate_path(endpoint_name, path_data)
+                self._validate_object('path', endpoint_name, path_data)
         '''
         if 'query' in ENDPOINTS[endpoint_name]:
-            self.validate_query(endpoint_name, query_params)
+            self._validate_object('query', endpoint_name, query_params)
         if 'body' in ENDPOINTS[endpoint_name]:
-            self.validate_body(endpoint_name, request_body)
+            self._validate_object('body', endpoint_name, request_body)