refactor(arch): move auth schemas to tenancy module and add cross-module service methods
Some checks failed
CI / validate (push) Has been cancelled
CI / dependency-scanning (push) Has been cancelled
CI / docs (push) Has been cancelled
CI / deploy (push) Has been cancelled
CI / pytest (push) Has been cancelled
CI / ruff (push) Successful in 10s

Move all auth schemas (UserContext, UserLogin, LoginResponse, etc.) from
legacy models/schema/auth.py to app/modules/tenancy/schemas/auth.py per
MOD-019. Update 84 import sites across 14 modules. Legacy file now
re-exports for backwards compatibility.

Add missing tenancy service methods for cross-module consumers:
- merchant_service.get_merchant_by_owner_id()
- merchant_service.get_merchant_count_for_owner()
- admin_service.get_user_by_id() (public, was private-only)
- platform_service.get_active_store_count()

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-26 23:57:04 +01:00
parent f95db7c0b1
commit 4aa6f76e46
93 changed files with 599 additions and 427 deletions

View File

@@ -31,7 +31,7 @@ from app.modules.core.schemas.dashboard import (
)
from app.modules.core.services.stats_aggregator import stats_aggregator
from app.modules.core.services.widget_aggregator import widget_aggregator
from models.schema.auth import UserContext
from app.modules.tenancy.schemas.auth import UserContext
admin_dashboard_router = APIRouter(prefix="/dashboard")
logger = logging.getLogger(__name__)

View File

@@ -29,9 +29,9 @@ from app.api.deps import (
)
from app.modules.core.services.menu_service import MenuItemConfig, menu_service
from app.modules.enums import FrontendType # API-007 - Enum for type safety
from app.modules.tenancy.schemas.auth import UserContext
from app.modules.tenancy.services.platform_service import platform_service
from app.utils.i18n import DEFAULT_LANGUAGE, translate
from models.schema.auth import UserContext
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/menu-config")

View File

@@ -32,7 +32,7 @@ from app.modules.tenancy.schemas.admin import (
RowsPerPageResponse,
RowsPerPageUpdateResponse,
)
from models.schema.auth import UserContext
from app.modules.tenancy.schemas.auth import UserContext
admin_settings_router = APIRouter(prefix="/settings")
logger = logging.getLogger(__name__)

View File

@@ -20,8 +20,8 @@ from sqlalchemy.orm import Session
from app.api.deps import get_current_merchant_from_cookie_or_header, get_db
from app.modules.core.services.menu_service import menu_service
from app.modules.enums import FrontendType
from app.modules.tenancy.schemas.auth import UserContext
from app.utils.i18n import translate
from models.schema.auth import UserContext
logger = logging.getLogger(__name__)

View File

@@ -26,8 +26,8 @@ from app.modules.core.schemas.dashboard import (
)
from app.modules.core.services.stats_aggregator import stats_aggregator
from app.modules.tenancy.exceptions import StoreNotActiveException
from app.modules.tenancy.schemas.auth import UserContext
from app.modules.tenancy.services.store_service import store_service
from models.schema.auth import UserContext
store_dashboard_router = APIRouter(prefix="/dashboard")
logger = logging.getLogger(__name__)

View File

@@ -21,9 +21,9 @@ from app.api.deps import get_current_store_api, get_user_permissions
from app.core.database import get_db
from app.modules.core.services.menu_service import menu_service
from app.modules.enums import FrontendType
from app.modules.tenancy.schemas.auth import UserContext
from app.modules.tenancy.services.store_service import store_service
from app.utils.i18n import translate
from models.schema.auth import UserContext
logger = logging.getLogger(__name__)

View File

@@ -17,8 +17,8 @@ from app.core.database import get_db
from app.modules.core.services.platform_settings_service import (
platform_settings_service,
)
from app.modules.tenancy.schemas.auth import UserContext
from app.modules.tenancy.services.store_service import store_service
from models.schema.auth import UserContext
store_settings_router = APIRouter(prefix="/settings")
logger = logging.getLogger(__name__)

View File

@@ -22,8 +22,8 @@ from app.api.deps import (
)
from app.modules.core.utils.page_context import get_context_for_frontend
from app.modules.enums import FrontendType
from app.modules.tenancy.schemas.auth import UserContext
from app.templates_config import templates
from models.schema.auth import UserContext
ROUTE_CONFIG = {
"prefix": "",

View File

@@ -23,8 +23,8 @@ from app.modules.tenancy.exceptions import (
UserNotActiveException,
)
from app.modules.tenancy.models import Store, StoreUser, User
from app.modules.tenancy.schemas.auth import UserLogin
from middleware.auth import AuthManager
from models.schema.auth import UserLogin
logger = logging.getLogger(__name__)

View File

@@ -19,8 +19,8 @@ from app.modules.billing.models import (
)
from app.modules.customers.models.customer import Customer
from app.modules.tenancy.models import Merchant, Platform, Store, StoreUser, User
from app.modules.tenancy.schemas.auth import UserContext
from main import app
from models.schema.auth import UserContext
# ============================================================================
# Fixtures

View File

@@ -26,8 +26,8 @@ from app.modules.billing.models import (
)
from app.modules.tenancy.models import Merchant, Platform, User
from app.modules.tenancy.models.platform_module import PlatformModule
from app.modules.tenancy.schemas.auth import UserContext
from main import app
from models.schema.auth import UserContext
# ============================================================================
# Fixtures

View File

@@ -19,8 +19,8 @@ import pytest
from app.api.deps import get_current_store_from_cookie_or_header
from app.modules.tenancy.models import Merchant, Platform, Store, User
from app.modules.tenancy.models.store_platform import StorePlatform
from app.modules.tenancy.schemas.auth import UserContext
from main import app
from models.schema.auth import UserContext
# ============================================================================
# Fixtures