Finished prefabs API

1 files changed, 8 insertions, 13 deletions

diff --git a/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py b/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py
index c30565d0..e8508ee0 100644
--- a/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py
+++ b/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py
@@ -1,9 +1,6 @@
 from datetime import datetime
 
-from opendc.models.experiment import Experiment
 from opendc.models.prefab import Prefab
-from opendc.models.topology import Topology
-from opendc.models.user import User
 from opendc.util.database import Database
 from opendc.util.rest import Response
 
@@ -14,24 +11,27 @@ def GET(request):
     request.check_required_parameters(path={'prefabId': 'string'})
 
     prefab = Prefab.from_id(request.params_path['prefabId'])
-
+    print(prefab.obj)
     prefab.check_exists()
-    prefab.check_user_access(request.google_id, False)
+    print("before cua")
+    prefab.check_user_access(request.google_id)
+    print("after cua")
 
     return Response(200, 'Successfully retrieved prefab', prefab.obj)
 
 
 def PUT(request):
-    """Update a prefab's name."""
+    """Update a prefab's name and/or contents."""
 
     request.check_required_parameters(body={'prefab': {'name': 'name'}}, path={'prefabId': 'string'})
 
     prefab = Prefab.from_id(request.params_path['prefabId'])
 
     prefab.check_exists()
-    prefab.check_user_access(request.google_id, True)
+    prefab.check_user_access(request.google_id)
 
     prefab.set_property('name', request.params_body['prefab']['name'])
+    prefab.set_property('rack', request.params_body['prefab']['rack'])
     prefab.set_property('datetime_last_edited', Database.datetime_to_string(datetime.now()))
     prefab.update()
 
@@ -46,12 +46,7 @@ def DELETE(request):
     prefab = Prefab.from_id(request.params_path['prefabId'])
 
     prefab.check_exists()
-    prefab.check_user_access(request.google_id, True)
-
-    user = User.from_google_id(request.google_id)
-    user.obj['authorizations'] = list(
-        filter(lambda x: str(x['prefabId']) != request.params_path['prefabId'], user.obj['authorizations']))
-    user.update()
+    prefab.check_user_access(request.google_id)
 
     old_object = prefab.delete()