Renamed schemas to schema as per naming conventions

This commit is contained in:
2025-10-11 12:14:11 +02:00
parent 199be1f1b9
commit 1e2f211057
49 changed files with 285 additions and 3701 deletions

View File

@@ -15,7 +15,7 @@ from sqlalchemy.orm import Session
from app.core.database import get_db
from app.services.auth_service import auth_service
from app.exceptions import InvalidCredentialsException
from models.schemas.auth import LoginResponse, UserLogin
from models.schema.auth import LoginResponse, UserLogin
router = APIRouter()
logger = logging.getLogger(__name__)

View File

@@ -13,7 +13,7 @@ from app.core.database import get_db
from app.services.admin_service import admin_service
from app.services.stats_service import stats_service
from models.database.user import User
from models.schemas.stats import MarketplaceStatsResponse, StatsResponse
from models.schema.stats import MarketplaceStatsResponse, StatsResponse
router = APIRouter(prefix="/dashboard")
logger = logging.getLogger(__name__)

View File

@@ -12,7 +12,7 @@ from sqlalchemy.orm import Session
from app.api.deps import get_current_admin_user
from app.core.database import get_db
from app.services.admin_service import admin_service
from models.schemas.marketplace_import_job import MarketplaceImportJobResponse
from models.schema.marketplace_import_job import MarketplaceImportJobResponse
from models.database.user import User
router = APIRouter(prefix="/marketplace-import-jobs")

View File

@@ -12,7 +12,7 @@ from sqlalchemy.orm import Session
from app.api.deps import get_current_admin_user
from app.core.database import get_db
from app.services.admin_service import admin_service
from models.schemas.auth import UserResponse
from models.schema.auth import UserResponse
from models.database.user import User
router = APIRouter(prefix="/users")

View File

@@ -12,7 +12,7 @@ from sqlalchemy.orm import Session
from app.api.deps import get_current_admin_user
from app.core.database import get_db
from app.services.admin_service import admin_service
from models.schemas.vendor import VendorListResponse, VendorResponse, VendorCreate
from models.schema.vendor import VendorListResponse, VendorResponse, VendorCreate
from models.database.user import User
router = APIRouter(prefix="/vendors")

View File

@@ -15,8 +15,8 @@ from sqlalchemy.orm import Session
from app.core.database import get_db
from app.services.customer_service import customer_service
from app.exceptions import VendorNotFoundException
from models.schemas.auth import LoginResponse, UserLogin
from models.schemas.customer import CustomerRegister, CustomerResponse
from models.schema.auth import LoginResponse, UserLogin
from models.schema.customer import CustomerRegister, CustomerResponse
from models.database.vendor import Vendor
router = APIRouter()

View File

