refactor: remove db.expunge() anti-pattern from test fixtures
Remove db.expunge() calls that were causing DetachedInstanceError when accessing lazy-loaded relationships in tests. Changes: - conftest.py: Add documentation about fixture best practices - auth_fixtures: Remove expunge, keep objects attached to session - customer_fixtures: Remove expunge, add proper relationship loading - vendor_fixtures: Remove expunge, add test_company and other_company fixtures for proper company-vendor relationship setup - marketplace_import_job_fixtures: Remove expunge calls - marketplace_product_fixtures: Remove expunge calls The db fixture already provides test isolation by dropping/recreating tables after each test, so expunge is unnecessary and harmful. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
136
tests/fixtures/vendor_fixtures.py
vendored
136
tests/fixtures/vendor_fixtures.py
vendored
@@ -1,44 +1,96 @@
|
||||
# tests/fixtures/vendor_fixtures.py
|
||||
"""
|
||||
Vendor-related test fixtures.
|
||||
|
||||
Note: Fixtures should NOT use db.expunge() as it breaks lazy loading.
|
||||
See tests/conftest.py for details on fixture best practices.
|
||||
"""
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
|
||||
from models.database.company import Company
|
||||
from models.database.inventory import Inventory
|
||||
from models.database.product import Product
|
||||
from models.database.vendor import Vendor
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_vendor(db, test_user):
|
||||
"""Create a test vendor with unique vendor code"""
|
||||
def test_company(db, test_user):
|
||||
"""Create a test company owned by test_user."""
|
||||
unique_id = str(uuid.uuid4())[:8]
|
||||
company = Company(
|
||||
name=f"Test Company {unique_id}",
|
||||
owner_user_id=test_user.id,
|
||||
contact_email=f"test{unique_id}@company.com",
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
db.add(company)
|
||||
db.commit()
|
||||
db.refresh(company)
|
||||
return company
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def other_company(db, other_user):
|
||||
"""Create a test company owned by other_user."""
|
||||
unique_id = str(uuid.uuid4())[:8]
|
||||
company = Company(
|
||||
name=f"Other Company {unique_id}",
|
||||
owner_user_id=other_user.id,
|
||||
contact_email=f"other{unique_id}@company.com",
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
db.add(company)
|
||||
db.commit()
|
||||
db.refresh(company)
|
||||
return company
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_vendor(db, test_company):
|
||||
"""Create a test vendor with unique vendor code."""
|
||||
unique_id = str(uuid.uuid4())[:8].upper()
|
||||
vendor = Vendor(
|
||||
company_id=test_company.id,
|
||||
vendor_code=f"TESTVENDOR_{unique_id}",
|
||||
subdomain=f"testvendor{unique_id.lower()}", # ADDED
|
||||
name=f"Test Vendor {unique_id.lower()}", # FIXED
|
||||
owner_user_id=test_user.id,
|
||||
subdomain=f"testvendor{unique_id.lower()}",
|
||||
name=f"Test Vendor {unique_id.lower()}",
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_vendor_with_vendor_user(db, test_vendor_user):
|
||||
"""Create a vendor owned by a vendor user (for testing vendor API endpoints)"""
|
||||
from models.database.vendor import VendorUser
|
||||
"""Create a vendor owned by a vendor user (for testing vendor API endpoints)."""
|
||||
from models.database.vendor import VendorUser, VendorUserType
|
||||
|
||||
unique_id = str(uuid.uuid4())[:8].upper()
|
||||
|
||||
# Create company first
|
||||
company = Company(
|
||||
name=f"Vendor API Company {unique_id}",
|
||||
owner_user_id=test_vendor_user.id,
|
||||
contact_email=f"vendorapi{unique_id}@company.com",
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
db.add(company)
|
||||
db.commit()
|
||||
db.refresh(company)
|
||||
|
||||
vendor = Vendor(
|
||||
company_id=company.id,
|
||||
vendor_code=f"VENDORAPI_{unique_id}",
|
||||
subdomain=f"vendorapi{unique_id.lower()}",
|
||||
name=f"Vendor API Test {unique_id}",
|
||||
owner_user_id=test_vendor_user.id,
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
@@ -50,81 +102,73 @@ def test_vendor_with_vendor_user(db, test_vendor_user):
|
||||
vendor_user = VendorUser(
|
||||
vendor_id=vendor.id,
|
||||
user_id=test_vendor_user.id,
|
||||
is_owner=True,
|
||||
user_type=VendorUserType.OWNER.value,
|
||||
is_active=True,
|
||||
)
|
||||
db.add(vendor_user)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def unique_vendor(db, test_user):
|
||||
"""Create a unique vendor for tests that need isolated vendor data"""
|
||||
def unique_vendor(db, test_company):
|
||||
"""Create a unique vendor for tests that need isolated vendor data."""
|
||||
unique_id = str(uuid.uuid4())[:8]
|
||||
vendor = Vendor(
|
||||
company_id=test_company.id,
|
||||
vendor_code=f"UNIQUEVENDOR_{unique_id.upper()}",
|
||||
subdomain=f"uniquevendor{unique_id.lower()}", # ADDED
|
||||
name=f"Unique Test Vendor {unique_id}", # FIXED
|
||||
subdomain=f"uniquevendor{unique_id.lower()}",
|
||||
name=f"Unique Test Vendor {unique_id}",
|
||||
description=f"A unique test vendor {unique_id}",
|
||||
owner_user_id=test_user.id,
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def inactive_vendor(db, other_user):
|
||||
"""Create an inactive vendor owned by other_user"""
|
||||
def inactive_vendor(db, other_company):
|
||||
"""Create an inactive vendor owned by other_user."""
|
||||
unique_id = str(uuid.uuid4())[:8]
|
||||
vendor = Vendor(
|
||||
company_id=other_company.id,
|
||||
vendor_code=f"INACTIVE_{unique_id.upper()}",
|
||||
subdomain=f"inactive{unique_id.lower()}", # ADDED
|
||||
name=f"Inactive Vendor {unique_id}", # FIXED
|
||||
owner_user_id=other_user.id,
|
||||
subdomain=f"inactive{unique_id.lower()}",
|
||||
name=f"Inactive Vendor {unique_id}",
|
||||
is_active=False,
|
||||
is_verified=False,
|
||||
)
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def verified_vendor(db, other_user):
|
||||
"""Create a verified vendor owned by other_user"""
|
||||
def verified_vendor(db, other_company):
|
||||
"""Create a verified vendor owned by other_user."""
|
||||
unique_id = str(uuid.uuid4())[:8]
|
||||
vendor = Vendor(
|
||||
company_id=other_company.id,
|
||||
vendor_code=f"VERIFIED_{unique_id.upper()}",
|
||||
subdomain=f"verified{unique_id.lower()}", # ADDED
|
||||
name=f"Verified Vendor {unique_id}", # FIXED
|
||||
owner_user_id=other_user.id,
|
||||
subdomain=f"verified{unique_id.lower()}",
|
||||
name=f"Verified Vendor {unique_id}",
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_product(db, test_vendor, unique_product):
|
||||
"""Create a vendor product relationship"""
|
||||
"""Create a vendor product relationship."""
|
||||
product = Product(
|
||||
vendor_id=test_vendor.id,
|
||||
marketplace_product_id=unique_product.id,
|
||||
@@ -136,8 +180,6 @@ def test_product(db, test_vendor, unique_product):
|
||||
db.add(product)
|
||||
db.commit()
|
||||
db.refresh(product)
|
||||
# Expunge product from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(product)
|
||||
return product
|
||||
|
||||
|
||||
@@ -151,19 +193,17 @@ def test_inventory(db, test_product):
|
||||
location=f"WAREHOUSE_A_{unique_id}",
|
||||
quantity=100,
|
||||
reserved_quantity=10,
|
||||
gtin=test_product.marketplace_product.gtin, # Optional reference
|
||||
gtin=test_product.marketplace_product.gtin,
|
||||
)
|
||||
db.add(inventory)
|
||||
db.commit()
|
||||
db.refresh(inventory)
|
||||
# Expunge inventory from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(inventory)
|
||||
return inventory
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def multiple_inventory_entries(db, multiple_products, test_vendor):
|
||||
"""Create multiple inventory entries for testing"""
|
||||
"""Create multiple inventory entries for testing."""
|
||||
inventory_entries = []
|
||||
for i, product in enumerate(multiple_products):
|
||||
inventory = Inventory(
|
||||
@@ -179,21 +219,19 @@ def multiple_inventory_entries(db, multiple_products, test_vendor):
|
||||
db.commit()
|
||||
for inventory in inventory_entries:
|
||||
db.refresh(inventory)
|
||||
# Expunge each inventory from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(inventory)
|
||||
return inventory_entries
|
||||
|
||||
|
||||
def create_unique_vendor_factory():
|
||||
"""Factory function to create unique vendors in tests"""
|
||||
"""Factory function to create unique vendors in tests."""
|
||||
|
||||
def _create_vendor(db, owner_user_id, **kwargs):
|
||||
def _create_vendor(db, company_id, **kwargs):
|
||||
unique_id = str(uuid.uuid4())[:8]
|
||||
defaults = {
|
||||
"company_id": company_id,
|
||||
"vendor_code": f"FACTORY_{unique_id.upper()}",
|
||||
"subdomain": f"factory{unique_id.lower()}", # ADDED
|
||||
"name": f"Factory Vendor {unique_id}", # FIXED
|
||||
"owner_user_id": owner_user_id,
|
||||
"subdomain": f"factory{unique_id.lower()}",
|
||||
"name": f"Factory Vendor {unique_id}",
|
||||
"is_active": True,
|
||||
"is_verified": False,
|
||||
}
|
||||
@@ -210,5 +248,5 @@ def create_unique_vendor_factory():
|
||||
|
||||
@pytest.fixture
|
||||
def vendor_factory():
|
||||
"""Fixture that provides a vendor factory function"""
|
||||
"""Fixture that provides a vendor factory function."""
|
||||
return create_unique_vendor_factory()
|
||||
|
||||
Reference in New Issue
Block a user