Merge pull request #13 from getmarkus/cm-branch-11

refactor: move repositories and use cases to core layer

Author: getmarkus

config.py

@@ -17,7 +17,8 @@ class Settings(BaseSettings):
     env_smoke_test: str = ""
     project_name: str = ""
     database_url: str = "sqlite:///./issues.db"
-    migrate_database: bool = True
+    #database_url: str = "sqlite://"
+    migrate_database: bool = False
     # BACKEND_CORS_ORIGINS is a JSON-formatted list of origins
     # e.g: '["http://localhost", "http://localhost:4200", "http://localhost:3000", \
     # "http://localhost:8080", "http://local.dockertoolbox.tiangolo.com"]'

main.py

@@ -1,5 +1,4 @@
 import datetime
-import os
 import uuid
 from contextlib import asynccontextmanager
 from typing import Annotated, Any, Dict, Optional
@@ -14,13 +13,12 @@
 from src.interface_adapters import api_router
 from src.interface_adapters.exceptions import AppException
 from src.interface_adapters.middleware.error_handler import app_exception_handler
+from src.resource_adapters.persistence.sqlmodel.database import get_engine
 
 # https://brandur.org/logfmt
 # https://github.com/Delgan/loguru
 # https://betterstack.com/community/guides/logging/loguru/
 
-env = os.getenv("PYTHON_TEMPLATE_ENV", ".env")
-
 def isRunning() -> bool:
     #logger.info(f"App state: {dict(app.state.__dict__)}")
     running = getattr(app.state, "running", False)
@@ -31,6 +29,10 @@ def isRunning() -> bool:
 # https://fastapi.tiangolo.com/advanced/events/
 @asynccontextmanager
 async def lifespan(app: FastAPI):
+
+    # Initialize database if using SQLModel
+    get_engine()
+
     app.state.running = True
     logger.info("Lifespan started")
     logger.info(f"App state: {dict(app.state.__dict__)}")

src/interface_adapters/inbox/__init__.py src/core/__init__.pysrc/interface_adapters/inbox/__init__.py renamed to src/core/__init__.py

@@ -2,7 +2,7 @@
 
 from loguru import logger
 
-from src.app.ports.repositories.issues import IssueRepository
+from src.core.ports.repositories.issues import IssueRepository
 from src.domain.issue import Issue
 from src.interface_adapters.exceptions import NotFoundException