@@ -12,7 +12,7 @@ from sqlalchemy.orm import Session
from app.core.database import get_db
from app.services.order_service import order_service
from app.services.customer_service import customer_service
from models.schemas.order import (
from models.schema.order import (
OrderCreate,
OrderResponse,
OrderDetailResponse,

View File

@@ -11,7 +11,7 @@ from sqlalchemy.orm import Session
from app.core.database import get_db
from app.services.product_service import product_service
from models.schemas.product import ProductResponse, ProductDetailResponse, ProductListResponse
from models.schema.product import ProductResponse, ProductDetailResponse, ProductListResponse
from models.database.vendor import Vendor
router = APIRouter()

View File

@@ -16,7 +16,7 @@ from app.core.database import get_db
from app.services.auth_service import auth_service
from app.exceptions import InvalidCredentialsException
from middleware.vendor_context import get_current_vendor
from models.schemas.auth import LoginResponse, UserLogin
from models.schema.auth import LoginResponse, UserLogin
from models.database.vendor import Vendor
router = APIRouter()

View File

@@ -9,7 +9,7 @@ from app.api.deps import get_current_user
from app.core.database import get_db
from middleware.vendor_context import require_vendor_context
from app.services.inventory_service import inventory_service
from models.schemas.inventory import (
from models.schema.inventory import (
InventoryCreate,
InventoryAdjust,
InventoryUpdate,

View File

@@ -16,7 +16,7 @@ from middleware.vendor_context import require_vendor_context # IMPORTANT
from app.services.marketplace_import_job_service import marketplace_import_job_service
from app.tasks.background_tasks import process_marketplace_import
from middleware.decorators import rate_limit
from models.schemas.marketplace_import_job import (
from models.schema.marketplace_import_job import (
MarketplaceImportJobResponse,
MarketplaceImportJobRequest
)

View File

@@ -13,7 +13,7 @@ from app.api.deps import get_current_user
from app.core.database import get_db
from middleware.vendor_context import require_vendor_context
from app.services.order_service import order_service
from models.schemas.order import (
from models.schema.order import (
OrderResponse,
OrderDetailResponse,
OrderListResponse,

View File

@@ -13,7 +13,7 @@ from app.api.deps import get_current_user
from app.core.database import get_db
from middleware.vendor_context import require_vendor_context
from app.services.product_service import product_service
from models.schemas.product import (
from models.schema.product import (
ProductCreate,
ProductUpdate,
ProductResponse,

View File

@@ -20,8 +20,8 @@ from app.core.database import get_db
from middleware.vendor_context import require_vendor_context
from app.services.vendor_service import vendor_service
from app.services.team_service import team_service
from models.schemas.vendor import VendorUpdate, VendorResponse
from models.schemas.product import ProductResponse, ProductListResponse
from models.schema.vendor import VendorUpdate, VendorResponse
from models.schema.product import ProductResponse, ProductListResponse
from models.database.user import User
from models.database.vendor import Vendor
@@ -184,7 +184,7 @@ def add_product_to_catalog(
db: Session = Depends(get_db),
):
"""Add a product from marketplace to vendor catalog."""
from models.schemas.product import ProductCreate
from models.schema.product import ProductCreate
product_create = ProductCreate(**product_data)
return vendor_service.add_product_to_catalog(db, vendor, product_create)
@@ -212,7 +212,7 @@ def update_vendor_product(
):
"""Update product in vendor catalog."""
from app.services.product_service import product_service
from models.schemas.product import ProductUpdate
from models.schema.product import ProductUpdate
product_update_schema = ProductUpdate(**product_update)
return product_service.update_product(db, vendor.id, product_id, product_update_schema)

View File

@@ -29,8 +29,8 @@ from app.exceptions import (
AdminOperationException,
ValidationException,
)
from models.schemas.marketplace_import_job import MarketplaceImportJobResponse
from models.schemas.vendor import VendorCreate
from models.schema.marketplace_import_job import MarketplaceImportJobResponse
from models.schema.vendor import VendorCreate
from models.database.marketplace_import_job import MarketplaceImportJob
from models.database.vendor import Vendor, Role
from models.database.user import User

View File

@@ -20,7 +20,7 @@ from app.exceptions import (
ValidationException,
)
from middleware.auth import AuthManager
from models.schemas.auth import UserLogin, UserRegister
from models.schema.auth import UserLogin, UserRegister
from models.database.user import User
logger = logging.getLogger(__name__)

View File

@@ -14,8 +14,8 @@ from sqlalchemy import and_
from models.database.customer import Customer, CustomerAddress
from models.database.vendor import Vendor
from models.schemas.customer import CustomerRegister, CustomerUpdate
from models.schemas.auth import UserLogin
from models.schema.customer import CustomerRegister, CustomerUpdate
from models.schema.auth import UserLogin
from app.exceptions.customer import (
CustomerNotFoundException,
CustomerAlreadyExistsException,

View File

@@ -15,7 +15,7 @@ from app.exceptions import (
ValidationException,
ProductNotFoundException,
)
from models.schemas.inventory import (
from models.schema.inventory import (
InventoryCreate,
InventoryAdjust,
InventoryUpdate,

View File

@@ -12,7 +12,7 @@ from app.exceptions import (
ImportJobCannotBeDeletedException,
ValidationException,
)
from models.schemas.marketplace_import_job import (
from models.schema.marketplace_import_job import (
MarketplaceImportJobResponse,
MarketplaceImportJobRequest
)

View File

@@ -25,8 +25,8 @@ from app.exceptions import (
ValidationException,
)
from app.services.marketplace_import_job_service import marketplace_import_job_service
from models.schemas.marketplace_product import MarketplaceProductCreate, MarketplaceProductUpdate
from models.schemas.inventory import InventoryLocationResponse, InventorySummaryResponse
from models.schema.marketplace_product import MarketplaceProductCreate, MarketplaceProductUpdate
from models.schema.inventory import InventoryLocationResponse, InventorySummaryResponse
from models.database.marketplace_product import MarketplaceProduct
from models.database.inventory import Inventory
from app.utils.data_processing import GTINProcessor, PriceProcessor

View File

@@ -20,7 +20,7 @@ from sqlalchemy import and_, or_
from models.database.order import Order, OrderItem
from models.database.customer import Customer, CustomerAddress
from models.database.product import Product
from models.schemas.order import OrderCreate, OrderUpdate, OrderAddressCreate
from models.schema.order import OrderCreate, OrderUpdate, OrderAddressCreate
from app.exceptions import (
OrderNotFoundException,
ValidationException,

View File

@@ -19,7 +19,7 @@ from app.exceptions import (
ProductAlreadyExistsException,
ValidationException,
)
from models.schemas.product import ProductCreate, ProductUpdate
from models.schema.product import ProductCreate, ProductUpdate
from models.database.product import Product
from models.database.marketplace_product import MarketplaceProduct

View File

@@ -25,8 +25,8 @@ from app.exceptions import (
MaxVendorsReachedException,
ValidationException,
)
from models.schemas.vendor import VendorCreate
from models.schemas.product import ProductCreate
from models.schema.vendor import VendorCreate
from models.schema.product import ProductCreate
from models.database.marketplace_product import MarketplaceProduct
from models.database.vendor import Vendor
from models.database.product import Product