Merge pull request #7 from CarterPerez-dev/refactor/ddd-di-and-miniaml-folder-addition

Refactor/ddd di and minimal folder addition

Author: CarterPerez-dev

.github/workflows/lint.yml

@@ -47,7 +47,7 @@ jobs:
       id: pylint
       run: |
         echo "Running pylint..."
-        if pylint src > pylint-output.txt 2>&1; then
+        if pylint app > pylint-output.txt 2>&1; then
           echo "PYLINT_PASSED=true" >> $GITHUB_ENV
           echo "No pylint errors found!"
         else
@@ -61,7 +61,7 @@ jobs:
       id: ruff
       run: |
         echo "Running ruff check..."
-        if ruff check . > ruff-output.txt 2>&1; then
+        if ruff check app > ruff-output.txt 2>&1; then
           echo "RUFF_PASSED=true" >> $GITHUB_ENV
           echo "No ruff errors found!"
         else
@@ -75,14 +75,15 @@ jobs:
       id: mypy
       run: |
         echo "Running mypy..."
-        if mypy . > mypy-output.txt 2>&1; then
+        cd app
+        if mypy . > ../mypy-output.txt 2>&1; then
           echo "MYPY_PASSED=true" >> $GITHUB_ENV
           echo "No mypy errors found"
         else
           echo "MYPY_PASSED=false" >> $GITHUB_ENV
           echo "Mypy found issues"
         fi
-        cat mypy-output.txt
+        cat ../mypy-output.txt
       continue-on-error: true
 
     - name: Create Lint Summary

.gitignore

@@ -6,7 +6,6 @@ venv
 *.env
 *.cache
 *.egg
-.angela
 
 __pycache__/
 *.py[cod]

backend/alembic/env.py

@@ -10,9 +10,11 @@
 from sqlalchemy.engine import Connection
 from sqlalchemy.ext.asyncio import async_engine_from_config
 
-from src.config import settings
-from src.models import Base
-from src.core.enums import SafeEnum
+from config import settings
+from core.Base import Base
+from core.enums import SafeEnum
+from user.User import User
+from auth.RefreshToken import RefreshToken
 
 
 config = context.config

backend/src/__init__.py backend/app/__init__.pybackend/src/__init__.py renamed to backend/app/__init__.py

@@ -4,15 +4,15 @@
 """
 import uvicorn
 
-from src.config import settings
-from src.factory import create_app
+from config import settings
+from factory import create_app
 
 
 app = create_app()
 
 if __name__ == "__main__":
     uvicorn.run(
-        "src.__main__:app",
+        "__main__:app",
         host = settings.HOST,
         port = settings.PORT,
         reload = settings.RELOAD,

backend/src/__main__.py backend/app/__main__.pybackend/src/__main__.py renamed to backend/app/__main__.py

@@ -1,6 +1,6 @@
 """
 ⒸAngelaMos | 2025
-admin.py
+routes.py
 """
 
 from uuid import UUID
@@ -13,28 +13,25 @@
     status,
 )
 
-from src.config import (
+from config import (
     settings,
     UserRole,
 )
-from src.core.dependencies import (
-    DBSession,
-    RequireRole,
-)
-from src.core.responses import (
+from core.dependencies import RequireRole
+from core.responses import (
     AUTH_401,
     CONFLICT_409,
     FORBIDDEN_403,
     NOT_FOUND_404,
 )
-from src.schemas.user import (
+from user.schemas import (
     AdminUserCreate,
     UserListResponse,
     UserResponse,
     UserUpdateAdmin,
 )
-from src.models.User import User
-from src.services.user import UserService
+from user.User import User
+from user.dependencies import UserServiceDep
 
 
 router = APIRouter(prefix = "/admin", tags = ["admin"])
@@ -51,7 +48,7 @@
     },
 )
 async def list_users(
-    db: DBSession,
+    user_service: UserServiceDep,
     _: AdminOnly,
     page: int = Query(default = 1,
                       ge = 1),
@@ -64,7 +61,7 @@ async def list_users(
     """
     List all users (admin only)
     """
-    return await UserService.list_users(db, page, size)
+    return await user_service.list_users(page, size)
 
 
 @router.post(
@@ -78,14 +75,14 @@ async def list_users(
     },
 )
 async def create_user(
-    db: DBSession,
+    user_service: UserServiceDep,
     _: AdminOnly,
     user_data: AdminUserCreate,
 ) -> UserResponse:
     """
     Create a new user (admin only, bypasses registration)
     """
-    return await UserService.admin_create_user(db, user_data)
+    return await user_service.admin_create_user(user_data)
 
 
 @router.get(
@@ -98,14 +95,14 @@ async def create_user(
     },
 )
 async def get_user(
-    db: DBSession,
+    user_service: UserServiceDep,
     _: AdminOnly,
     user_id: UUID,
 ) -> UserResponse:
     """
     Get user by ID (admin only)
     """
-    return await UserService.get_user_by_id(db, user_id)
+    return await user_service.get_user_by_id(user_id)
 
 
 @router.patch(
@@ -119,15 +116,15 @@ async def get_user(
     },
 )
 async def update_user(
-    db: DBSession,
+    user_service: UserServiceDep,
     _: AdminOnly,
     user_id: UUID,
     user_data: UserUpdateAdmin,
 ) -> UserResponse:
     """
     Update user (admin only)
     """
-    return await UserService.admin_update_user(db, user_id, user_data)
+    return await user_service.admin_update_user(user_id, user_data)
 
 
 @router.delete(
@@ -140,11 +137,11 @@ async def update_user(
     },
 )
 async def delete_user(
-    db: DBSession,
+    user_service: UserServiceDep,
     _: AdminOnly,
     user_id: UUID,
 ) -> None:
     """
     Delete user (admin only, hard delete)
     """
-    await UserService.admin_delete_user(db, user_id)
+    await user_service.admin_delete_user(user_id)

backend/app/admin/__init__.py

@@ -21,20 +21,20 @@
     relationship,
 )
 
-from src.config import (
+from config import (
     DEVICE_ID_MAX_LENGTH,
     DEVICE_NAME_MAX_LENGTH,
     IP_ADDRESS_MAX_LENGTH,
     TOKEN_HASH_LENGTH,
 )
-from src.models.Base import (
+from core.Base import (
     Base,
     TimestampMixin,
     UUIDMixin,
 )
 
 if TYPE_CHECKING:
-    from src.models.User import User
+    from user.User import User
 
 
 class RefreshToken(Base, UUIDMixin, TimestampMixin):