Merge branch 'master' onto local working copy

Preserve working copy while updating

3 files changed, 0 insertions, 193 deletions

diff --git a/web-server/opendc/api/v2/prefabs/prefabId/__init__.py b/web-server/opendc/api/v2/prefabs/prefabId/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/prefabs/prefabId/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py b/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py
deleted file mode 100644
index e8508ee0..00000000
--- a/web-server/opendc/api/v2/prefabs/prefabId/endpoint.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from datetime import datetime
-
-from opendc.models.prefab import Prefab
-from opendc.util.database import Database
-from opendc.util.rest import Response
-
-
-def GET(request):
-    """Get this Prefab."""
-
-    request.check_required_parameters(path={'prefabId': 'string'})
-
-    prefab = Prefab.from_id(request.params_path['prefabId'])
-    print(prefab.obj)
-    prefab.check_exists()
-    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 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)
-
-    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()
-
-    return Response(200, 'Successfully updated prefab.', prefab.obj)
-
-
-def DELETE(request):
-    """Delete this Prefab."""
-
-    request.check_required_parameters(path={'prefabId': 'string'})
-
-    prefab = Prefab.from_id(request.params_path['prefabId'])
-
-    prefab.check_exists()
-    prefab.check_user_access(request.google_id)
-
-    old_object = prefab.delete()
-
-    return Response(200, 'Successfully deleted prefab.', old_object)
diff --git a/web-server/opendc/api/v2/prefabs/prefabId/test_endpoint.py b/web-server/opendc/api/v2/prefabs/prefabId/test_endpoint.py
deleted file mode 100644
index b25c881d..00000000
--- a/web-server/opendc/api/v2/prefabs/prefabId/test_endpoint.py
+++ /dev/null
@@ -1,140 +0,0 @@
-from opendc.util.database import DB
-from unittest.mock import Mock
-
-
-def test_get_prefab_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.get('/api/v2/prefabs/1').status
-
-def test_get_private_prefab_not_authorized(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '2',
-                            'visibility': 'private',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    res = client.get('/api/v2/prefabs/1')
-    assert '403' in res.status
-
-
-def test_get_private_prefab(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '1',
-                            'visibility': 'private',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    res = client.get('/api/v2/prefabs/1')
-    assert '200' in res.status
-
-def test_get_public_prefab(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '2',
-                            'visibility': 'public',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    res = client.get('/api/v2/prefabs/1')
-    assert '200' in res.status
-
-
-def test_update_prefab_missing_parameter(client):
-    assert '400' in client.put('/api/v2/prefabs/1').status
-
-
-def test_update_prefab_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.put('/api/v2/prefabs/1', json={'prefab': {'name': 'S'}}).status
-
-
-def test_update_prefab_not_authorized(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '2',
-                            'visibility': 'private',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    mocker.patch.object(DB, 'update', return_value={})
-    assert '403' in client.put('/api/v2/prefabs/1', json={'prefab': {'name': 'test prefab', 'rack' : {}}}).status
-
-
-def test_update_prefab(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '1',
-                            'visibility': 'private',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    mocker.patch.object(DB, 'update', return_value={})
-    res = client.put('/api/v2/prefabs/1', json={'prefab': {'name': 'test prefab', 'rack' : {}}})
-    assert '200' in res.status
-
-
-def test_delete_prefab_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.delete('/api/v2/prefabs/1').status
-
-
-def test_delete_prefab_different_user(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '2',
-                            'visibility': 'private',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    mocker.patch.object(DB, 'delete_one', return_value=None)
-    assert '403' in client.delete('/api/v2/prefabs/1').status
-
-
-def test_delete_prefab(client, mocker):
-    DB.fetch_one = Mock()
-    DB.fetch_one.side_effect = [{
-                            '_id': '1',
-                            'name': 'test prefab',
-                            'authorId': '1',
-                            'visibility': 'private',
-                            'rack': {}
-                        },
-                        {
-                            '_id': '1'
-                        }
-                        ]
-    mocker.patch.object(DB, 'delete_one', return_value={'prefab': {'name': 'name'}})
-    res = client.delete('/api/v2/prefabs/1')
-    assert '200' in res.status