Lint code and revert pydantic for now

backend/db/implementation/SqlAbstractDAO.py

@@ -1,12 +1,11 @@
-from sqlalchemy import select
 from abc import ABC
+from typing import Generic, TypeVar
 
+from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from db.errors.database_errors import ItemNotFoundError
 from db.extensions import engine
-from typing import Generic, TypeVar, Type
-
 from db.models.models import AbstractModel
 
 T = TypeVar("T", bound=AbstractModel)

backend/db/implementation/SqlGroupDAO.py

@@ -1,7 +1,7 @@
-from db.errors.database_errors import ItemNotFoundError, UniqueConstraintError
-from db.extensions import engine
 from sqlalchemy.orm import Session
 
+from db.errors.database_errors import ItemNotFoundError, UniqueConstraintError
+from db.extensions import engine
 from db.implementation.SqlAbstractDAO import SqlAbstractDAO
 from db.interface.GroupDAO import GroupDAO
 from db.models.models import Group, Project, Student

backend/db/implementation/SqlProjectDAO.py

@@ -1,11 +1,10 @@
 from datetime import datetime
 
-from db.errors.database_errors import ItemNotFoundError
 from sqlalchemy.orm import Session
 
+from db.errors.database_errors import ItemNotFoundError
 from db.extensions import engine
 from db.implementation.SqlAbstractDAO import SqlAbstractDAO
-from db.interface.AbstractDAO import D
 from db.interface.ProjectDAO import ProjectDAO
 from db.models.models import Project, Subject
 from domain.models.ProjectDataclass import ProjectDataclass

backend/db/implementation/SqlStudentDAO.py

@@ -1,11 +1,8 @@
-from sqlalchemy import select
 
-from db.errors.database_errors import ItemNotFoundError
-from db.extensions import engine
 from sqlalchemy.orm import Session
 
+from db.extensions import engine
 from db.implementation.SqlAbstractDAO import SqlAbstractDAO
-from db.interface.AbstractDAO import D
 from db.interface.StudentDAO import StudentDAO
 from db.models.models import Student
 from domain.models.StudentDataclass import StudentDataclass

backend/db/implementation/SqlSubjectDAO.py

@@ -1,9 +1,8 @@
-from db.errors.database_errors import ItemNotFoundError, UniqueConstraintError
 from sqlalchemy.orm import Session
 
+from db.errors.database_errors import ItemNotFoundError, UniqueConstraintError
 from db.extensions import engine
 from db.implementation.SqlAbstractDAO import SqlAbstractDAO
-from db.interface.AbstractDAO import D
 from db.interface.SubjectDAO import SubjectDAO
 from db.models.models import Student, Subject, Teacher
 from domain.models.SubjectDataclass import SubjectDataclass

backend/db/implementation/SqlSubmissionDAO.py

@@ -1,8 +1,8 @@
 from datetime import datetime
 
-from db.errors.database_errors import ItemNotFoundError
 from sqlalchemy.orm import Session
 
+from db.errors.database_errors import ItemNotFoundError
 from db.extensions import engine
 from db.implementation.SqlAbstractDAO import SqlAbstractDAO
 from db.interface.SubmissionDAO import SubmissionDAO

backend/db/implementation/SqlTeacherDAO.py

@@ -1,7 +1,7 @@
 from sqlalchemy.orm import Session
+
 from db.extensions import engine
 from db.implementation.SqlAbstractDAO import SqlAbstractDAO
-from db.interface.AbstractDAO import D
 from db.interface.TeacherDAO import TeacherDAO
 from db.models.models import Teacher
 from domain.models.TeacherDataclass import TeacherDataclass

backend/db/interface/AbstractDAO.py

@@ -1,8 +1,6 @@
 from abc import ABC, abstractmethod
 from typing import Generic, TypeVar
 
-from db.models.models import AbstractModel
-
 T = TypeVar("T")
 D = TypeVar("D")
 

backend/db/models/models.py

@@ -1,12 +1,12 @@
 from abc import abstractmethod
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any
 
 from sqlalchemy import Column, ForeignKey, Table
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
 
 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
@@ -19,7 +19,7 @@
 @dataclass()
 class AbstractModel:
     @abstractmethod
-    def to_domain_model(self) -> Any:
+    def to_domain_model(self) -> JsonRepresentable:
         pass
 
 

backend/domain/models/TeacherDataclass.py

@@ -1,13 +1,8 @@
 from dataclasses import dataclass
 
-from domain.models.UserDataclass import UserDataclass, UserDataClassRequest
+from domain.models.UserDataclass import UserDataclass
 
 
 @dataclass()
 class TeacherDataclass(UserDataclass):
     pass
-
-
-@dataclass()
-class TeacherDataClassRequest(UserDataClassRequest):
-    pass

backend/domain/models/UserDataclass.py

@@ -1,17 +1,10 @@
 from dataclasses import dataclass
 
-from pydantic import BaseModel
+from domain.models.base_model import JsonRepresentable
 
 
 @dataclass()
-class UserDataclass(BaseModel):
+class UserDataclass(JsonRepresentable):
     id: int
-    # pydanitc will throw an error when creating a new user
-    name: str
-    email: str
-
-
-@dataclass()
-class UserDataClassRequest(BaseModel):
     name: str
     email: str

backend/domain/models/base_model.py

@@ -2,7 +2,6 @@
 from dataclasses import dataclass
 
 
-# what is the use of this class when one can use pydantic models?
 @dataclass()
 class JsonRepresentable:
     def to_dict(self) -> dict:

backend/fill_database_mock.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 
 from psycopg2 import tz
-
-from db.extensions import engine, Base
 from sqlalchemy.orm import Session
+
+from db.extensions import Base, engine
 from db.implementation.SqlAdminDAO import SqlAdminDAO
 from db.implementation.SqlGroupDAO import SqlGroupDAO
 from db.implementation.SqlProjectDAO import SqlProjectDAO