Improve abstraction

2 files changed, 48 insertions, 13 deletions

diff --git a/opendc/models/model.py b/opendc/models/model.py
new file mode 100644
index 00000000..d887e845
--- /dev/null
+++ b/opendc/models/model.py
@@ -0,0 +1,31 @@
+from opendc.util.database import DB
+from opendc.util.rest import Response
+
+
+class Model:
+    collection_name = '<specified in subclasses>'
+
+    @classmethod
+    def from_id(cls, _id):
+        return cls(DB.fetch_one({'_id': _id}, Model.collection_name))
+
+    def __init__(self, obj):
+        self.obj = obj
+
+    def validate(self, request_google_id=None):
+        if self.obj is None:
+            return Response(404, f'Not found.')
+
+        return None
+
+    def set_property(self, key, value):
+        self.obj[key] = value
+
+    def insert(self):
+        DB.insert(self.obj, self.collection_name)
+
+    def update(self):
+        DB.update(self.obj['_id'], self.obj, self.collection_name)
+
+    def delete(self):
+        DB.delete_one({'_id': self.obj['_id']}, self.collection_name)
diff --git a/opendc/models/user.py b/opendc/models/user.py
index 39437025..bbbb40e8 100644
--- a/opendc/models/user.py
+++ b/opendc/models/user.py
@@ -1,26 +1,30 @@
+from opendc.models.model import Model
 from opendc.util.database import DB
 from opendc.util.rest import Response
 
 
-class User:
-    def __init__(self, obj_id):
-        self.obj_id = obj_id
-        self.obj = DB.fetch_one({'_id': obj_id}, 'users')
+class User(Model):
+    collection_name = 'users'
+
+    @classmethod
+    def from_email(cls, email):
+        return User(DB.fetch_one({'email': email}, User.collection_name))
 
     def validate(self, request_google_id=None):
-        if self.obj is None:
-            return Response(404, f'User with ID {self.obj_id} not found.')
+        super_validation = super().validate(request_google_id)
+
+        if super_validation is not None:
+            return super_validation
 
         if request_google_id is not None and self.obj['googleId'] != request_google_id:
-            return Response(403, f'Forbidden from editing user with ID {self.obj_id}.')
+            return Response(403, f'Forbidden from editing user with ID {self.obj["_id"]}.')
 
         return None
 
-    def set_property(self, key, value):
-        self.obj[key] = value
+    def validate_insertion(self):
+        existing_user = DB.fetch_one({'googleId': self.obj['googleId']}, self.collection_name)
 
-    def update(self):
-        DB.update(self.obj_id, self.obj, 'users')
+        if existing_user is not None:
+            return Response(409, f'User already exists.')
 
-    def delete(self):
-        DB.delete_one({'_id': self.obj_id}, 'users')
+        return None