1 files changed, 4 insertions, 7 deletions
diff --git a/opendc/api/v1/simulations/simulationId/experiments/endpoint.py b/opendc/api/v1/simulations/simulationId/experiments/endpoint.py
index 8cc4165f..034e82a1 100644
--- a/opendc/api/v1/simulations/simulationId/experiments/endpoint.py
+++ b/opendc/api/v1/simulations/simulationId/experiments/endpoint.py
@@ -89,6 +89,8 @@ def POST(request):
     # Instantiate an Experiment
 
     experiment = Experiment.from_JSON(request.params_body['experiment'])
+    experiment.state = 'QUEUED'
+    experiment.last_simulated_tick = 0
 
     # Try to insert this Experiment
 
@@ -96,15 +98,10 @@ def POST(request):
         experiment.insert()
     
     except exceptions.ForeignKeyError as e:
-        return Response(400, 'Foreign key constraint not met.')
-
-    # Queue this Experiment for simulation
-
-    queued_experiment = QueuedExperiment(experiment_id = experiment.id)
-    queued_experiment.insert()
+        return Response(400, 'Foreign key constraint not met.' + e.message)
 
     # Return this Experiment
-
+    
     experiment.read()
 
     return Response(