diff --git a/tests/fixtures/customer_fixtures.py b/tests/fixtures/customer_fixtures.py index 11515e31..1f497de4 100644 --- a/tests/fixtures/customer_fixtures.py +++ b/tests/fixtures/customer_fixtures.py @@ -9,7 +9,7 @@ See tests/conftest.py for details on fixture best practices. import pytest from app.modules.customers.models.customer import Customer, CustomerAddress -from models.database.order import Order +from app.modules.orders.models import Order @pytest.fixture @@ -145,7 +145,7 @@ def test_order(db, test_vendor, test_customer, test_customer_address): @pytest.fixture def test_order_item(db, test_order, test_product): """Create a test order item.""" - from models.database.order import OrderItem + from app.modules.orders.models import OrderItem order_item = OrderItem( order_id=test_order.id, diff --git a/tests/fixtures/message_fixtures.py b/tests/fixtures/message_fixtures.py index 2a6edd3e..b6f682fa 100644 --- a/tests/fixtures/message_fixtures.py +++ b/tests/fixtures/message_fixtures.py @@ -8,7 +8,7 @@ See tests/conftest.py for details on fixture best practices. import pytest -from models.database.message import ( +from app.modules.messaging.models import ( Conversation, ConversationParticipant, ConversationType, diff --git a/tests/fixtures/vendor_fixtures.py b/tests/fixtures/vendor_fixtures.py index ba63c6e5..8e1072d8 100644 --- a/tests/fixtures/vendor_fixtures.py +++ b/tests/fixtures/vendor_fixtures.py @@ -11,7 +11,7 @@ import uuid import pytest from models.database.company import Company -from models.database.inventory import Inventory +from app.modules.inventory.models import Inventory from models.database.product import Product from models.database.vendor import Vendor diff --git a/tests/integration/api/v1/admin/test_inventory.py b/tests/integration/api/v1/admin/test_inventory.py index 2aede5b2..1cce7549 100644 --- a/tests/integration/api/v1/admin/test_inventory.py +++ b/tests/integration/api/v1/admin/test_inventory.py @@ -447,7 +447,7 @@ class TestAdminInventoryAPI: ): """Test admin deleting inventory entry.""" # Create a new inventory entry to delete - from models.database.inventory import Inventory + from app.modules.inventory.models import Inventory new_inventory = Inventory( product_id=test_product.id, diff --git a/tests/integration/api/v1/admin/test_letzshop.py b/tests/integration/api/v1/admin/test_letzshop.py index a80d1e73..42f64cf1 100644 --- a/tests/integration/api/v1/admin/test_letzshop.py +++ b/tests/integration/api/v1/admin/test_letzshop.py @@ -248,7 +248,7 @@ class TestAdminLetzshopOrdersAPI: """Test listing vendor orders with data.""" from datetime import datetime, timezone - from models.database.order import Order + from app.modules.orders.models import Order # Create test order using unified Order model with all required fields order = Order( diff --git a/tests/integration/api/v1/admin/test_messages.py b/tests/integration/api/v1/admin/test_messages.py index b32440a2..50b2b248 100644 --- a/tests/integration/api/v1/admin/test_messages.py +++ b/tests/integration/api/v1/admin/test_messages.py @@ -7,7 +7,7 @@ Tests the /api/v1/admin/messages/* endpoints. import pytest -from models.database.message import ConversationType, ParticipantType +from app.modules.messaging.models import ConversationType, ParticipantType @pytest.mark.integration diff --git a/tests/integration/api/v1/admin/test_order_item_exceptions.py b/tests/integration/api/v1/admin/test_order_item_exceptions.py index ab18bffa..207cc2df 100644 --- a/tests/integration/api/v1/admin/test_order_item_exceptions.py +++ b/tests/integration/api/v1/admin/test_order_item_exceptions.py @@ -9,8 +9,8 @@ All endpoints require admin JWT authentication. import pytest from datetime import datetime, timezone -from models.database.order import OrderItem -from models.database.order_item_exception import OrderItemException +from app.modules.orders.models import OrderItem +from app.modules.orders.models import OrderItemException @pytest.fixture diff --git a/tests/integration/api/v1/storefront/test_orders.py b/tests/integration/api/v1/storefront/test_orders.py index 6c09afc9..4d6ae875 100644 --- a/tests/integration/api/v1/storefront/test_orders.py +++ b/tests/integration/api/v1/storefront/test_orders.py @@ -13,8 +13,8 @@ import pytest from jose import jwt from app.modules.customers.models.customer import Customer -from models.database.invoice import Invoice, InvoiceStatus, VendorInvoiceSettings -from models.database.order import Order, OrderItem +from app.modules.orders.models import Invoice, InvoiceStatus, VendorInvoiceSettings +from app.modules.orders.models import Order, OrderItem @pytest.fixture diff --git a/tests/integration/api/v1/vendor/test_invoices.py b/tests/integration/api/v1/vendor/test_invoices.py index 17e6511a..dc85eb53 100644 --- a/tests/integration/api/v1/vendor/test_invoices.py +++ b/tests/integration/api/v1/vendor/test_invoices.py @@ -10,8 +10,8 @@ from decimal import Decimal import pytest from app.modules.customers.models.customer import Customer -from models.database.invoice import Invoice, InvoiceStatus, VendorInvoiceSettings -from models.database.order import Order +from app.modules.orders.models import Invoice, InvoiceStatus, VendorInvoiceSettings +from app.modules.orders.models import Order @pytest.mark.integration diff --git a/tests/integration/api/v1/vendor/test_letzshop.py b/tests/integration/api/v1/vendor/test_letzshop.py index 3eb6cf25..58da14fd 100644 --- a/tests/integration/api/v1/vendor/test_letzshop.py +++ b/tests/integration/api/v1/vendor/test_letzshop.py @@ -240,7 +240,7 @@ class TestVendorLetzshopOrdersAPI: """Test listing orders with status filter.""" from datetime import datetime, timezone - from models.database.order import Order + from app.modules.orders.models import Order # Create test orders using unified Order model with all required fields order1 = Order( @@ -315,7 +315,7 @@ class TestVendorLetzshopOrdersAPI: """Test getting order detail.""" from datetime import datetime, timezone - from models.database.order import Order + from app.modules.orders.models import Order order = Order( vendor_id=test_vendor_with_vendor_user.id, @@ -457,7 +457,7 @@ class TestVendorLetzshopFulfillmentAPI: """Test confirming an order.""" from datetime import datetime, timezone - from models.database.order import Order, OrderItem + from app.modules.orders.models import Order, OrderItem # Create test order using unified Order model with all required fields order = Order( @@ -546,7 +546,7 @@ class TestVendorLetzshopFulfillmentAPI: """Test setting tracking information.""" from datetime import datetime, timezone - from models.database.order import Order + from app.modules.orders.models import Order order = Order( vendor_id=test_vendor_with_vendor_user.id, diff --git a/tests/integration/api/v1/vendor/test_messages.py b/tests/integration/api/v1/vendor/test_messages.py index 6af2c75e..c03565c2 100644 --- a/tests/integration/api/v1/vendor/test_messages.py +++ b/tests/integration/api/v1/vendor/test_messages.py @@ -7,7 +7,7 @@ Tests the /api/v1/vendor/messages/* endpoints. import pytest -from models.database.message import ConversationType, ParticipantType +from app.modules.messaging.models import ConversationType, ParticipantType @pytest.mark.integration diff --git a/tests/integration/api/v1/vendor/test_orders.py b/tests/integration/api/v1/vendor/test_orders.py index 79255c02..ebde1622 100644 --- a/tests/integration/api/v1/vendor/test_orders.py +++ b/tests/integration/api/v1/vendor/test_orders.py @@ -5,7 +5,7 @@ from datetime import UTC, datetime import pytest -from models.database.order import Order, OrderItem +from app.modules.orders.models import Order, OrderItem @pytest.fixture diff --git a/tests/unit/models/database/test_inventory.py b/tests/unit/models/database/test_inventory.py index ce158f42..b9bf6578 100644 --- a/tests/unit/models/database/test_inventory.py +++ b/tests/unit/models/database/test_inventory.py @@ -4,7 +4,7 @@ import pytest from sqlalchemy.exc import IntegrityError -from models.database.inventory import Inventory +from app.modules.inventory.models import Inventory @pytest.mark.unit diff --git a/tests/unit/models/database/test_order.py b/tests/unit/models/database/test_order.py index 0c41242d..c9e759ab 100644 --- a/tests/unit/models/database/test_order.py +++ b/tests/unit/models/database/test_order.py @@ -6,7 +6,7 @@ from datetime import datetime, timezone import pytest from sqlalchemy.exc import IntegrityError -from models.database.order import Order, OrderItem +from app.modules.orders.models import Order, OrderItem def create_order_with_snapshots( diff --git a/tests/unit/models/database/test_order_item_exception.py b/tests/unit/models/database/test_order_item_exception.py index e4c40853..30b4bd36 100644 --- a/tests/unit/models/database/test_order_item_exception.py +++ b/tests/unit/models/database/test_order_item_exception.py @@ -4,7 +4,7 @@ import pytest from sqlalchemy.exc import IntegrityError -from models.database.order_item_exception import OrderItemException +from app.modules.orders.models import OrderItemException @pytest.mark.unit @@ -65,7 +65,7 @@ class TestOrderItemExceptionModel: exception_types = ["product_not_found", "gtin_mismatch", "duplicate_gtin"] # Create new order items for each test to avoid unique constraint - from models.database.order import OrderItem + from app.modules.orders.models import OrderItem for i, exc_type in enumerate(exception_types): order_item = OrderItem( diff --git a/tests/unit/models/database/test_product.py b/tests/unit/models/database/test_product.py index 5b22a568..09f260df 100644 --- a/tests/unit/models/database/test_product.py +++ b/tests/unit/models/database/test_product.py @@ -306,7 +306,7 @@ class TestProductInventoryProperties: def test_physical_product_with_inventory(self, db, test_vendor): """Test physical product calculates inventory from entries.""" - from models.database.inventory import Inventory + from app.modules.inventory.models import Inventory product = Product( vendor_id=test_vendor.id, @@ -364,7 +364,7 @@ class TestProductInventoryProperties: def test_digital_product_ignores_inventory_entries(self, db, test_vendor): """Test digital product returns unlimited even with inventory entries.""" - from models.database.inventory import Inventory + from app.modules.inventory.models import Inventory product = Product( vendor_id=test_vendor.id, diff --git a/tests/unit/models/schema/test_customer.py b/tests/unit/models/schema/test_customer.py index e384f849..e8420ccb 100644 --- a/tests/unit/models/schema/test_customer.py +++ b/tests/unit/models/schema/test_customer.py @@ -4,7 +4,7 @@ import pytest from pydantic import ValidationError -from models.schema.customer import ( +from app.modules.customers.schemas import ( CustomerAddressCreate, CustomerAddressResponse, CustomerAddressUpdate, diff --git a/tests/unit/models/schema/test_inventory.py b/tests/unit/models/schema/test_inventory.py index f969a8ef..cb7bf14c 100644 --- a/tests/unit/models/schema/test_inventory.py +++ b/tests/unit/models/schema/test_inventory.py @@ -4,7 +4,7 @@ import pytest from pydantic import ValidationError -from models.schema.inventory import ( +from app.modules.inventory.schemas import ( InventoryAdjust, InventoryCreate, InventoryLocationResponse, diff --git a/tests/unit/models/schema/test_order.py b/tests/unit/models/schema/test_order.py index 6ef30b75..cb581389 100644 --- a/tests/unit/models/schema/test_order.py +++ b/tests/unit/models/schema/test_order.py @@ -6,7 +6,7 @@ from datetime import datetime, timezone import pytest from pydantic import ValidationError -from models.schema.order import ( +from app.modules.orders.schemas import ( AddressSnapshot, AddressSnapshotResponse, CustomerSnapshot, @@ -573,7 +573,7 @@ class TestOrderItemResponseSchema: assert response.has_unresolved_exception is False # Pending exception - from models.schema.order import OrderItemExceptionBrief + from app.modules.orders.schemas import OrderItemExceptionBrief pending_exc = OrderItemExceptionBrief( id=1, original_gtin="123", original_product_name="Test", exception_type="product_not_found", status="pending", diff --git a/tests/unit/services/test_customer_address_service.py b/tests/unit/services/test_customer_address_service.py index 7555ce6b..32a89ef6 100644 --- a/tests/unit/services/test_customer_address_service.py +++ b/tests/unit/services/test_customer_address_service.py @@ -8,7 +8,7 @@ import pytest from app.exceptions import AddressLimitExceededException, AddressNotFoundException from app.services.customer_address_service import CustomerAddressService from app.modules.customers.models.customer import CustomerAddress -from models.schema.customer import CustomerAddressCreate, CustomerAddressUpdate +from app.modules.customers.schemas import CustomerAddressCreate, CustomerAddressUpdate @pytest.fixture diff --git a/tests/unit/services/test_inventory_service.py b/tests/unit/services/test_inventory_service.py index 28442a60..8d2d9fab 100644 --- a/tests/unit/services/test_inventory_service.py +++ b/tests/unit/services/test_inventory_service.py @@ -13,8 +13,8 @@ from app.exceptions import ( ProductNotFoundException, ) from app.services.inventory_service import InventoryService -from models.database.inventory import Inventory -from models.schema.inventory import ( +from app.modules.inventory.models import Inventory +from app.modules.inventory.schemas import ( InventoryAdjust, InventoryCreate, InventoryReserve, diff --git a/tests/unit/services/test_invoice_service.py b/tests/unit/services/test_invoice_service.py index bde6e4ab..eed47998 100644 --- a/tests/unit/services/test_invoice_service.py +++ b/tests/unit/services/test_invoice_service.py @@ -16,13 +16,13 @@ from app.services.invoice_service import ( InvoiceService, LU_VAT_RATES, ) -from models.database.invoice import ( +from app.modules.orders.models import ( Invoice, InvoiceStatus, VATRegime, VendorInvoiceSettings, ) -from models.schema.invoice import ( +from app.modules.orders.schemas import ( VendorInvoiceSettingsCreate, VendorInvoiceSettingsUpdate, ) diff --git a/tests/unit/services/test_messaging_service.py b/tests/unit/services/test_messaging_service.py index 9d03feb1..7ddd2661 100644 --- a/tests/unit/services/test_messaging_service.py +++ b/tests/unit/services/test_messaging_service.py @@ -4,7 +4,7 @@ import pytest from app.services.messaging_service import MessagingService -from models.database.message import ( +from app.modules.messaging.models import ( Conversation, ConversationParticipant, ConversationType, diff --git a/tests/unit/services/test_order_item_exception_service.py b/tests/unit/services/test_order_item_exception_service.py index e97d8f4d..3cb30a4e 100644 --- a/tests/unit/services/test_order_item_exception_service.py +++ b/tests/unit/services/test_order_item_exception_service.py @@ -10,8 +10,8 @@ from app.exceptions import ( ProductNotFoundException, ) from app.services.order_item_exception_service import OrderItemExceptionService -from models.database.order import OrderItem -from models.database.order_item_exception import OrderItemException +from app.modules.orders.models import OrderItem +from app.modules.orders.models import OrderItemException @pytest.fixture diff --git a/tests/unit/services/test_order_service.py b/tests/unit/services/test_order_service.py index eb660b77..97422819 100644 --- a/tests/unit/services/test_order_service.py +++ b/tests/unit/services/test_order_service.py @@ -28,7 +28,7 @@ from app.services.order_service import ( order_service, ) from app.modules.customers.models.customer import Customer -from models.database.order import Order, OrderItem +from app.modules.orders.models import Order, OrderItem # Default address fields required by Order model @@ -328,7 +328,7 @@ class TestOrderServiceUpdates: def test_update_order_status(self, db, test_vendor, test_customer): """Test update_order_status changes status""" - from models.schema.order import OrderUpdate + from app.modules.orders.schemas import OrderUpdate order = Order( vendor_id=test_vendor.id, diff --git a/tests/unit/services/test_stats_service.py b/tests/unit/services/test_stats_service.py index 1b96da5a..59d31487 100644 --- a/tests/unit/services/test_stats_service.py +++ b/tests/unit/services/test_stats_service.py @@ -9,7 +9,7 @@ from sqlalchemy.exc import SQLAlchemyError from app.exceptions import AdminOperationException, VendorNotFoundException from app.services.stats_service import StatsService -from models.database.inventory import Inventory +from app.modules.inventory.models import Inventory from models.database.marketplace_product import MarketplaceProduct from models.database.marketplace_product_translation import ( MarketplaceProductTranslation,