From c0bf71322e4fd510046588e388ada0a81f54631d Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 25 Jun 2020 17:11:03 +0200 Subject: Implement and test path --- opendc/models/model.py | 8 ++++---- opendc/models/simulation.py | 5 +++++ opendc/models/topology.py | 5 +++++ opendc/models/user.py | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 opendc/models/simulation.py create mode 100644 opendc/models/topology.py (limited to 'opendc/models') diff --git a/opendc/models/model.py b/opendc/models/model.py index d887e845..d0bf34ee 100644 --- a/opendc/models/model.py +++ b/opendc/models/model.py @@ -14,7 +14,7 @@ class Model: def validate(self, request_google_id=None): if self.obj is None: - return Response(404, f'Not found.') + return Response(404, 'Not found.') return None @@ -22,10 +22,10 @@ class Model: self.obj[key] = value def insert(self): - DB.insert(self.obj, self.collection_name) + self.obj = DB.insert(self.obj, self.collection_name) def update(self): - DB.update(self.obj['_id'], self.obj, self.collection_name) + self.obj = DB.update(self.obj['_id'], self.obj, self.collection_name) def delete(self): - DB.delete_one({'_id': self.obj['_id']}, self.collection_name) + self.obj = DB.delete_one({'_id': self.obj['_id']}, self.collection_name) diff --git a/opendc/models/simulation.py b/opendc/models/simulation.py new file mode 100644 index 00000000..bb2ef1bc --- /dev/null +++ b/opendc/models/simulation.py @@ -0,0 +1,5 @@ +from opendc.models.model import Model + + +class Simulation(Model): + collection_name = 'simulations' diff --git a/opendc/models/topology.py b/opendc/models/topology.py new file mode 100644 index 00000000..a5f53bbb --- /dev/null +++ b/opendc/models/topology.py @@ -0,0 +1,5 @@ +from opendc.models.model import Model + + +class Topology(Model): + collection_name = 'topologies' diff --git a/opendc/models/user.py b/opendc/models/user.py index bbbb40e8..ea8b1f3f 100644 --- a/opendc/models/user.py +++ b/opendc/models/user.py @@ -10,6 +10,10 @@ class User(Model): def from_email(cls, email): return User(DB.fetch_one({'email': email}, User.collection_name)) + @classmethod + def from_google_id(cls, google_id): + return User(DB.fetch_one({'googleId': google_id}, User.collection_name)) + def validate(self, request_google_id=None): super_validation = super().validate(request_google_id) -- cgit v1.2.3