Samir Boulahtit
b8a46e1746
Problem: - Ruff removed 'from app.core.database import Base' from models/database/base.py - Import appeared "unused" (F401) but was actually a critical re-export - Caused ImportError: cannot import name 'Base' at runtime - Re-export pattern: import in one file to export from package Solution: 1. Added F401 ignore for models/database/base.py in pyproject.toml 2. Created scripts/verify_critical_imports.py verification script 3. Integrated verification into make check and CI pipeline 4. Updated documentation with explanation New Verification Script: - Checks all critical re-export imports exist - Detects import variations (parentheses, 'as' clauses) - Handles SQLAlchemy declarative_base alternatives - Runs as part of make check automatically Protected Files: - models/database/base.py - Re-exports Base for all models - models/__init__.py - Exports Base for Alembic - models/database/__init__.py - Exports Base from package - All __init__.py files (already protected) Makefile Changes: - make verify-imports - Run import verification - make check - Now includes verify-imports - make ci - Includes verify-imports in pipeline Documentation Updated: - Code quality guide explains re-export protection - Pre-commit workflow includes verification - Examples of why re-exports matter This prevents future issues where linters remove seemingly "unused" imports that are actually critical for application structure. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
97 lines
2.7 KiB
Python
97 lines
2.7 KiB
Python
# models/database/vendor_domain.py
|
|
"""
|
|
Vendor Domain Model - Maps custom domains to vendors
|
|
"""
|
|
|
|
from sqlalchemy import (
|
|
Boolean,
|
|
Column,
|
|
DateTime,
|
|
ForeignKey,
|
|
Index,
|
|
Integer,
|
|
String,
|
|
UniqueConstraint,
|
|
)
|
|
from sqlalchemy.orm import relationship
|
|
|
|
from app.core.database import Base
|
|
from models.database.base import TimestampMixin
|
|
|
|
|
|
class VendorDomain(Base, TimestampMixin):
|
|
"""
|
|
Maps custom domains to vendors for multi-domain routing.
|
|
|
|
Examples:
|
|
- customdomain1.com → Vendor 1
|
|
- shop.mybusiness.com → Vendor 2
|
|
- www.customdomain1.com → Vendor 1 (www is stripped)
|
|
"""
|
|
|
|
__tablename__ = "vendor_domains"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
vendor_id = Column(
|
|
Integer, ForeignKey("vendors.id", ondelete="CASCADE"), nullable=False
|
|
)
|
|
|
|
# Domain configuration
|
|
domain = Column(String(255), nullable=False, unique=True, index=True)
|
|
is_primary = Column(Boolean, default=False, nullable=False)
|
|
is_active = Column(Boolean, default=True, nullable=False)
|
|
|
|
# SSL/TLS status (for monitoring)
|
|
ssl_status = Column(
|
|
String(50), default="pending"
|
|
) # pending, active, expired, error
|
|
ssl_verified_at = Column(DateTime(timezone=True), nullable=True)
|
|
|
|
# DNS verification (to confirm domain ownership)
|
|
verification_token = Column(String(100), unique=True, nullable=True)
|
|
is_verified = Column(Boolean, default=False, nullable=False)
|
|
verified_at = Column(DateTime(timezone=True), nullable=True)
|
|
|
|
# Relationships
|
|
vendor = relationship("Vendor", back_populates="domains")
|
|
|
|
# Constraints
|
|
__table_args__ = (
|
|
UniqueConstraint("vendor_id", "domain", name="uq_vendor_domain"),
|
|
Index("idx_domain_active", "domain", "is_active"),
|
|
Index("idx_vendor_primary", "vendor_id", "is_primary"),
|
|
)
|
|
|
|
def __repr__(self):
|
|
return f"<VendorDomain(domain='{self.domain}', vendor_id={self.vendor_id})>"
|
|
|
|
@property
|
|
def full_url(self):
|
|
"""Return full URL with https"""
|
|
return f"https://{self.domain}"
|
|
|
|
@classmethod
|
|
def normalize_domain(cls, domain: str) -> str:
|
|
"""
|
|
Normalize domain for consistent storage.
|
|
|
|
Examples:
|
|
- https://example.com → example.com
|
|
- www.example.com → example.com
|
|
- EXAMPLE.COM → example.com
|
|
"""
|
|
# Remove protocol
|
|
domain = domain.replace("https://", "").replace("http://", "")
|
|
|
|
# Remove trailing slash
|
|
domain = domain.rstrip("/")
|
|
|
|
# Remove www prefix (optional - depends on your preference)
|
|
# if domain.startswith("www."):
|
|
# domain = domain[4:]
|
|
|
|
# Convert to lowercase
|
|
domain = domain.lower()
|
|
|
|
return domain
|