Create base model for Mongo schemas

tests/test_database/conftest.py

@@ -3,7 +3,13 @@ import datetime
 import pytest
 
 from database.crud import users
-from database.models import Bank, UforaAnnouncement, UforaCourse, UforaCourseAlias, User
+from database.schemas.relational import (
+    Bank,
+    UforaAnnouncement,
+    UforaCourse,
+    UforaCourseAlias,
+    User,
+)
 
 
 @pytest.fixture(scope="session")

tests/test_database/test_crud/test_birthdays.py

@@ -4,7 +4,7 @@ from freezegun import freeze_time
 
 from database.crud import birthdays as crud
 from database.crud import users
-from database.models import User
+from database.schemas.relational import User
 
 
 async def test_add_birthday_not_present(postgres, user: User):

tests/test_database/test_crud/test_currency.py

@@ -5,7 +5,7 @@ from freezegun import freeze_time
 
 from database.crud import currency as crud
 from database.exceptions import currency as exceptions
-from database.models import Bank
+from database.schemas.relational import Bank
 
 
 async def test_add_dinks(postgres, bank: Bank):

tests/test_database/test_crud/test_custom_commands.py

@@ -4,7 +4,7 @@ from sqlalchemy import select
 from database.crud import custom_commands as crud
 from database.exceptions.constraints import DuplicateInsertException
 from database.exceptions.not_found import NoResultFoundException
-from database.models import CustomCommand
+from database.schemas.relational import CustomCommand
 
 
 async def test_create_command_non_existing(postgres):

tests/test_database/test_crud/test_dad_jokes.py

@@ -1,7 +1,7 @@
 from sqlalchemy import select
 
 from database.crud import dad_jokes as crud
-from database.models import DadJoke
+from database.schemas.relational import DadJoke
 
 
 async def test_add_dad_joke(postgres):

tests/test_database/test_crud/test_tasks.py

@@ -6,7 +6,7 @@ from sqlalchemy import select
 
 from database.crud import tasks as crud
 from database.enums import TaskType
-from database.models import Task
+from database.schemas.relational import Task
 
 
 @pytest.fixture

tests/test_database/test_crud/test_ufora_announcements.py

@@ -1,7 +1,7 @@
 import datetime
 
 from database.crud import ufora_announcements as crud
-from database.models import UforaAnnouncement, UforaCourse
+from database.schemas.relational import UforaAnnouncement, UforaCourse
 
 
 async def test_get_courses_with_announcements_none(postgres):

tests/test_database/test_crud/test_ufora_courses.py

@@ -1,5 +1,5 @@
 from database.crud import ufora_courses as crud
-from database.models import UforaCourse
+from database.schemas.relational import UforaCourse
 
 
 async def test_get_course_by_name_exact(postgres, ufora_course: UforaCourse):

tests/test_database/test_crud/test_users.py

@@ -1,7 +1,7 @@
 from sqlalchemy import select
 
 from database.crud import users as crud
-from database.models import User
+from database.schemas.relational import User
 
 
 async def test_get_or_add_non_existing(postgres):

tests/test_database/test_utils/test_caches.py

@@ -1,4 +1,4 @@
-from database.models import UforaCourse
+from database.schemas.relational import UforaCourse
 from database.utils.caches import UforaCourseCache