2 files changed, 7 insertions, 14 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(
diff --git a/opendc/api/v1/simulations/simulationId/experiments/experimentId/last-simulated-tick/endpoint.py b/opendc/api/v1/simulations/simulationId/experiments/experimentId/last-simulated-tick/endpoint.py
index ed33be85..d39fafe4 100644
--- a/opendc/api/v1/simulations/simulationId/experiments/experimentId/last-simulated-tick/endpoint.py
+++ b/opendc/api/v1/simulations/simulationId/experiments/experimentId/last-simulated-tick/endpoint.py
@@ -30,14 +30,10 @@ def GET(request):
     # Make sure this user is authorized to view this Experiment's last simulated tick
 
     if not experiment.google_id_has_at_least(request.google_id, 'VIEW'):
-        return Response(403, 'Forbidden from viewing Room States for {}.'.format(experiment))
-
-    # Get and return the last simulated tick
-
-    last_simulated_tick = experiment.get_last_simulated_tick()
+        return Response(403, 'Forbidden from viewing last simulated tick for {}.'.format(experiment))
 
     return Response(
         200,
-        'Successfully retrieved Room States for {}.'.format(experiment),
-        {'lastSimulatedTick': last_simulated_tick}
+        'Successfully retrieved last simulated tick for {}.'.format(experiment),
+        {'lastSimulatedTick': experiment.last_simulated_tick}
     )