3 files changed, 105 insertions, 0 deletions
diff --git a/web-server/opendc/api/v2/users/userId/__init__.py b/web-server/opendc/api/v2/users/userId/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/web-server/opendc/api/v2/users/userId/__init__.py
diff --git a/web-server/opendc/api/v2/users/userId/endpoint.py b/web-server/opendc/api/v2/users/userId/endpoint.py
new file mode 100644
index 00000000..e68a2bb3
--- /dev/null
+++ b/web-server/opendc/api/v2/users/userId/endpoint.py
@@ -0,0 +1,52 @@
+from opendc.models.user import User
+from opendc.util import exceptions
+from opendc.util.rest import Response
+
+
+def GET(request):
+    """Get this User."""
+
+    request.check_required_parameters(path={'userId': 'string'})
+
+    user = User.from_id(request.params_path['userId'])
+
+    user.check_exists()
+
+    return Response(200, f'Successfully retrieved user.', user.obj)
+
+
+def PUT(request):
+    """Update this User's given name and/or family name."""
+
+    request.check_required_parameters(body={'user': {
+        'givenName': 'string',
+        'familyName': 'string'
+    }},
+                                      path={'userId': 'string'})
+
+    user = User.from_id(request.params_path['userId'])
+
+    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'])
+
+    user.update()
+
+    return Response(200, f'Successfully updated user.', user.obj)
+
+
+def DELETE(request):
+    """Delete this User."""
+
+    request.check_required_parameters(path={'userId': 'string'})
+
+    user = User.from_id(request.params_path['userId'])
+
+    user.check_exists()
+    user.check_correct_user(request.google_id)
+
+    user.delete()
+
+    return Response(200, f'Successfully deleted user.', user.obj)
diff --git a/web-server/opendc/api/v2/users/userId/test_endpoint.py b/web-server/opendc/api/v2/users/userId/test_endpoint.py
new file mode 100644
index 00000000..0d590129
--- /dev/null
+++ b/web-server/opendc/api/v2/users/userId/test_endpoint.py
@@ -0,0 +1,53 @@
+from opendc.util.database import DB
+
+
+def test_get_user_non_existing(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value=None)
+    assert '404' in client.get('/api/v2/users/1').status
+
+
+def test_get_user(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value={'email': 'test@test.com'})
+    res = client.get('/api/v2/users/1')
+    assert 'email' in res.json['content']
+    assert '200' in res.status
+
+
+def test_update_user_missing_parameter(client):
+    assert '400' in client.put('/api/v2/users/1').status
+
+
+def test_update_user_non_existing(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value=None)
+    assert '404' in client.put('/api/v2/users/1', json={'user': {'givenName': 'A', 'familyName': 'B'}}).status
+
+
+def test_update_user_different_user(client, mocker):
+    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={'_id': '1', 'googleId': 'test'})
+    mocker.patch.object(DB, 'update', return_value={'givenName': 'A', 'familyName': 'B'})
+    res = client.put('/api/v2/users/1', json={'user': {'givenName': 'A', 'familyName': 'B'}})
+    assert 'givenName' in res.json['content']
+    assert '200' in res.status
+
+
+def test_delete_user_non_existing(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value=None)
+    assert '404' in client.delete('/api/v2/users/1').status
+
+
+def test_delete_user_different_user(client, mocker):
+    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={'_id': '1', 'googleId': 'test'})
+    mocker.patch.object(DB, 'delete_one', return_value={'googleId': 'test'})
+    res = client.delete('/api/v2/users/1')
+    assert 'googleId' in res.json['content']
+    assert '200' in res.status