From 2559b4693586f6fab99527531e5bc0875ca128de Mon Sep 17 00:00:00 2001 From: Samir Boulahtit Date: Fri, 30 Jan 2026 08:36:33 +0100 Subject: [PATCH] refactor: update admin/vendor API imports to use module locations Update all admin and vendor API routes to import schemas from canonical module locations instead of legacy re-export files: - messages: use app.modules.messaging.models/schemas - customers: use app.modules.customers.schemas - orders: use app.modules.orders.schemas - inventory: use app.modules.inventory.schemas - invoices: use app.modules.orders.schemas Co-Authored-By: Claude Opus 4.5 --- app/api/v1/admin/customers.py | 2 +- app/api/v1/admin/inventory.py | 2 +- app/api/v1/admin/messages.py | 8 ++++---- app/api/v1/admin/order_item_exceptions.py | 2 +- app/api/v1/admin/orders.py | 2 +- app/api/v1/vendor/customers.py | 2 +- app/api/v1/vendor/inventory.py | 2 +- app/api/v1/vendor/invoices.py | 2 +- app/api/v1/vendor/messages.py | 8 ++++---- app/api/v1/vendor/order_item_exceptions.py | 2 +- app/api/v1/vendor/orders.py | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/api/v1/admin/customers.py b/app/api/v1/admin/customers.py index 666c34b6..b892a7b4 100644 --- a/app/api/v1/admin/customers.py +++ b/app/api/v1/admin/customers.py @@ -12,7 +12,7 @@ from app.api.deps import get_current_admin_api from app.core.database import get_db from app.services.admin_customer_service import admin_customer_service from models.database.user import User -from models.schema.customer import ( +from app.modules.customers.schemas import ( CustomerDetailResponse, CustomerListResponse, CustomerMessageResponse, diff --git a/app/api/v1/admin/inventory.py b/app/api/v1/admin/inventory.py index dfafc2c8..4e78065f 100644 --- a/app/api/v1/admin/inventory.py +++ b/app/api/v1/admin/inventory.py @@ -24,7 +24,7 @@ from app.services.inventory_import_service import inventory_import_service from app.services.inventory_service import inventory_service from app.services.inventory_transaction_service import inventory_transaction_service from models.database.user import User -from models.schema.inventory import ( +from app.modules.inventory.schemas import ( AdminInventoryAdjust, AdminInventoryCreate, AdminInventoryListResponse, diff --git a/app/api/v1/admin/messages.py b/app/api/v1/admin/messages.py index b4a6e692..62edf662 100644 --- a/app/api/v1/admin/messages.py +++ b/app/api/v1/admin/messages.py @@ -27,11 +27,11 @@ from app.exceptions import ( ) from app.services.message_attachment_service import message_attachment_service from app.services.messaging_service import messaging_service -from models.database.message import ConversationType, ParticipantType -from models.database.user import User -from models.schema.message import ( +from app.modules.messaging.models import ConversationType, ParticipantType +from app.modules.messaging.schemas import ( AdminConversationListResponse, AdminConversationSummary, + AttachmentResponse, CloseConversationResponse, ConversationCreate, ConversationDetailResponse, @@ -46,7 +46,7 @@ from models.schema.message import ( ReopenConversationResponse, UnreadCountResponse, ) -from models.schema.message import AttachmentResponse +from models.database.user import User router = APIRouter(prefix="/messages") logger = logging.getLogger(__name__) diff --git a/app/api/v1/admin/order_item_exceptions.py b/app/api/v1/admin/order_item_exceptions.py index 89172ad1..dcf106fb 100644 --- a/app/api/v1/admin/order_item_exceptions.py +++ b/app/api/v1/admin/order_item_exceptions.py @@ -18,7 +18,7 @@ from app.api.deps import get_current_admin_api from app.core.database import get_db from app.services.order_item_exception_service import order_item_exception_service from models.database.user import User -from models.schema.order_item_exception import ( +from app.modules.orders.schemas import ( BulkResolveRequest, BulkResolveResponse, IgnoreExceptionRequest, diff --git a/app/api/v1/admin/orders.py b/app/api/v1/admin/orders.py index 79044336..f041efa1 100644 --- a/app/api/v1/admin/orders.py +++ b/app/api/v1/admin/orders.py @@ -21,7 +21,7 @@ from app.api.deps import get_current_admin_api from app.core.database import get_db from app.services.order_service import order_service from models.database.user import User -from models.schema.order import ( +from app.modules.orders.schemas import ( AdminOrderItem, AdminOrderListResponse, AdminOrderStats, diff --git a/app/api/v1/vendor/customers.py b/app/api/v1/vendor/customers.py index 958d6651..ee2be475 100644 --- a/app/api/v1/vendor/customers.py +++ b/app/api/v1/vendor/customers.py @@ -15,7 +15,7 @@ from app.api.deps import get_current_vendor_api from app.core.database import get_db from app.services.customer_service import customer_service from models.database.user import User -from models.schema.customer import ( +from app.modules.customers.schemas import ( CustomerDetailResponse, CustomerMessageResponse, CustomerOrdersResponse, diff --git a/app/api/v1/vendor/inventory.py b/app/api/v1/vendor/inventory.py index 69266d6f..7455b464 100644 --- a/app/api/v1/vendor/inventory.py +++ b/app/api/v1/vendor/inventory.py @@ -16,7 +16,7 @@ from app.core.database import get_db from app.services.inventory_service import inventory_service from app.services.inventory_transaction_service import inventory_transaction_service from models.database.user import User -from models.schema.inventory import ( +from app.modules.inventory.schemas import ( InventoryAdjust, InventoryCreate, InventoryListResponse, diff --git a/app/api/v1/vendor/invoices.py b/app/api/v1/vendor/invoices.py index 9c2bd728..4a432254 100644 --- a/app/api/v1/vendor/invoices.py +++ b/app/api/v1/vendor/invoices.py @@ -43,7 +43,7 @@ from app.exceptions.invoice import ( from app.services.invoice_service import invoice_service from models.database.feature import FeatureCode from models.database.user import User -from models.schema.invoice import ( +from app.modules.orders.schemas import ( InvoiceCreate, InvoiceListPaginatedResponse, InvoiceListResponse, diff --git a/app/api/v1/vendor/messages.py b/app/api/v1/vendor/messages.py index b726ef24..4198f711 100644 --- a/app/api/v1/vendor/messages.py +++ b/app/api/v1/vendor/messages.py @@ -29,9 +29,9 @@ from app.exceptions import ( ) from app.services.message_attachment_service import message_attachment_service from app.services.messaging_service import messaging_service -from models.database.message import ConversationType, ParticipantType -from models.database.user import User -from models.schema.message import ( +from app.modules.messaging.models import ConversationType, ParticipantType +from app.modules.messaging.schemas import ( + AttachmentResponse, CloseConversationResponse, ConversationCreate, ConversationDetailResponse, @@ -47,7 +47,7 @@ from models.schema.message import ( ReopenConversationResponse, UnreadCountResponse, ) -from models.schema.message import AttachmentResponse +from models.database.user import User router = APIRouter(prefix="/messages") logger = logging.getLogger(__name__) diff --git a/app/api/v1/vendor/order_item_exceptions.py b/app/api/v1/vendor/order_item_exceptions.py index bfbf8164..38a862b0 100644 --- a/app/api/v1/vendor/order_item_exceptions.py +++ b/app/api/v1/vendor/order_item_exceptions.py @@ -17,7 +17,7 @@ from app.api.deps import get_current_vendor_api from app.core.database import get_db from app.services.order_item_exception_service import order_item_exception_service from models.database.user import User -from models.schema.order_item_exception import ( +from app.modules.orders.schemas import ( BulkResolveRequest, BulkResolveResponse, IgnoreExceptionRequest, diff --git a/app/api/v1/vendor/orders.py b/app/api/v1/vendor/orders.py index 6ca7c140..6c890604 100644 --- a/app/api/v1/vendor/orders.py +++ b/app/api/v1/vendor/orders.py @@ -17,7 +17,7 @@ from app.core.database import get_db from app.services.order_inventory_service import order_inventory_service from app.services.order_service import order_service from models.database.user import User -from models.schema.order import ( +from app.modules.orders.schemas import ( OrderDetailResponse, OrderListResponse, OrderResponse,