API and database models refactoring

tests/conftest.py

@@ -8,8 +8,11 @@ from sqlalchemy.pool import StaticPool
 from app.core.database import Base, get_db
 from main import app
 # Import all models to ensure they're registered with Base metadata
-from models.database_models import (MarketplaceImportJob, Product, Shop,
-                                    ShopProduct, Stock, User)
+from models.database.marketplace import MarketplaceImportJob
+from models.database.product import Product
+from models.database.shop import Shop,ShopProduct
+from models.database.stock import Stock
+from models.database.user import User
 
 # Use in-memory SQLite database for tests
 SQLALCHEMY_TEST_DATABASE_URL = "sqlite:///:memory:"

tests/fixtures/auth_fixtures.py

@@ -4,7 +4,7 @@ import uuid
 import pytest
 
 from middleware.auth import AuthManager
-from models.database_models import User
+from models.database.user import User
 
 
 @pytest.fixture(scope="session")

tests/fixtures/marketplace_fixtures.py

@@ -1,7 +1,7 @@
 # tests/fixtures/marketplace_fixtures.py
 import pytest
 
-from models.database_models import MarketplaceImportJob
+from models.database.marketplace import MarketplaceImportJob
 
 
 @pytest.fixture

tests/fixtures/product_fixtures.py

@@ -3,7 +3,7 @@ import uuid
 
 import pytest
 
-from models.database_models import Product
+from models.database.product import Product
 
 
 @pytest.fixture

tests/fixtures/shop_fixtures.py

@@ -3,7 +3,8 @@ import uuid
 
 import pytest
 
-from models.database_models import Shop, ShopProduct, Stock
+from models.database.shop import Shop,ShopProduct
+from models.database.stock import Stock
 
 
 @pytest.fixture

tests/integration/api/v1/test_pagination.py

@@ -1,7 +1,8 @@
 # tests/integration/api/v1/test_pagination.py
 import pytest
 
-from models.database_models import Product, Shop
+from models.database.product import Product
+from models.database.shop import Shop
 
 
 @pytest.mark.integration

tests/integration/api/v1/test_stock_endpoints.py

@@ -1,7 +1,7 @@
 # tests/test_stock_endpoints.py
 import pytest
 
-from models.database_models import Stock
+from models.database.stock import Stock
 
 
 class TestStockAPI:

tests/performance/test_api_performance.py

@@ -3,7 +3,7 @@ import time
 
 import pytest
 
-from models.database_models import Product
+from models.database.product import Product
 
 
 @pytest.mark.performance

tests/unit/models/test_database_models.py

@@ -1,7 +1,10 @@
 # tests/unit/models/test_database_models.py
 import pytest
 
-from models.database_models import Product, Shop, Stock, User
+from models.database.product import Product
+from models.database.shop import Shop
+from models.database.stock import Stock
+from models.database.user import User
 
 
 @pytest.mark.unit

tests/unit/services/test_admin_service.py

@@ -3,7 +3,8 @@ import pytest
 from fastapi import HTTPException
 
 from app.services.admin_service import AdminService
-from models.database_models import MarketplaceImportJob, Shop
+from models.database.marketplace import MarketplaceImportJob
+from models.database.shop import Shop
 
 
 @pytest.mark.unit

tests/unit/services/test_auth_service.py

@@ -3,8 +3,8 @@ import pytest
 from fastapi import HTTPException
 
 from app.services.auth_service import AuthService
-from models.api_models import UserLogin, UserRegister
-from models.database_models import User
+from models.api.auth import UserLogin, UserRegister
+from models.database.user import User
 
 @pytest.mark.unit
 @pytest.mark.auth

tests/unit/services/test_marketplace_service.py

@@ -5,8 +5,10 @@ from datetime import datetime
 import pytest
 
 from app.services.marketplace_service import MarketplaceService
-from models.api_models import MarketplaceImportRequest
-from models.database_models import MarketplaceImportJob, Shop, User
+from models.api.marketplace import MarketplaceImportRequest
+from models.database.marketplace import MarketplaceImportJob
+from models.database.shop import Shop
+from models.database.user import User
 
 @pytest.mark.unit
 @pytest.mark.marketplace

tests/unit/services/test_product_service.py

@@ -2,8 +2,8 @@
 import pytest
 
 from app.services.product_service import ProductService
-from models.api_models import ProductCreate
-from models.database_models import Product
+from models.api.product import ProductCreate
+from models.database.product import Product
 
 @pytest.mark.unit
 @pytest.mark.products

tests/unit/services/test_shop_service.py

@@ -3,7 +3,7 @@ import pytest
 from fastapi import HTTPException
 
 from app.services.shop_service import ShopService
-from models.api_models import ShopCreate, ShopProductCreate
+from models.api.shop import ShopCreate, ShopProductCreate
 
 @pytest.mark.unit
 @pytest.mark.shops

tests/unit/services/test_stats_service.py

@@ -2,7 +2,8 @@
 import pytest
 
 from app.services.stats_service import StatsService
-from models.database_models import Product, Stock
+from models.database.product import Product
+from models.database.stock import Stock
 
 @pytest.mark.unit
 @pytest.mark.stats

tests/unit/services/test_stock_service.py

@@ -4,8 +4,9 @@ import uuid
 import pytest
 
 from app.services.stock_service import StockService
-from models.api_models import StockAdd, StockCreate, StockUpdate
-from models.database_models import Product, Stock
+from models.api.stock import StockAdd, StockCreate, StockUpdate
+from models.database.product import Product
+from models.database.stock import Stock
 
 @pytest.mark.unit
 @pytest.mark.stock

tests/unit/utils/test_csv_processor.py

@@ -83,7 +83,7 @@ class TestCSVProcessor:
         mock_get.return_value = mock_response
 
         with pytest.raises(Exception):
-            self.processor._download_csv("http://example.com/nonexistent.csv")
+            self.processor.download_csv("http://example.com/nonexistent.csv")
 
     def test_parse_csv_content(self):
         """Test CSV content parsing"""