From 92b94b59ad80329a2c99471edbf5bbdc9af1e525 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 26 Jun 2020 12:17:26 +0200 Subject: Revamp error responses --- opendc/api/v2/users/endpoint.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'opendc/api/v2/users/endpoint.py') diff --git a/opendc/api/v2/users/endpoint.py b/opendc/api/v2/users/endpoint.py index b1a3675d..4b0a883a 100644 --- a/opendc/api/v2/users/endpoint.py +++ b/opendc/api/v2/users/endpoint.py @@ -7,10 +7,7 @@ from opendc.util.rest import Response def GET(request): """Search for a User using their email address.""" - try: - request.check_required_parameters(query={'email': 'string'}) - except exceptions.ParameterError as e: - return Response(400, str(e)) + request.check_required_parameters(query={'email': 'string'}) user = User.from_email(request.params_query['email']) @@ -24,10 +21,7 @@ def GET(request): def POST(request): """Add a new User.""" - try: - request.check_required_parameters(body={'user': {'email': 'string'}}) - except exceptions.ParameterError as e: - return Response(400, str(e)) + request.check_required_parameters(body={'user': {'email': 'string'}}) user = User(request.params_body['user']) user.set_property('googleId', request.google_id) -- cgit v1.2.3 From 19bede4fc7f7320bb4eb16c3fe1a211b19ab4714 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 26 Jun 2020 12:27:51 +0200 Subject: Revamp error responses everywhere --- opendc/api/v2/users/endpoint.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'opendc/api/v2/users/endpoint.py') diff --git a/opendc/api/v2/users/endpoint.py b/opendc/api/v2/users/endpoint.py index 4b0a883a..c6041756 100644 --- a/opendc/api/v2/users/endpoint.py +++ b/opendc/api/v2/users/endpoint.py @@ -11,9 +11,7 @@ def GET(request): user = User.from_email(request.params_query['email']) - validation_error = user.validate() - if validation_error is not None: - return validation_error + user.check_exists() return Response(200, f'Successfully retrieved user.', user.obj) @@ -27,9 +25,7 @@ def POST(request): user.set_property('googleId', request.google_id) user.set_property('authorizations', []) - validation_error = user.validate_insertion() - if validation_error is not None: - return validation_error + user.check_already_exists() user.insert() return Response(200, f'Successfully created user.', user.obj) -- cgit v1.2.3