marketplace refactoring

models/database/shop.py

@@ -6,9 +6,10 @@ from sqlalchemy.orm import relationship
 
 # Import Base from the central database module instead of creating a new one
 from app.core.database import Base
+from models.database.base import TimestampMixin
 
 
-class Shop(Base):
+class Shop(Base, TimestampMixin):
     __tablename__ = "shops"
 
     id = Column(Integer, primary_key=True, index=True)
@@ -32,10 +33,6 @@ class Shop(Base):
     is_active = Column(Boolean, default=True)
     is_verified = Column(Boolean, default=False)
 
-    # Timestamps
-    created_at = Column(DateTime, default=datetime.utcnow)
-    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-
     # Relationships
     owner = relationship("User", back_populates="owned_shops")
     shop_products = relationship("ShopProduct", back_populates="shop")
@@ -49,7 +46,7 @@ class ShopProduct(Base):
 
     id = Column(Integer, primary_key=True, index=True)
     shop_id = Column(Integer, ForeignKey("shops.id"), nullable=False)
-    product_id = Column(Integer, ForeignKey("products.id"), nullable=False)
+    marketplace_product_id = Column(Integer, ForeignKey("marketplace_products.id"), nullable=False)
 
     # Shop-specific overrides (can override the main product data)
     shop_product_id = Column(String)  # Shop's internal product ID
@@ -74,11 +71,11 @@ class ShopProduct(Base):
 
     # Relationships
     shop = relationship("Shop", back_populates="shop_products")
-    product = relationship("Product", back_populates="shop_products")
+    product = relationship("MarketplaceProduct", back_populates="shop_products")
 
     # Constraints
     __table_args__ = (
-        UniqueConstraint("shop_id", "product_id", name="uq_shop_product"),
+        UniqueConstraint("shop_id", "marketplace_product_id", name="uq_shop_product"),
         Index("idx_shop_product_active", "shop_id", "is_active"),
         Index("idx_shop_product_featured", "shop_id", "is_featured"),
     )