diff options
Diffstat (limited to 'opendc/api/v2/users/userId')
| -rw-r--r-- | opendc/api/v2/users/userId/endpoint.py | 16 | ||||
| -rw-r--r-- | opendc/api/v2/users/userId/test_endpoint.py | 8 |
2 files changed, 12 insertions, 12 deletions
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) diff --git a/opendc/api/v2/users/userId/test_endpoint.py b/opendc/api/v2/users/userId/test_endpoint.py index 30edfdaa..01642fc3 100644 --- a/opendc/api/v2/users/userId/test_endpoint.py +++ b/opendc/api/v2/users/userId/test_endpoint.py @@ -23,12 +23,12 @@ def test_update_user_non_existing(client, mocker): def test_update_user_different_user(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value={'googleId': 'other_test'}) + mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'other_test'}) assert '403' in client.put('/api/v2/users/1', json={'user': {'givenName': 'A', 'familyName': 'B'}}).status def test_update_user(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value={'googleId': 'test'}) + mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'test'}) mocker.patch.object(DB, 'update', return_value=None) res = client.put('/api/v2/users/1', json={'user': {'givenName': 'A', 'familyName': 'B'}}) assert 'givenName' in res.json['content'] @@ -41,12 +41,12 @@ def test_delete_user_non_existing(client, mocker): def test_delete_user_different_user(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value={'googleId': 'other_test'}) + mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'other_test'}) assert '403' in client.delete('/api/v2/users/1').status def test_delete_user(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value={'googleId': 'test'}) + mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'test'}) mocker.patch.object(DB, 'delete_one', return_value=None) res = client.delete('/api/v2/users/1') assert 'googleId' in res.json['content'] |