Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration

1 files changed, 9 insertions, 12 deletions

diff --git a/web-server/opendc/api/v2/experiments/experimentId/endpoint.py b/web-server/opendc/api/v2/experiments/experimentId/endpoint.py
index 1611f889..6706dc57 100644
--- a/web-server/opendc/api/v2/experiments/experimentId/endpoint.py
+++ b/web-server/opendc/api/v2/experiments/experimentId/endpoint.py
@@ -1,5 +1,5 @@
 from opendc.models.experiment import Experiment
-from opendc.models.simulation import Simulation
+from opendc.models.project import Project
 from opendc.util.rest import Response
 
 
@@ -19,12 +19,9 @@ def GET(request):
 def PUT(request):
     """Update this Experiments name."""
 
-    request.check_required_parameters(path={'experimentId': 'string'},
-                                      body={
-                                          'experiment': {
-                                              'name': 'string',
-                                          }
-                                      })
+    request.check_required_parameters(path={'experimentId': 'string'}, body={'experiment': {
+        'name': 'string',
+    }})
 
     experiment = Experiment.from_id(request.params_path['experimentId'])
 
@@ -48,11 +45,11 @@ def DELETE(request):
     experiment.check_exists()
     experiment.check_user_access(request.google_id, True)
 
-    simulation = Simulation.from_id(experiment.obj['simulationId'])
-    simulation.check_exists()
-    if request.params_path['experimentId'] in simulation.obj['experimentIds']:
-        simulation.obj['experimentIds'].remove(request.params_path['experimentId'])
-    simulation.update()
+    project = Project.from_id(experiment.obj['projectId'])
+    project.check_exists()
+    if request.params_path['experimentId'] in project.obj['experimentIds']:
+        project.obj['experimentIds'].remove(request.params_path['experimentId'])
+    project.update()
 
     old_object = experiment.delete()