Merge pull request #34 from SELab-2/modellen_naar_pydantic

Modellen naar pydantic

backend/db/implementation/SqlAbstractDAO.py

@@ -1,15 +1,15 @@
 from typing import Generic, TypeVar
 
+from pydantic import BaseModel
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from db.errors.database_errors import ItemNotFoundError
 from db.extensions import engine
 from db.models.models import AbstractModel
-from domain.models.base_model import JsonRepresentable
 
 T = TypeVar("T", bound=AbstractModel)
-D = TypeVar("D", bound=JsonRepresentable)
+D = TypeVar("D", bound=BaseModel)
 
 
 class SqlAbstractDAO(Generic[T, D]):

backend/db/models/models.py

@@ -3,12 +3,12 @@
 from datetime import datetime
 from typing import Generic, TypeVar
 
+from pydantic import BaseModel
 from sqlalchemy import Column, ForeignKey, Table
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from db.extensions import Base
 from domain.models.AdminDataclass import AdminDataclass
-from domain.models.base_model import JsonRepresentable
 from domain.models.GroupDataclass import GroupDataclass
 from domain.models.ProjectDataclass import ProjectDataclass
 from domain.models.StudentDataclass import StudentDataclass
@@ -17,7 +17,7 @@
 from domain.models.TeacherDataclass import TeacherDataclass
 from domain.models.UserDataclass import UserDataclass
 
-D = TypeVar("D", bound=JsonRepresentable)
+D = TypeVar("D", bound=BaseModel)
 
 
 @dataclass()

backend/domain/models/GroupDataclass.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 
-from domain.models.base_model import JsonRepresentable
+from pydantic import BaseModel
 
 
 @dataclass()
-class GroupDataclass(JsonRepresentable):
+class GroupDataclass(BaseModel):
     id: int
     project_id: int

backend/domain/models/ProjectDataclass.py

@@ -1,17 +1,17 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-from domain.models.base_model import JsonRepresentable
+from pydantic import BaseModel, PositiveInt
 
 
 @dataclass()
-class ProjectDataclass(JsonRepresentable):
+class ProjectDataclass(BaseModel):
     id: int
     name: str
     deadline: datetime
     archived: bool
     description: str
     requirements: str
     visible: bool
-    max_students: int
+    max_students: PositiveInt
     subject_id: int

backend/domain/models/SubjectDataclass.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 
-from domain.models.base_model import JsonRepresentable
+from pydantic import BaseModel
 
 
 @dataclass()
-class SubjectDataclass(JsonRepresentable):
+class SubjectDataclass(BaseModel):
     id: int
     name: str

backend/domain/models/SubmissionDataclass.py

@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-from domain.models.base_model import JsonRepresentable
+from pydantic import BaseModel
 
 
 class SubmissionState(enum.Enum):
@@ -12,7 +12,7 @@ class SubmissionState(enum.Enum):
 
 
 @dataclass()
-class SubmissionDataclass(JsonRepresentable):
+class SubmissionDataclass(BaseModel):
     id: int
     date_time: datetime
     group_id: int

backend/domain/models/UserDataclass.py

@@ -1,10 +1,10 @@
 from dataclasses import dataclass
 
-from domain.models.base_model import JsonRepresentable
+from pydantic import BaseModel, EmailStr
 
 
 @dataclass()
-class UserDataclass(JsonRepresentable):
+class UserDataclass(BaseModel):
     id: int
     name: str
-    email: str
+    email: EmailStr

backend/requirements.txt

@@ -1,6 +1,8 @@
 annotated-types==0.6.0
 anyio==4.3.0
 click==8.1.7
+dnspython==2.6.1
+email_validator==2.1.1
 fastapi==0.110.0
 greenlet==3.0.3
 h11==0.14.0