diff --git a/src/backend/app/api/api_v1/endpoints/__init__.py b/src/backend/app/api/api_v1/endpoints/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/backend/app/api/deps.py b/src/backend/app/api/deps.py index 1810ce0..b6e05c1 100644 --- a/src/backend/app/api/deps.py +++ b/src/backend/app/api/deps.py @@ -9,7 +9,7 @@ from sqlmodel import Session from app.core import security from app.core.config import settings -from app.db.engine import engine +from app.core.db import engine from app.models import TokenPayload, User reusable_oauth2 = OAuth2PasswordBearer( diff --git a/src/backend/app/api/api_v1/api.py b/src/backend/app/api/main.py similarity index 83% rename from src/backend/app/api/api_v1/api.py rename to src/backend/app/api/main.py index 2163017..09e0663 100644 --- a/src/backend/app/api/api_v1/api.py +++ b/src/backend/app/api/main.py @@ -1,6 +1,6 @@ from fastapi import APIRouter -from app.api.api_v1.endpoints import items, login, users, utils +from app.api.routes import items, login, users, utils api_router = APIRouter() api_router.include_router(login.router, tags=["login"]) diff --git a/src/backend/app/api/api_v1/__init__.py b/src/backend/app/api/routes/__init__.py similarity index 100% rename from src/backend/app/api/api_v1/__init__.py rename to src/backend/app/api/routes/__init__.py diff --git a/src/backend/app/api/api_v1/endpoints/items.py b/src/backend/app/api/routes/items.py similarity index 100% rename from src/backend/app/api/api_v1/endpoints/items.py rename to src/backend/app/api/routes/items.py diff --git a/src/backend/app/api/api_v1/endpoints/login.py b/src/backend/app/api/routes/login.py similarity index 100% rename from src/backend/app/api/api_v1/endpoints/login.py rename to src/backend/app/api/routes/login.py diff --git a/src/backend/app/api/api_v1/endpoints/users.py b/src/backend/app/api/routes/users.py similarity index 100% rename from src/backend/app/api/api_v1/endpoints/users.py rename to src/backend/app/api/routes/users.py diff --git a/src/backend/app/api/api_v1/endpoints/utils.py b/src/backend/app/api/routes/utils.py similarity index 100% rename from src/backend/app/api/api_v1/endpoints/utils.py rename to src/backend/app/api/routes/utils.py diff --git a/src/backend/app/backend_pre_start.py b/src/backend/app/backend_pre_start.py index b7b0abe..1693d25 100644 --- a/src/backend/app/backend_pre_start.py +++ b/src/backend/app/backend_pre_start.py @@ -3,7 +3,7 @@ import logging from sqlmodel import Session, select from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed -from app.db.engine import engine +from app.core.db import engine logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/src/backend/app/celeryworker_pre_start.py b/src/backend/app/celeryworker_pre_start.py index 3861908..a933602 100644 --- a/src/backend/app/celeryworker_pre_start.py +++ b/src/backend/app/celeryworker_pre_start.py @@ -3,7 +3,7 @@ import logging from sqlmodel import Session, select from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed -from app.db.engine import engine +from app.core.db import engine logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/src/backend/app/db/init_db.py b/src/backend/app/core/db.py similarity index 83% rename from src/backend/app/db/init_db.py rename to src/backend/app/core/db.py index cb438d1..e1c5c22 100644 --- a/src/backend/app/db/init_db.py +++ b/src/backend/app/core/db.py @@ -1,8 +1,11 @@ -from sqlmodel import Session, select +from sqlmodel import Session, create_engine, select from app import crud from app.core.config import settings -from app.models import User, UserCreate # noqa: F401 +from app.models import User, UserCreate + +engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI)) + # make sure all SQLModel models are imported (app.models) before initializing DB # otherwise, SQLModel might fail to initialize relationships properly @@ -15,7 +18,7 @@ def init_db(session: Session) -> None: # the tables un-commenting the next lines # from sqlmodel import SQLModel - # from app.db.engine import engine + # from app.core.engine import engine # This works because the models are already imported and registered from app.models # SQLModel.metadata.create_all(engine) diff --git a/src/backend/app/db/__init__.py b/src/backend/app/db/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/backend/app/db/engine.py b/src/backend/app/db/engine.py deleted file mode 100644 index 0104294..0000000 --- a/src/backend/app/db/engine.py +++ /dev/null @@ -1,5 +0,0 @@ -from sqlmodel import create_engine - -from app.core.config import settings - -engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI)) diff --git a/src/backend/app/initial_data.py b/src/backend/app/initial_data.py index dce56ef..d806c3d 100644 --- a/src/backend/app/initial_data.py +++ b/src/backend/app/initial_data.py @@ -2,8 +2,7 @@ import logging from sqlmodel import Session -from app.db.engine import engine -from app.db.init_db import init_db +from app.core.db import engine, init_db logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/src/backend/app/main.py b/src/backend/app/main.py index 9722c94..e68508b 100644 --- a/src/backend/app/main.py +++ b/src/backend/app/main.py @@ -2,7 +2,7 @@ from fastapi import FastAPI from fastapi.routing import APIRoute from starlette.middleware.cors import CORSMiddleware -from app.api.api_v1.api import api_router +from app.api.main import api_router from app.core.config import settings diff --git a/src/backend/app/tests/conftest.py b/src/backend/app/tests/conftest.py index 74a0fb0..502a450 100644 --- a/src/backend/app/tests/conftest.py +++ b/src/backend/app/tests/conftest.py @@ -5,8 +5,7 @@ from fastapi.testclient import TestClient from sqlmodel import Session, delete from app.core.config import settings -from app.db.engine import engine -from app.db.init_db import init_db +from app.core.db import engine, init_db from app.main import app from app.models import Item, User from app.tests.utils.user import authentication_token_from_email diff --git a/src/backend/app/tests_pre_start.py b/src/backend/app/tests_pre_start.py index 3861908..a933602 100644 --- a/src/backend/app/tests_pre_start.py +++ b/src/backend/app/tests_pre_start.py @@ -3,7 +3,7 @@ import logging from sqlmodel import Session, select from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed -from app.db.engine import engine +from app.core.db import engine logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__)