Use inheritance for users

backend/app.py

@@ -20,11 +20,5 @@
 app.config["SQLALCHEMY_DATABASE_URI"] = f"postgresql://{db_user}:{db_password}@{db_host}:{db_port}/{db_database}"
 db.init_app(app)
 
-
-@app.route("/")
-def hello_world():
-    return "Hello, World!"
-
-
 if __name__ == "__main__":
     app.run(debug=True)

backend/db/models/models.py

@@ -23,11 +23,11 @@ def to_domain_model(self) -> UserDataclass:
         return UserDataclass(id=self.id, name=self.name, email=self.email)
 
 
-class Admin(db.Model):
+class Admin(User):
     id: Mapped[int] = mapped_column(ForeignKey(User.id), primary_key=True)
 
     def to_domain_model(self) -> AdminDataclass:
-        return AdminDataclass(id=self.id)
+        return AdminDataclass(id=self.id, name=self.name, email=self.email)
 
 
 teachers_subjects = Table(
@@ -50,22 +50,22 @@ def to_domain_model(self) -> AdminDataclass:
 )
 
 
-class Teacher(db.Model):
+class Teacher(User):
     id: Mapped[int] = mapped_column(ForeignKey(User.id), primary_key=True)
     subjects: Mapped[list["Subject"]] = relationship(secondary=teachers_subjects, back_populates="teachers")
 
     def to_domain_model(self) -> TeacherDataclass:
-        return TeacherDataclass(id=self.id)
+        return TeacherDataclass(id=self.id, name=self.name, email=self.email)
 
 
-class Student(db.Model):
+class Student(User):
     id: Mapped[int] = mapped_column(ForeignKey(User.id), primary_key=True)
     subjects: Mapped[list["Subject"]] = relationship(secondary=students_subjects, back_populates="students")
     groups: Mapped[list["Group"]] = relationship(secondary=students_groups, back_populates="students")
     submissions: Mapped[list["Submission"]] = relationship(back_populates="student")
 
     def to_domain_model(self) -> StudentDataclass:
-        return StudentDataclass(id=self.id)
+        return StudentDataclass(id=self.id, name=self.name, email=self.email)
 
 
 class Subject(db.Model):

backend/domain/models/AdminDataclass.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 
-from domain.models.base_model import JsonRepresentable
+from domain.models.UserDataclass import UserDataclass
 
 
 @dataclass()
-class AdminDataclass(JsonRepresentable):
-    id: int
+class AdminDataclass(UserDataclass):
+    pass

backend/domain/models/StudentDataclass.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 
-from domain.models.base_model import JsonRepresentable
+from domain.models.UserDataclass import UserDataclass
 
 
 @dataclass()
-class StudentDataclass(JsonRepresentable):
-    id: int
+class StudentDataclass(UserDataclass):
+    pass

backend/domain/models/TeacherDataclass.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 
-from domain.models.base_model import JsonRepresentable
+from domain.models.UserDataclass import UserDataclass
 
 
 @dataclass()
-class TeacherDataclass(JsonRepresentable):
-    id: int
+class TeacherDataclass(UserDataclass):
+    pass

backend/tests/teachers_test.py

@@ -2,11 +2,10 @@
 import unittest
 from http import HTTPStatus
 
-from routes.index import app
+from app import app
 
 
 class LesgeverTestCase(unittest.TestCase):
-
     def setUp(self):
         self.app = app.test_client()
         self.app.testing = True
@@ -17,9 +16,7 @@ def test_create_teacher_bad_request(self):
         self.assertIn("error", json.loads(response.data))
 
     def test_create_teacher_success(self):
-        teacher_data = {
-            "name": "Bart De Bruyn"
-        }
+        teacher_data = {"name": "Bart De Bruyn"}
         response = self.app.post("/teachers", data=json.dumps(teacher_data), content_type="application/json")
         self.assertEqual(HTTPStatus.CREATED, response.status_code)