Move current routers to the 'old' namespace

This is to indicate that they purely exist for backwards compatibility

Author: ChrisLovering

api/main.py

@@ -2,7 +2,7 @@
 from starlette.middleware.authentication import AuthenticationMiddleware
 
 from api.middleware import TokenAuthentication, on_auth_error
-from api.routers import codejams, infractions, teams, users, winners
+from api.routers.old import old_routes_router
 from api.settings import Server
 
 app = FastAPI(redoc_url="/", docs_url="/swagger")
@@ -13,8 +13,4 @@
     on_error=on_auth_error,
 )
 
-app.include_router(codejams.router)
-app.include_router(infractions.router)
-app.include_router(teams.router)
-app.include_router(users.router)
-app.include_router(winners.router)
+app.include_router(old_routes_router)

api/models.py

@@ -0,0 +1,10 @@
+from fastapi import APIRouter
+
+from api.routers.old import codejams, infractions, teams, users, winners
+
+old_routes_router = APIRouter()
+old_routes_router.include_router(codejams.router)
+old_routes_router.include_router(infractions.router)
+old_routes_router.include_router(teams.router)
+old_routes_router.include_router(users.router)
+old_routes_router.include_router(winners.router)

api/routers/__init__.py

@@ -4,8 +4,9 @@
 from sqlalchemy import desc, update
 from sqlalchemy.future import select
 
-from api.database import DBSession, Jam, Team, TeamUser, User
 from api.models import CodeJam, CodeJamResponse
+from api.models.orm import Jam, Team, User
+from api.settings import DBSession
 
 router = APIRouter(prefix="/codejams", tags=["codejams"])
 

api/routers/old/__init__.py

@@ -1,10 +1,10 @@
 from fastapi import APIRouter, HTTPException
 from sqlalchemy.future import select
 
-from api.database import DBSession
-from api.database import Infraction as DbInfraction
-from api.database import Jam, User
 from api.models import Infraction, InfractionResponse
+from api.models.orm import Infraction as DbInfraction
+from api.models.orm import Jam, User
+from api.settings import DBSession
 
 router = APIRouter(prefix="/infractions", tags=["infractions"])
 

api/routers/codejams.py renamed to api/routers/old/codejams.py

@@ -5,9 +5,10 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
-from api.database import DBSession, Jam, Team, TeamUser
-from api.database import User as DbUser
 from api.models import TeamResponse, User
+from api.models.orm import Jam, Team
+from api.models.orm import User as DbUser
+from api.settings import DBSession
 
 router = APIRouter(prefix="/teams", tags=["teams"])
 

api/routers/infractions.py renamed to api/routers/old/infractions.py

@@ -4,8 +4,9 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
-from api.database import DBSession, Jam, TeamUser, User
 from api.models import UserResponse, UserTeamResponse
+from api.models.orm import Jam, User
+from api.settings import DBSession
 
 router = APIRouter(prefix="/users", tags=["users"])
 

api/routers/teams.py renamed to api/routers/old/teams.py

@@ -2,9 +2,9 @@
 from sqlalchemy import func
 from sqlalchemy.future import select
 
-from api.database import DBSession, Jam, User
-from api.database import Winner as DbWinner
 from api.models import Winner, WinnerResponse
+from api.models.orm import Jam, User
+from api.settings import DBSession
 
 router = APIRouter(prefix="/winners", tags=["winners"])