From cae7ee8ab4639963d3da7fef6f078a6078340a0b Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 25 Jun 2020 16:06:22 +0200 Subject: Improve abstraction --- opendc/api/v2/users/userId/endpoint.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'opendc/api/v2/users/userId/endpoint.py') diff --git a/opendc/api/v2/users/userId/endpoint.py b/opendc/api/v2/users/userId/endpoint.py index 9418f70a..3fb2ecc8 100644 --- a/opendc/api/v2/users/userId/endpoint.py +++ b/opendc/api/v2/users/userId/endpoint.py @@ -11,14 +11,14 @@ def GET(request): except exceptions.ParameterError as e: return Response(400, str(e)) - user = User(request.params_path['userId']) + user = User.from_id(request.params_path['userId']) validation_error = user.validate() - if validation_error is None: - return Response(200, f'Successfully retrieved {user}.', user.obj) - else: + if validation_error is not None: return validation_error + return Response(200, f'Successfully retrieved user.', user.obj) + def PUT(request): """Update this User's given name and/or family name.""" @@ -32,7 +32,7 @@ def PUT(request): except exceptions.ParameterError as e: return Response(400, str(e)) - user = User(request.params_path['userId']) + user = User.from_id(request.params_path['userId']) validation_error = user.validate(request.google_id) if validation_error is not None: @@ -43,7 +43,7 @@ def PUT(request): user.update() - return Response(200, f'Successfully updated {user}.', user.obj) + return Response(200, f'Successfully updated user.', user.obj) def DELETE(request): @@ -54,7 +54,7 @@ def DELETE(request): except exceptions.ParameterError as e: return Response(400, str(e)) - user = User(request.params_path['userId']) + user = User.from_id(request.params_path['userId']) validation_error = user.validate(request.google_id) if validation_error is not None: @@ -62,4 +62,4 @@ def DELETE(request): user.delete() - return Response(200, f'Successfully deleted {user}.', user.obj) + return Response(200, f'Successfully deleted user.', user.obj) -- cgit v1.2.3