From b4bdf9fde013bb7ff9579693b64ff575f7b00e44 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 7 Jul 2020 09:55:10 +0200 Subject: Rename simulations to projects and remove experiment view --- web-server/opendc/models/experiment.py | 4 ++-- web-server/opendc/models/prefab.py | 4 ++-- web-server/opendc/models/project.py | 31 +++++++++++++++++++++++++++++++ web-server/opendc/models/simulation.py | 31 ------------------------------- web-server/opendc/models/topology.py | 10 +++++----- 5 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 web-server/opendc/models/project.py delete mode 100644 web-server/opendc/models/simulation.py (limited to 'web-server/opendc/models') diff --git a/web-server/opendc/models/experiment.py b/web-server/opendc/models/experiment.py index 36b5d415..46373b99 100644 --- a/web-server/opendc/models/experiment.py +++ b/web-server/opendc/models/experiment.py @@ -12,13 +12,13 @@ class Experiment(Model): def check_user_access(self, google_id, edit_access): """Raises an error if the user with given [google_id] has insufficient access. - Checks access on the parent simulation. + Checks access on the parent project. :param google_id: The Google ID of the user. :param edit_access: True when edit access should be checked, otherwise view access. """ user = User.from_google_id(google_id) authorizations = list( - filter(lambda x: str(x['simulationId']) == str(self.obj['simulationId']), user.obj['authorizations'])) + filter(lambda x: str(x['projectId']) == str(self.obj['projectId']), user.obj['authorizations'])) if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'): raise ClientError(Response(403, 'Forbidden from retrieving/editing experiment.')) diff --git a/web-server/opendc/models/prefab.py b/web-server/opendc/models/prefab.py index ca9f0b3a..42c29697 100644 --- a/web-server/opendc/models/prefab.py +++ b/web-server/opendc/models/prefab.py @@ -6,7 +6,7 @@ from opendc.util.rest import Response class Prefab(Model): - """Model representing a Simulation.""" + """Model representing a Project.""" collection_name = 'prefabs' @@ -22,7 +22,7 @@ class Prefab(Model): raise ClientError(Response(403, "Forbidden from retrieving prefab.")) def get_all_authorizations(self): - """Get all user IDs having access to this simulation.""" + """Get all user IDs having access to this project.""" return [ str(user['_id']) for user in DB.fetch_all({'authorizations': { 'prefabId': self.obj['_id'] diff --git a/web-server/opendc/models/project.py b/web-server/opendc/models/project.py new file mode 100644 index 00000000..b57e9f77 --- /dev/null +++ b/web-server/opendc/models/project.py @@ -0,0 +1,31 @@ +from opendc.models.model import Model +from opendc.models.user import User +from opendc.util.database import DB +from opendc.util.exceptions import ClientError +from opendc.util.rest import Response + + +class Project(Model): + """Model representing a Project.""" + + collection_name = 'projects' + + def check_user_access(self, google_id, edit_access): + """Raises an error if the user with given [google_id] has insufficient access. + + :param google_id: The Google ID of the user. + :param edit_access: True when edit access should be checked, otherwise view access. + """ + user = User.from_google_id(google_id) + authorizations = list(filter(lambda x: str(x['projectId']) == str(self.get_id()), + user.obj['authorizations'])) + if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'): + raise ClientError(Response(403, "Forbidden from retrieving project.")) + + def get_all_authorizations(self): + """Get all user IDs having access to this project.""" + return [ + str(user['_id']) for user in DB.fetch_all({'authorizations': { + 'projectId': self.obj['_id'] + }}, User.collection_name) + ] diff --git a/web-server/opendc/models/simulation.py b/web-server/opendc/models/simulation.py deleted file mode 100644 index 9a2770cf..00000000 --- a/web-server/opendc/models/simulation.py +++ /dev/null @@ -1,31 +0,0 @@ -from opendc.models.model import Model -from opendc.models.user import User -from opendc.util.database import DB -from opendc.util.exceptions import ClientError -from opendc.util.rest import Response - - -class Simulation(Model): - """Model representing a Simulation.""" - - collection_name = 'simulations' - - def check_user_access(self, google_id, edit_access): - """Raises an error if the user with given [google_id] has insufficient access. - - :param google_id: The Google ID of the user. - :param edit_access: True when edit access should be checked, otherwise view access. - """ - user = User.from_google_id(google_id) - authorizations = list(filter(lambda x: str(x['simulationId']) == str(self.get_id()), - user.obj['authorizations'])) - if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'): - raise ClientError(Response(403, "Forbidden from retrieving simulation.")) - - def get_all_authorizations(self): - """Get all user IDs having access to this simulation.""" - return [ - str(user['_id']) for user in DB.fetch_all({'authorizations': { - 'simulationId': self.obj['_id'] - }}, User.collection_name) - ] diff --git a/web-server/opendc/models/topology.py b/web-server/opendc/models/topology.py index 0ceecec5..cb4c4bab 100644 --- a/web-server/opendc/models/topology.py +++ b/web-server/opendc/models/topology.py @@ -5,23 +5,23 @@ from opendc.util.rest import Response class Topology(Model): - """Model representing a Simulation.""" + """Model representing a Project.""" collection_name = 'topologies' def check_user_access(self, google_id, edit_access): """Raises an error if the user with given [google_id] has insufficient access. - Checks access on the parent simulation. + Checks access on the parent project. :param google_id: The Google ID of the user. :param edit_access: True when edit access should be checked, otherwise view access. """ user = User.from_google_id(google_id) - if 'simulationId' not in self.obj: - raise ClientError(Response(400, 'Missing simulationId in topology.')) + if 'projectId' not in self.obj: + raise ClientError(Response(400, 'Missing projectId in topology.')) authorizations = list( - filter(lambda x: str(x['simulationId']) == str(self.obj['simulationId']), user.obj['authorizations'])) + filter(lambda x: str(x['projectId']) == str(self.obj['projectId']), user.obj['authorizations'])) if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'): raise ClientError(Response(403, 'Forbidden from retrieving topology.')) -- cgit v1.2.3