Revamp error responses everywhere

2 files changed, 7 insertions, 15 deletions

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)
diff --git a/opendc/api/v2/users/userId/endpoint.py b/opendc/api/v2/users/userId/endpoint.py
index 578080b7..e68a2bb3 100644
--- a/opendc/api/v2/users/userId/endpoint.py
+++ b/opendc/api/v2/users/userId/endpoint.py
@@ -10,9 +10,7 @@ def GET(request):
 
     user = User.from_id(request.params_path['userId'])
 
-    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)
 
@@ -28,9 +26,8 @@ def PUT(request):
 
     user = User.from_id(request.params_path['userId'])
 
-    validation_error = user.validate(request.google_id)
-    if validation_error is not None:
-        return validation_error
+    user.check_exists()
+    user.check_correct_user(request.google_id)
 
     user.set_property('givenName', request.params_body['user']['givenName'])
     user.set_property('familyName', request.params_body['user']['familyName'])
@@ -47,9 +44,8 @@ def DELETE(request):
 
     user = User.from_id(request.params_path['userId'])
 
-    validation_error = user.validate(request.google_id)
-    if validation_error is not None:
-        return validation_error
+    user.check_exists()
+    user.check_correct_user(request.google_id)
 
     user.delete()