Merged refactoring changes with upstream

1 files changed, 3 insertions, 20 deletions

diff --git a/opendc/api/v2/topologies/topologyId/endpoint.py b/opendc/api/v2/topologies/topologyId/endpoint.py
index ef541daa..3470ad94 100644
--- a/opendc/api/v2/topologies/topologyId/endpoint.py
+++ b/opendc/api/v2/topologies/topologyId/endpoint.py
@@ -6,29 +6,12 @@ from opendc.util.rest import Response
 def GET(request):
     """Get this Topology."""
 
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'topologyId': 'int'})
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Instantiate a Topology from the database
+    request.check_required_parameters(path={'topologyId': 'int'})
 
     topology = Topology.from_id(request.params_path['topologyId'])
 
-    # Make sure this Topology exists
-
-    validation_error = topology.validate()
-    if validation_error is not None:
-        return validation_error    
-
-    # Make sure this user is authorized to view this Topology
-
-    access_error = topology.validate_user_access(request.google_id, False)
-    if access_error is not None:
-        return access_error
+    topology.check_exists()
 
-    # Return this Topology
+    topology.check_user_access(request.google_id, False)
 
     return Response(200, 'Successfully retrieved topology.', topology.obj)