From 1c58ae3b25120ac670b897665bac7d8f18156220 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 30 Jun 2020 14:01:17 +0200 Subject: Fix more violations and ensure experimentIds handling --- web-server/opendc/api/v2/experiments/experimentId/endpoint.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'web-server/opendc/api/v2/experiments/experimentId/endpoint.py') diff --git a/web-server/opendc/api/v2/experiments/experimentId/endpoint.py b/web-server/opendc/api/v2/experiments/experimentId/endpoint.py index 7dacdf48..103c24ac 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.util import exceptions +from opendc.models.simulation import Simulation from opendc.util.rest import Response @@ -13,7 +13,7 @@ def GET(request): experiment.check_exists() experiment.check_user_access(request.google_id, False) - return Response(200, f'Successfully retrieved Experiment.', experiment.obj) + return Response(200, 'Successfully retrieved Experiment.', experiment.obj) def PUT(request): @@ -54,6 +54,12 @@ 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() + experiment.delete() return Response(200, 'Successfully deleted experiment.', experiment.obj) -- cgit v1.2.3