Move existing models to schemas namespace

This is to make room for a new ORM namespace for SQLAlchemy models

9 files changed, 14 insertions, 13 deletions

diff --git a/backend/routes/discord.py b/backend/routes/discord.py
index 5cd6b47..1a56aac 100644
--- a/backend/routes/discord.py
+++ b/backend/routes/discord.py
@@ -6,7 +6,8 @@ from starlette.authentication import requires
 from starlette.responses import JSONResponse
 from starlette.routing import Request
 
-from backend import discord, models, route
+from backend import discord, route
+from backend.models import dtos
 from backend.validation import ErrorMessage, api
 
 NOT_FOUND_EXCEPTION = JSONResponse(
@@ -24,7 +25,7 @@ class RolesRoute(route.Route):
     class RolesResponse(pydantic.BaseModel):
         """A list of all roles on the configured server."""
 
-        roles: list[models.DiscordRole]
+        roles: list[dtos.DiscordRole]
 
     @requires(["authenticated", "admin"])
     @api.validate(
@@ -53,7 +54,7 @@ class MemberRoute(route.Route):
 
     @requires(["authenticated", "admin"])
     @api.validate(
-        resp=Response(HTTP_200=models.DiscordMember, HTTP_400=ErrorMessage),
+        resp=Response(HTTP_200=dtos.DiscordMember, HTTP_400=ErrorMessage),
         json=MemberRequest,
         tags=["auth"],
     )
@@ -68,7 +69,7 @@ class MemberRoute(route.Route):
 
     @requires(["authenticated", "admin"])
     @api.validate(
-        resp=Response(HTTP_200=models.DiscordMember, HTTP_400=ErrorMessage),
+        resp=Response(HTTP_200=dtos.DiscordMember, HTTP_400=ErrorMessage),
         json=MemberRequest,
         tags=["auth"],
     )
diff --git a/backend/routes/forms/condorcet.py b/backend/routes/forms/condorcet.py
index 902770b..ac7e52e 100644
--- a/backend/routes/forms/condorcet.py
+++ b/backend/routes/forms/condorcet.py
@@ -9,7 +9,7 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from backend import discord
-from backend.models import Form, FormResponse, Question
+from backend.models.dtos import Form, FormResponse, Question
 from backend.route import Route
 from backend.validation import api
 
diff --git a/backend/routes/forms/discover.py b/backend/routes/forms/discover.py
index 0fe10b5..43e6cf3 100644
--- a/backend/routes/forms/discover.py
+++ b/backend/routes/forms/discover.py
@@ -5,7 +5,7 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from backend import constants
-from backend.models import Form, FormList, Question
+from backend.models.dtos import Form, FormList, Question
 from backend.route import Route
 from backend.validation import api
 
diff --git a/backend/routes/forms/form.py b/backend/routes/forms/form.py
index 86bbf49..c96d0d6 100644
--- a/backend/routes/forms/form.py
+++ b/backend/routes/forms/form.py
@@ -10,7 +10,7 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from backend import constants, discord
-from backend.models import Form
+from backend.models.dtos import Form
 from backend.route import Route
 from backend.routes.forms.discover import AUTH_FORM
 from backend.validation import ErrorMessage, OkayResponse, api
diff --git a/backend/routes/forms/index.py b/backend/routes/forms/index.py
index 1fdfc48..4b55af2 100644
--- a/backend/routes/forms/index.py
+++ b/backend/routes/forms/index.py
@@ -6,8 +6,8 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from backend.constants import WebHook
-from backend.models import Form, FormList
-from backend.models.form import validate_hook_url
+from backend.models.dtos import Form, FormList
+from backend.models.dtos.form import validate_hook_url
 from backend.route import Route
 from backend.validation import ErrorMessage, OkayResponse, api
 
diff --git a/backend/routes/forms/response.py b/backend/routes/forms/response.py
index b4f7f04..ac80b74 100644
--- a/backend/routes/forms/response.py
+++ b/backend/routes/forms/response.py
@@ -6,7 +6,7 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from backend import discord
-from backend.models import FormResponse
+from backend.models.dtos import FormResponse
 from backend.route import Route
 from backend.validation import ErrorMessage, OkayResponse, api
 
diff --git a/backend/routes/forms/responses.py b/backend/routes/forms/responses.py
index 85e5af2..4228af8 100644
--- a/backend/routes/forms/responses.py
+++ b/backend/routes/forms/responses.py
@@ -7,7 +7,7 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from backend import discord
-from backend.models import FormResponse, ResponseList
+from backend.models.dtos import FormResponse, ResponseList
 from backend.route import Route
 from backend.validation import ErrorMessage, OkayResponse, api
 
diff --git a/backend/routes/forms/submit.py b/backend/routes/forms/submit.py
index 01c32cc..45636b7 100644
--- a/backend/routes/forms/submit.py
+++ b/backend/routes/forms/submit.py
@@ -19,7 +19,7 @@ from starlette.responses import JSONResponse
 
 from backend import constants
 from backend.authentication.user import User
-from backend.models import Form, FormResponse
+from backend.models.dtos import Form, FormResponse
 from backend.route import Route
 from backend.routes.auth.authorize import set_response_token
 from backend.routes.forms.discover import AUTH_FORM
diff --git a/backend/routes/forms/unittesting.py b/backend/routes/forms/unittesting.py
index 57c3a86..469243c 100644
--- a/backend/routes/forms/unittesting.py
+++ b/backend/routes/forms/unittesting.py
@@ -8,7 +8,7 @@ import httpx
 from httpx import HTTPStatusError
 
 from backend.constants import SNEKBOX_URL
-from backend.models import Form, FormResponse
+from backend.models.dtos import Form, FormResponse
 
 with Path("resources/unittest_template.py").open(encoding="utf8") as file:
     TEST_TEMPLATE = file.read()