Merge changes with upstream

2 files changed, 0 insertions, 42 deletions

diff --git a/web-server/opendc/api/v2/experiments/experimentId/room-states/__init__.py b/web-server/opendc/api/v2/experiments/experimentId/room-states/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/experiments/experimentId/room-states/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/experiments/experimentId/room-states/endpoint.py b/web-server/opendc/api/v2/experiments/experimentId/room-states/endpoint.py
deleted file mode 100644
index db3f8b14..00000000
--- a/web-server/opendc/api/v2/experiments/experimentId/room-states/endpoint.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from opendc.models_old.experiment import Experiment
-from opendc.models_old.room_state import RoomState
-from opendc.util import exceptions
-from opendc.util.rest import Response
-
-
-def GET(request):
-    """Get this Experiment's Room States."""
-
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'experimentId': 'int'})
-
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Instantiate an Experiment from the database
-
-    experiment = Experiment.from_primary_key((request.params_path['experimentId'], ))
-
-    # Make sure this Experiment exists
-
-    if not experiment.exists():
-        return Response(404, '{} not found.'.format(experiment))
-
-    # Make sure this user is authorized to view this Experiment's Room States
-
-    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 Room States
-
-    if 'tick' in request.params_query:
-        room_states = RoomState.from_experiment_id_and_tick(request.params_path['experimentId'],
-                                                            request.params_query['tick'])
-
-    else:
-        room_states = RoomState.from_experiment_id(request.params_path['experimentId'])
-
-    return Response(200, 'Successfully retrieved Room States for {}.'.format(experiment),
-                    [x.to_JSON() for x in room_states])