API and database models refactoring

app/services/admin_service.py

@@ -14,8 +14,10 @@ from typing import List, Optional, Tuple
 from fastapi import HTTPException
 from sqlalchemy.orm import Session
 
-from models.api_models import MarketplaceImportJobResponse
-from models.database_models import MarketplaceImportJob, Shop, User
+from models.api.marketplace import MarketplaceImportJobResponse
+from models.database.marketplace import MarketplaceImportJob
+from models.database.shop import Shop
+from models.database.user import User
 
 logger = logging.getLogger(__name__)
 

app/services/auth_service.py

@@ -14,8 +14,8 @@ from fastapi import HTTPException
 from sqlalchemy.orm import Session
 
 from middleware.auth import AuthManager
-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
 
 logger = logging.getLogger(__name__)
 

app/services/marketplace_service.py

@@ -14,9 +14,11 @@ from typing import List, Optional
 from sqlalchemy import func
 from sqlalchemy.orm import Session
 
-from models.api_models import (MarketplaceImportJobResponse,
+from models.api.marketplace import (MarketplaceImportJobResponse,
                                MarketplaceImportRequest)
-from models.database_models import MarketplaceImportJob, Shop, User
+from models.database.marketplace import MarketplaceImportJob
+from models.database.shop import Shop
+from models.database.user import User
 
 logger = logging.getLogger(__name__)
 

app/services/product_service.py

@@ -14,9 +14,10 @@ from typing import Generator, List, Optional
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
-from models.api_models import (ProductCreate, ProductUpdate,
-                               StockLocationResponse, StockSummaryResponse)
-from models.database_models import Product, Stock
+from models.api.product import ProductCreate, ProductUpdate
+from models.api.stock import StockLocationResponse, StockSummaryResponse
+from models.database.product import Product
+from models.database.stock import Stock
 from utils.data_processing import GTINProcessor, PriceProcessor
 
 logger = logging.getLogger(__name__)

app/services/shop_service.py

@@ -14,8 +14,10 @@ from fastapi import HTTPException
 from sqlalchemy import func
 from sqlalchemy.orm import Session
 
-from models.api_models import ShopCreate, ShopProductCreate
-from models.database_models import Product, Shop, ShopProduct, User
+from models.api.shop import ShopCreate, ShopProductCreate
+from models.database.product import Product
+from models.database.shop import Shop, ShopProduct
+from models.database.user import User
 
 logger = logging.getLogger(__name__)
 

app/services/stats_service.py

@@ -13,7 +13,8 @@ from typing import Any, Dict, List
 from sqlalchemy import func
 from sqlalchemy.orm import Session
 
-from models.database_models import Product, Stock
+from models.database.product import Product
+from models.database.stock import Stock
 
 logger = logging.getLogger(__name__)
 

app/services/stock_service.py

@@ -13,9 +13,10 @@ from typing import List, Optional
 
 from sqlalchemy.orm import Session
 
-from models.api_models import (StockAdd, StockCreate, StockLocationResponse,
+from models.api.stock import (StockAdd, StockCreate, StockLocationResponse,
                                StockSummaryResponse, StockUpdate)
-from models.database_models import Product, Stock
+from models.database.product import Product
+from models.database.stock import Stock
 from utils.data_processing import GTINProcessor
 
 logger = logging.getLogger(__name__)