Fix: eagerload series.sets i admin og API (MissingGreenlet i async mode)
This commit is contained in:
+29
-11
@@ -9,20 +9,34 @@ class User(Base):
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
username = Column(String(50), unique=True, nullable=False, index=True)
|
||||
password_hash = Column(String(255), nullable=False)
|
||||
role = Column(String(20), nullable=False, default="user") # "admin" or "user"
|
||||
role = Column(String(20), nullable=False, default="user")
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
|
||||
class Serie(Base):
|
||||
__tablename__ = "series"
|
||||
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
name = Column(String(200), unique=True, nullable=False) # "Sword & Shield"
|
||||
description = Column(Text, nullable=True)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
sets = relationship("Set", back_populates="serie", cascade="all, delete-orphan",
|
||||
order_by="Set.code")
|
||||
|
||||
|
||||
class Set(Base):
|
||||
__tablename__ = "sets"
|
||||
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
code = Column(String(10), unique=True, nullable=False, index=True) # e.g. "CRI"
|
||||
name = Column(String(200), nullable=False) # e.g. "Chaos Rising"
|
||||
serie_id = Column(Integer, ForeignKey("series.id", ondelete="CASCADE"), nullable=False, index=True)
|
||||
code = Column(String(10), unique=True, nullable=False, index=True) # "EVS"
|
||||
name = Column(String(200), nullable=False) # "Evolving Skies"
|
||||
release_date = Column(String(20), nullable=True)
|
||||
description = Column(Text, nullable=True)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
serie = relationship("Serie", back_populates="sets")
|
||||
cards = relationship("Card", back_populates="set", cascade="all, delete-orphan",
|
||||
order_by="Card.number")
|
||||
|
||||
@@ -32,17 +46,21 @@ class Card(Base):
|
||||
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
set_id = Column(Integer, ForeignKey("sets.id", ondelete="CASCADE"), nullable=False, index=True)
|
||||
number = Column(String(10), nullable=False) # e.g. "068"
|
||||
name = Column(String(200), nullable=False) # e.g. "Garchomp EX"
|
||||
type = Column(String(50), nullable=True) # e.g. "Colorless", "Fire"
|
||||
rarity = Column(String(50), nullable=True) # e.g. "Rare", "Uncommon"
|
||||
hp = Column(Integer, nullable=True)
|
||||
stage = Column(String(50), nullable=True) # e.g. "Basic", "Stage 1", "Stage 2"
|
||||
description = Column(Text, nullable=True)
|
||||
image_url = Column(String(500), nullable=True)
|
||||
number = Column(String(10), nullable=False) # "050"
|
||||
name = Column(String(200), nullable=False) # "Raichu"
|
||||
image_path = Column(String(500), nullable=True) # URL eller sti "images/.../050.jpg"
|
||||
|
||||
set = relationship("Set", back_populates="cards")
|
||||
|
||||
@property
|
||||
def full_code(self):
|
||||
return f"{self.set.code}-{self.number}"
|
||||
|
||||
@property
|
||||
def image_url(self):
|
||||
"""Returner URL'en for visning — absolut URL eller /static/ relativ sti."""
|
||||
if not self.image_path:
|
||||
return None
|
||||
if self.image_path.startswith(("http://", "https://")):
|
||||
return self.image_path
|
||||
return f"/static/{self.image_path}"
|
||||
Reference in New Issue
Block a user