refactor: migrate schemas to canonical module locations

Migrate remaining legacy schemas to their respective modules:

Marketplace module (app/modules/marketplace/schemas/):
- letzshop.py: Letzshop credentials, orders, fulfillment, sync
- onboarding.py: Vendor onboarding wizard schemas

Catalog module (app/modules/catalog/schemas/):
- product.py: ProductCreate, ProductUpdate, ProductResponse

Payments module (app/modules/payments/schemas/):
- payment.py: PaymentConfig, Stripe, transactions, balance

Delete legacy files:
- models/schema/letzshop.py
- models/schema/onboarding.py
- models/schema/product.py
- models/schema/payment.py
- models/schema/marketplace_product.py (re-export)
- models/schema/marketplace_import_job.py (re-export)
- models/schema/search.py (empty)

Update imports across 19 files to use canonical locations.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

app/api/v1/admin/letzshop.py

@@ -33,7 +33,7 @@ from app.services.letzshop import (
 )
 from app.tasks.letzshop_tasks import process_historical_import
 from models.database.user import User
-from models.schema.letzshop import (
+from app.modules.marketplace.schemas import (
     FulfillmentOperationResponse,
     LetzshopCachedVendorDetail,
     LetzshopCachedVendorDetailResponse,

app/api/v1/admin/marketplace.py

@@ -15,7 +15,7 @@ from app.services.stats_service import stats_service
 from app.services.vendor_service import vendor_service
 from app.tasks.background_tasks import process_marketplace_import
 from models.database.user import User
-from models.schema.marketplace_import_job import (
+from app.modules.marketplace.schemas import (
     AdminMarketplaceImportJobListResponse,
     AdminMarketplaceImportJobRequest,
     AdminMarketplaceImportJobResponse,

app/api/v1/vendor/letzshop.py

@@ -32,7 +32,7 @@ from app.services.letzshop import (
     OrderNotFoundError,
 )
 from models.database.user import User
-from models.schema.letzshop import (
+from app.modules.marketplace.schemas import (
     FulfillmentConfirmRequest,
     FulfillmentOperationResponse,
     FulfillmentQueueItemResponse,

app/api/v1/vendor/marketplace.py

@@ -18,7 +18,7 @@ from app.services.vendor_service import vendor_service
 from app.tasks.background_tasks import process_marketplace_import
 from middleware.decorators import rate_limit
 from models.database.user import User
-from models.schema.marketplace_import_job import (
+from app.modules.marketplace.schemas import (
     MarketplaceImportJobRequest,
     MarketplaceImportJobResponse,
 )

app/api/v1/vendor/onboarding.py

@@ -21,7 +21,7 @@ from app.core.database import get_db
 from app.services.onboarding_service import OnboardingService
 from app.tasks.letzshop_tasks import process_historical_import
 from models.database.user import User
-from models.schema.onboarding import (
+from app.modules.marketplace.schemas import (
     CompanyProfileRequest,
     CompanyProfileResponse,
     LetzshopApiConfigRequest,

app/api/v1/vendor/payments.py

@@ -15,14 +15,14 @@ from app.api.deps import get_current_vendor_api
 from app.core.database import get_db
 from app.services.vendor_service import vendor_service
 from models.database.user import User
-from models.schema.payment import (
+from app.modules.payments.schemas import (
     PaymentBalanceResponse,
     PaymentConfigResponse,
     PaymentConfigUpdate,
     PaymentConfigUpdateResponse,
     PaymentMethodsResponse,
-    RefundRequest,
+    PaymentRefundRequest as RefundRequest,
-    RefundResponse,
+    PaymentRefundResponse as RefundResponse,
     StripeConnectRequest,
     StripeConnectResponse,
     StripeDisconnectResponse,

app/api/v1/vendor/products.py

@@ -17,7 +17,7 @@ from app.services.product_service import product_service
 from app.services.subscription_service import subscription_service
 from app.services.vendor_product_service import vendor_product_service
 from models.database.user import User
-from models.schema.product import (
+from app.modules.catalog.schemas import (
     ProductCreate,
     ProductDeleteResponse,
     ProductDetailResponse,

app/modules/catalog/schemas/__init__.py

@@ -2,13 +2,31 @@
 """Catalog module schemas."""
 
 from app.modules.catalog.schemas.catalog import (
+    ProductDetailResponse as CatalogProductDetailResponse,
+    ProductListResponse as CatalogProductListResponse,
+    ProductResponse as CatalogProductResponse,
+)
+from app.modules.catalog.schemas.product import (
+    ProductCreate,
+    ProductUpdate,
+    ProductResponse,
     ProductDetailResponse,
     ProductListResponse,
-    ProductResponse,
+    ProductDeleteResponse,
+    ProductToggleResponse,
 )
 
 __all__ = [
+    # Catalog browsing schemas (storefront)
+    "CatalogProductResponse",
+    "CatalogProductDetailResponse",
+    "CatalogProductListResponse",
+    # Product CRUD schemas (vendor management)
+    "ProductCreate",
+    "ProductUpdate",
     "ProductResponse",
     "ProductDetailResponse",
     "ProductListResponse",
+    "ProductDeleteResponse",
+    "ProductToggleResponse",
 ]

app/modules/catalog/schemas/catalog.py

@@ -11,7 +11,7 @@ from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field
 
 from app.modules.inventory.schemas import InventoryLocationResponse
-from models.schema.marketplace_product import MarketplaceProductResponse
+from app.modules.marketplace.schemas import MarketplaceProductResponse
 
 
 class ProductResponse(BaseModel):

app/modules/catalog/schemas/product.py

@@ -1,10 +1,17 @@
-# models/schema/product.py
+# app/modules/catalog/schemas/product.py
+"""
+Pydantic schemas for Product CRUD operations.
+
+These schemas are used for vendor product catalog management,
+linking vendor products to marketplace products.
+"""
+
 from datetime import datetime
 
 from pydantic import BaseModel, ConfigDict, Field
 
 from app.modules.inventory.schemas import InventoryLocationResponse
-from models.schema.marketplace_product import MarketplaceProductResponse
+from app.modules.marketplace.schemas import MarketplaceProductResponse
 
 
 class ProductCreate(BaseModel):

app/modules/marketplace/schemas/__init__.py

@@ -39,6 +39,83 @@ from app.modules.marketplace.schemas.marketplace_product import (
     MarketplaceImportRequest,
     MarketplaceImportResponse,
 )
+from app.modules.marketplace.schemas.letzshop import (
+    # Credentials
+    LetzshopCredentialsCreate,
+    LetzshopCredentialsUpdate,
+    LetzshopCredentialsResponse,
+    LetzshopCredentialsStatus,
+    # Orders
+    LetzshopOrderItemResponse,
+    LetzshopOrderResponse,
+    LetzshopOrderDetailResponse,
+    LetzshopOrderStats,
+    LetzshopOrderListResponse,
+    # Fulfillment
+    FulfillmentConfirmRequest,
+    FulfillmentRejectRequest,
+    FulfillmentTrackingRequest,
+    FulfillmentQueueItemResponse,
+    FulfillmentQueueListResponse,
+    FulfillmentOperationResponse,
+    # Sync
+    LetzshopSyncLogResponse,
+    LetzshopSyncLogListResponse,
+    LetzshopSyncTriggerRequest,
+    LetzshopSyncTriggerResponse,
+    # Connection
+    LetzshopConnectionTestRequest,
+    LetzshopConnectionTestResponse,
+    LetzshopSuccessResponse,
+    # Admin
+    LetzshopVendorOverview,
+    LetzshopVendorListResponse,
+    # Jobs
+    LetzshopJobItem,
+    LetzshopJobsListResponse,
+    # Historical Import
+    LetzshopHistoricalImportJobResponse,
+    LetzshopHistoricalImportStartResponse,
+    # Vendor Directory
+    LetzshopCachedVendorItem,
+    LetzshopCachedVendorDetail,
+    LetzshopVendorDirectoryStats,
+    LetzshopVendorDirectoryStatsResponse,
+    LetzshopCachedVendorListResponse,
+    LetzshopCachedVendorDetailResponse,
+    LetzshopVendorDirectorySyncResponse,
+    LetzshopCreateVendorFromCacheResponse,
+)
+from app.modules.marketplace.schemas.onboarding import (
+    # Step status
+    StepStatus,
+    CompanyProfileStepStatus,
+    LetzshopApiStepStatus,
+    ProductImportStepStatus,
+    OrderSyncStepStatus,
+    # Main status
+    OnboardingStatusResponse,
+    # Step 1
+    CompanyProfileRequest,
+    CompanyProfileResponse,
+    # Step 2
+    LetzshopApiConfigRequest,
+    LetzshopApiTestRequest,
+    LetzshopApiTestResponse,
+    LetzshopApiConfigResponse,
+    # Step 3
+    ProductImportConfigRequest,
+    ProductImportConfigResponse,
+    # Step 4
+    OrderSyncTriggerRequest,
+    OrderSyncTriggerResponse,
+    OrderSyncProgressResponse,
+    OrderSyncCompleteRequest,
+    OrderSyncCompleteResponse,
+    # Admin
+    OnboardingSkipRequest,
+    OnboardingSkipResponse,
+)
 
 __all__ = [
     # Import job schemas
@@ -62,4 +139,77 @@ __all__ = [
     # Import schemas
     "MarketplaceImportRequest",
     "MarketplaceImportResponse",
+    # Letzshop - Credentials
+    "LetzshopCredentialsCreate",
+    "LetzshopCredentialsUpdate",
+    "LetzshopCredentialsResponse",
+    "LetzshopCredentialsStatus",
+    # Letzshop - Orders
+    "LetzshopOrderItemResponse",
+    "LetzshopOrderResponse",
+    "LetzshopOrderDetailResponse",
+    "LetzshopOrderStats",
+    "LetzshopOrderListResponse",
+    # Letzshop - Fulfillment
+    "FulfillmentConfirmRequest",
+    "FulfillmentRejectRequest",
+    "FulfillmentTrackingRequest",
+    "FulfillmentQueueItemResponse",
+    "FulfillmentQueueListResponse",
+    "FulfillmentOperationResponse",
+    # Letzshop - Sync
+    "LetzshopSyncLogResponse",
+    "LetzshopSyncLogListResponse",
+    "LetzshopSyncTriggerRequest",
+    "LetzshopSyncTriggerResponse",
+    # Letzshop - Connection
+    "LetzshopConnectionTestRequest",
+    "LetzshopConnectionTestResponse",
+    "LetzshopSuccessResponse",
+    # Letzshop - Admin
+    "LetzshopVendorOverview",
+    "LetzshopVendorListResponse",
+    # Letzshop - Jobs
+    "LetzshopJobItem",
+    "LetzshopJobsListResponse",
+    # Letzshop - Historical Import
+    "LetzshopHistoricalImportJobResponse",
+    "LetzshopHistoricalImportStartResponse",
+    # Letzshop - Vendor Directory
+    "LetzshopCachedVendorItem",
+    "LetzshopCachedVendorDetail",
+    "LetzshopVendorDirectoryStats",
+    "LetzshopVendorDirectoryStatsResponse",
+    "LetzshopCachedVendorListResponse",
+    "LetzshopCachedVendorDetailResponse",
+    "LetzshopVendorDirectorySyncResponse",
+    "LetzshopCreateVendorFromCacheResponse",
+    # Onboarding - Step status
+    "StepStatus",
+    "CompanyProfileStepStatus",
+    "LetzshopApiStepStatus",
+    "ProductImportStepStatus",
+    "OrderSyncStepStatus",
+    # Onboarding - Main status
+    "OnboardingStatusResponse",
+    # Onboarding - Step 1
+    "CompanyProfileRequest",
+    "CompanyProfileResponse",
+    # Onboarding - Step 2
+    "LetzshopApiConfigRequest",
+    "LetzshopApiTestRequest",
+    "LetzshopApiTestResponse",
+    "LetzshopApiConfigResponse",
+    # Onboarding - Step 3
+    "ProductImportConfigRequest",
+    "ProductImportConfigResponse",
+    # Onboarding - Step 4
+    "OrderSyncTriggerRequest",
+    "OrderSyncTriggerResponse",
+    "OrderSyncProgressResponse",
+    "OrderSyncCompleteRequest",
+    "OrderSyncCompleteResponse",
+    # Onboarding - Admin
+    "OnboardingSkipRequest",
+    "OnboardingSkipResponse",
 ]

app/modules/marketplace/schemas/letzshop.py

@@ -1,4 +1,4 @@
-# models/schema/letzshop.py
+# app/modules/marketplace/schemas/letzshop.py
 """
 Pydantic schemas for Letzshop marketplace integration.
 

app/modules/marketplace/schemas/onboarding.py

@@ -1,4 +1,4 @@
-# models/schema/onboarding.py
+# app/modules/marketplace/schemas/onboarding.py
 """
 Pydantic schemas for Vendor Onboarding operations.
 

app/modules/marketplace/services/marketplace_import_job_service.py

@@ -14,7 +14,7 @@ from app.modules.marketplace.models import (
 )
 from models.database.user import User
 from models.database.vendor import Vendor
-from models.schema.marketplace_import_job import (
+from app.modules.marketplace.schemas import (
     AdminMarketplaceImportJobResponse,
     MarketplaceImportJobRequest,
     MarketplaceImportJobResponse,

app/modules/marketplace/services/marketplace_product_service.py

@@ -36,7 +36,7 @@ from app.modules.marketplace.models import (
     MarketplaceProductTranslation,
 )
 from app.modules.inventory.schemas import InventoryLocationResponse, InventorySummaryResponse
-from models.schema.marketplace_product import (
+from app.modules.marketplace.schemas import (
     MarketplaceProductCreate,
     MarketplaceProductUpdate,
 )

app/modules/payments/schemas/__init__.py

@@ -3,10 +3,33 @@
 Payments module Pydantic schemas.
 """
 
-from pydantic import BaseModel, Field
 from datetime import datetime
 from typing import Any
 
+from pydantic import BaseModel, Field
+
+from app.modules.payments.schemas.payment import (
+    # Configuration
+    PaymentConfigResponse,
+    PaymentConfigUpdate,
+    PaymentConfigUpdateResponse,
+    # Stripe
+    StripeConnectRequest,
+    StripeConnectResponse,
+    StripeDisconnectResponse,
+    # Methods
+    PaymentMethodInfo,
+    PaymentMethodsResponse,
+    # Transactions
+    TransactionInfo,
+    TransactionsResponse,
+    # Balance
+    PaymentBalanceResponse,
+    # Refunds (config version)
+    PaymentRefundRequest,
+    PaymentRefundResponse,
+)
+
 
 class PaymentRequest(BaseModel):
     """Request to process a payment."""
@@ -83,6 +106,7 @@ class GatewayResponse(BaseModel):
 
 
 __all__ = [
+    # Core payment schemas
     "PaymentRequest",
     "PaymentResponse",
     "RefundRequest",
@@ -90,4 +114,23 @@ __all__ = [
     "PaymentMethodCreate",
     "PaymentMethodResponse",
     "GatewayResponse",
+    # Configuration schemas
+    "PaymentConfigResponse",
+    "PaymentConfigUpdate",
+    "PaymentConfigUpdateResponse",
+    # Stripe integration
+    "StripeConnectRequest",
+    "StripeConnectResponse",
+    "StripeDisconnectResponse",
+    # Payment methods info
+    "PaymentMethodInfo",
+    "PaymentMethodsResponse",
+    # Transactions
+    "TransactionInfo",
+    "TransactionsResponse",
+    # Balance
+    "PaymentBalanceResponse",
+    # Refunds (config version)
+    "PaymentRefundRequest",
+    "PaymentRefundResponse",
 ]

app/modules/payments/schemas/payment.py

@@ -1,4 +1,4 @@
-# models/schema/payment.py
+# app/modules/payments/schemas/payment.py
 """
 Payment Pydantic schemas for API validation and responses.
 
@@ -144,12 +144,12 @@ class PaymentBalanceResponse(BaseModel):
 
 
 # ============================================================================
-# REFUND SCHEMAS
+# REFUND SCHEMAS (for payment config endpoints)
 # ============================================================================
 
 
-class RefundRequest(BaseModel):
+class PaymentRefundRequest(BaseModel):
-    """Request model for processing a refund."""
+    """Request model for processing a refund (payment module version)."""
 
     amount: float | None = Field(
         None, gt=0, description="Partial refund amount, or None for full refund"
@@ -157,8 +157,8 @@ class RefundRequest(BaseModel):
     reason: str | None = Field(None, max_length=500)
 
 
-class RefundResponse(BaseModel):
+class PaymentRefundResponse(BaseModel):
-    """Response for refund operation."""
+    """Response for refund operation (payment module version)."""
 
     refund_id: int | None = None
     payment_id: int | None = None

app/services/admin_service.py

@@ -37,7 +37,7 @@ from app.modules.marketplace.models import MarketplaceImportJob
 from models.database.platform import Platform
 from models.database.user import User
 from models.database.vendor import Role, Vendor
-from models.schema.marketplace_import_job import MarketplaceImportJobResponse
+from app.modules.marketplace.schemas import MarketplaceImportJobResponse
 from models.schema.vendor import VendorCreate
 
 logger = logging.getLogger(__name__)

app/services/product_service.py

@@ -20,7 +20,7 @@ from app.exceptions import (
 )
 from app.modules.marketplace.models import MarketplaceProduct
 from app.modules.catalog.models import Product
-from models.schema.product import ProductCreate, ProductUpdate
+from app.modules.catalog.schemas import ProductCreate, ProductUpdate
 
 logger = logging.getLogger(__name__)
 

app/services/vendor_service.py

@@ -27,7 +27,7 @@ from app.modules.marketplace.models import MarketplaceProduct
 from app.modules.catalog.models import Product
 from models.database.user import User
 from models.database.vendor import Vendor
-from models.schema.product import ProductCreate
+from app.modules.catalog.schemas import ProductCreate
 from models.schema.vendor import VendorCreate
 
 logger = logging.getLogger(__name__)

docs/backend/overview.md

@@ -89,7 +89,7 @@ from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session
 from app.core.database import get_db
 from app.services.product_service import product_service
-from models.schema.product import ProductCreate, ProductResponse
+from app.modules.catalog.schemas import ProductCreate, ProductResponse
 
 router = APIRouter(prefix="/products")
 

models/schema/__init__.py

@@ -7,6 +7,9 @@ Note: Many schemas have been migrated to their respective modules:
 - Inventory schemas: app.modules.inventory.schemas
 - Message schemas: app.modules.messaging.schemas
 - Cart schemas: app.modules.cart.schemas
+- Marketplace schemas: app.modules.marketplace.schemas
+- Catalog/Product schemas: app.modules.catalog.schemas
+- Payment schemas: app.modules.payments.schemas
 """
 
 # Import API model modules that remain in legacy location
@@ -14,9 +17,6 @@ from . import (
     auth,
     base,
     email,
-    marketplace_import_job,
-    marketplace_product,
-    onboarding,
     vendor,
 )
 
@@ -27,8 +27,5 @@ __all__ = [
     "base",
     "auth",
     "email",
-    "marketplace_product",
-    "onboarding",
     "vendor",
-    "marketplace_import_job",
 ]

models/schema/marketplace_import_job.py

@@ -1,39 +0,0 @@
-# models/schema/marketplace_import_job.py
-"""
-Legacy location for marketplace import job schemas.
-
-MIGRATED: All schemas have been moved to app.modules.marketplace.schemas.marketplace_import_job.
-
-New location:
-    from app.modules.marketplace.schemas import (
-        MarketplaceImportJobRequest,
-        MarketplaceImportJobResponse,
-    )
-
-This file re-exports from the new location for backward compatibility.
-"""
-
-# Re-export everything from the new canonical location
-from app.modules.marketplace.schemas.marketplace_import_job import (
-    MarketplaceImportJobRequest,
-    AdminMarketplaceImportJobRequest,
-    MarketplaceImportJobResponse,
-    MarketplaceImportJobListResponse,
-    MarketplaceImportErrorResponse,
-    MarketplaceImportErrorListResponse,
-    AdminMarketplaceImportJobResponse,
-    AdminMarketplaceImportJobListResponse,
-    MarketplaceImportJobStatusUpdate,
-)
-
-__all__ = [
-    "MarketplaceImportJobRequest",
-    "AdminMarketplaceImportJobRequest",
-    "MarketplaceImportJobResponse",
-    "MarketplaceImportJobListResponse",
-    "MarketplaceImportErrorResponse",
-    "MarketplaceImportErrorListResponse",
-    "AdminMarketplaceImportJobResponse",
-    "AdminMarketplaceImportJobListResponse",
-    "MarketplaceImportJobStatusUpdate",
-]

models/schema/marketplace_product.py

@@ -1,45 +0,0 @@
-# models/schema/marketplace_product.py
-"""
-Legacy location for marketplace product schemas.
-
-MIGRATED: All schemas have been moved to app.modules.marketplace.schemas.marketplace_product.
-
-New location:
-    from app.modules.marketplace.schemas import (
-        MarketplaceProductCreate,
-        MarketplaceProductResponse,
-        MarketplaceProductTranslationSchema,
-    )
-
-This file re-exports from the new location for backward compatibility.
-"""
-
-# Re-export everything from the new canonical location
-from app.modules.marketplace.schemas.marketplace_product import (
-    # Translation schemas
-    MarketplaceProductTranslationSchema,
-    # Base schemas
-    MarketplaceProductBase,
-    # CRUD schemas
-    MarketplaceProductCreate,
-    MarketplaceProductUpdate,
-    # Response schemas
-    MarketplaceProductResponse,
-    MarketplaceProductListResponse,
-    MarketplaceProductDetailResponse,
-    # Import schemas
-    MarketplaceImportRequest,
-    MarketplaceImportResponse,
-)
-
-__all__ = [
-    "MarketplaceProductTranslationSchema",
-    "MarketplaceProductBase",
-    "MarketplaceProductCreate",
-    "MarketplaceProductUpdate",
-    "MarketplaceProductResponse",
-    "MarketplaceProductListResponse",
-    "MarketplaceProductDetailResponse",
-    "MarketplaceImportRequest",
-    "MarketplaceImportResponse",
-]

models/schema/search.py

@@ -1 +0,0 @@
-# Search models

tests/unit/models/schema/test_marketplace_import_job.py

@@ -4,7 +4,7 @@
 import pytest
 from pydantic import ValidationError
 
-from models.schema.marketplace_import_job import (
+from app.modules.marketplace.schemas import (
     MarketplaceImportJobListResponse,
     MarketplaceImportJobRequest,
     MarketplaceImportJobResponse,

tests/unit/models/schema/test_product.py

@@ -4,7 +4,7 @@
 import pytest
 from pydantic import ValidationError
 
-from models.schema.product import (
+from app.modules.catalog.schemas import (
     ProductCreate,
     ProductListResponse,
     ProductResponse,

tests/unit/services/test_marketplace_product_service.py

@@ -30,7 +30,7 @@ from app.modules.marketplace.models import (
     MarketplaceProduct,
     MarketplaceProductTranslation,
 )
-from models.schema.marketplace_product import (
+from app.modules.marketplace.schemas import (
     MarketplaceProductCreate,
     MarketplaceProductUpdate,
 )

tests/unit/services/test_marketplace_service.py

@@ -13,7 +13,7 @@ from app.exceptions.marketplace_import_job import (
 from app.exceptions.vendor import UnauthorizedVendorAccessException
 from app.services.marketplace_import_job_service import MarketplaceImportJobService
 from app.modules.marketplace.models import MarketplaceImportJob
-from models.schema.marketplace_import_job import MarketplaceImportJobRequest
+from app.modules.marketplace.schemas import MarketplaceImportJobRequest
 
 
 @pytest.mark.unit

tests/unit/services/test_product_service.py

@@ -8,7 +8,7 @@ from app.exceptions import (
     MarketplaceProductValidationException,
 )
 from app.services.marketplace_product_service import MarketplaceProductService
-from models.schema.marketplace_product import (
+from app.modules.marketplace.schemas import (
     MarketplaceProductCreate,
     MarketplaceProductUpdate,
 )

tests/unit/services/test_vendor_service.py

@@ -17,7 +17,7 @@ from app.exceptions import (
 from app.services.vendor_service import VendorService
 from models.database.company import Company
 from models.database.vendor import Vendor
-from models.schema.product import ProductCreate
+from app.modules.catalog.schemas import ProductCreate
 from models.schema.vendor import VendorCreate