2 files changed, 9 insertions, 1 deletions
diff --git a/web-server/opendc/api/v2/users/userId/endpoint.py b/web-server/opendc/api/v2/users/userId/endpoint.py
index eedb2e3c..7a4fb104 100644
--- a/web-server/opendc/api/v2/users/userId/endpoint.py
+++ b/web-server/opendc/api/v2/users/userId/endpoint.py
@@ -1,3 +1,4 @@
+from opendc.models.simulation import Simulation
 from opendc.models.user import User
 from opendc.util.rest import Response
 
@@ -46,6 +47,13 @@ def DELETE(request):
     user.check_exists()
     user.check_correct_user(request.google_id)
 
+    for authorization in user.obj['authorizations']:
+        if authorization['authorizationLevel'] != 'OWN':
+            continue
+
+        simulation = Simulation.from_id(authorization['simulationId'])
+        simulation.delete()
+
     old_object = user.delete()
 
     return Response(200, 'Successfully deleted user.', old_object)
diff --git a/web-server/opendc/api/v2/users/userId/test_endpoint.py b/web-server/opendc/api/v2/users/userId/test_endpoint.py
index 0d590129..cdff2229 100644
--- a/web-server/opendc/api/v2/users/userId/test_endpoint.py
+++ b/web-server/opendc/api/v2/users/userId/test_endpoint.py
@@ -46,7 +46,7 @@ def test_delete_user_different_user(client, mocker):
 
 
 def test_delete_user(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'test'})
+    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'test', 'authorizations': []})
     mocker.patch.object(DB, 'delete_one', return_value={'googleId': 'test'})
     res = client.delete('/api/v2/users/1')
     assert 'googleId' in res.json['content']