🐐

backend/card.py

@@ -95,6 +95,7 @@ WIKIDATA_INSTANCE_TYPE_MAP = {
   "Q24862":     CardType.artwork,       # film
   "Q11032":     CardType.artwork,       # newspaper
   "Q25379":     CardType.artwork,       # play
+  "Q41298":     CardType.artwork,       # magazine
   "Q482994":    CardType.artwork,       # album
   "Q134556":    CardType.artwork,       # single
   "Q169930":    CardType.artwork,       # EP
@@ -130,6 +131,7 @@ WIKIDATA_INSTANCE_TYPE_MAP = {
   "Q3624078":   CardType.location,      # sovereign state
   "Q1093829":   CardType.location,      # city in the United States
   "Q7930989":   CardType.location,      # city/town
+  "Q3146899":   CardType.location,      # diocese of the catholic church
   "Q35145263":  CardType.location,      # natural geographic object
 
   "Q16521":     CardType.life_form,     # taxon
@@ -155,6 +157,7 @@ WIKIDATA_INSTANCE_TYPE_MAP = {
   "Q5419137":   CardType.group,         # veterans' organization
   "Q12973014":  CardType.group,         # sports team
   "Q11446438":  CardType.group,         # female idol group
+  "Q10517054":  CardType.group,         # handball team
   "Q135408445": CardType.group,         # men's national association football team
 
   "Q7187":      CardType.science_thing, # gene
@@ -164,6 +167,7 @@ WIKIDATA_INSTANCE_TYPE_MAP = {
   "Q11276":     CardType.science_thing, # globular cluster
   "Q898273":    CardType.science_thing, # protein domain
   "Q168845":    CardType.science_thing, # star cluster
+  "Q1341811":   CardType.science_thing, # astronomical maser
   "Q1840368":   CardType.science_thing, # cloud type
   "Q113145171": CardType.science_thing, # type of chemical entity
 

backend/database_functions.py

@@ -1,10 +1,12 @@
 import logging
 import asyncio
+from datetime import datetime, timedelta
 
 from sqlalchemy.orm import Session
 
 from card import _get_cards_async
 from models import Card as CardModel
+from models import User as UserModel
 from database import SessionLocal
 
 logger = logging.getLogger("app")
@@ -59,3 +61,27 @@ async def fill_card_pool():
   finally:
     pool_filling = False
     db.close()
+
+BOOSTER_MAX = 5
+BOOSTER_COOLDOWN_HOURS = 5
+
+def check_boosters(user: UserModel, db: Session) -> tuple[int, datetime|None]:
+  if user.boosters_countdown is None:
+    user.boosters = 5
+    db.commit()
+    return (user.boosters, user.boosters_countdown)
+
+  now = datetime.now()
+  countdown = user.boosters_countdown
+
+  while user.boosters < BOOSTER_MAX:
+    next_tick = countdown + timedelta(hours=BOOSTER_COOLDOWN_HOURS)
+    if now >= next_tick:
+      user.boosters += 1
+      countdown = next_tick
+    else:
+      break
+
+  user.boosters_countdown = countdown if user.boosters < BOOSTER_MAX else None
+  db.commit()
+  return (user.boosters, user.boosters_countdown)

backend/log_conf.yaml

@@ -37,6 +37,16 @@ loggers:
     handlers:
       - default
     propagate: no
+  passlib.utils.compat:
+    level: INFO
+    handlers:
+      - default
+    propagate: no
+  python_multipart.multipart:
+    level: INFO
+    handlers:
+      - default
+    propagate: no
   app:
     level: INFO
     handlers:

backend/main.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 import uuid
 from contextlib import asynccontextmanager
+from datetime import datetime
 
 from sqlalchemy.orm import Session
 from fastapi import FastAPI, Depends, HTTPException, status
@@ -9,11 +10,10 @@ from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
 
-from database import SessionLocal, get_db
-from database_functions import fill_card_pool
+from database import get_db
+from database_functions import fill_card_pool, check_boosters, BOOSTER_MAX
 from models import Card as CardModel
 from models import User as UserModel
-from card import _get_cards_async
 from auth import hash_password, verify_password, create_access_token, decode_access_token
 
 logger = logging.getLogger("app")
@@ -49,16 +49,6 @@ app.add_middleware(
   allow_headers=["*"],
 )
 
-@app.get("/pack/{size}")
-async def open_pack(size: int = 10, user: UserModel = Depends(get_current_user)):
-  cards = await _get_cards_async(size)
-  return [
-    {**card._asdict(),
-      "card_type": card.card_type.name,
-      "card_rarity": card.card_rarity.name}
-    for card in cards
-  ]
-
 @app.post("/register")
 def register(req: RegisterRequest, db: Session = Depends(get_db)):
   if db.query(UserModel).filter(UserModel.username == req.username).first():
@@ -82,3 +72,43 @@ def login(form: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get
     raise HTTPException(status_code=400, detail="Invalid username or password")
   token = create_access_token(str(user.id))
   return {"access_token": token, "token_type": "bearer"}
+
+@app.get("/boosters")
+def get_boosters(user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)) -> tuple[int,datetime|None]:
+  return check_boosters(user, db)
+
+@app.post("/open_pack")
+async def open_pack(user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)):
+  check_boosters(user, db)
+
+  if user.boosters == 0:
+    raise HTTPException(status_code=400, detail="No booster packs available")
+
+  cards = (
+    db.query(CardModel)
+    .filter(CardModel.user_id == None)
+    .limit(5)
+    .all()
+  )
+
+  if len(cards) < 5:
+    raise HTTPException(status_code=503, detail="Card pool is low, please try again shortly")
+
+  for card in cards:
+    card.user_id = user.id
+
+  # was_full = user.boosters == BOOSTER_MAX
+  # user.boosters -= 1
+  # if was_full:
+  #   user.boosters_countdown = datetime.now()
+
+  db.commit()
+
+  asyncio.create_task(fill_card_pool())
+
+  return [
+    {**{c.name: getattr(card, c.name) for c in card.__table__.columns},
+      "card_rarity": card.card_rarity,
+      "card_type": card.card_type}
+    for card in cards
+  ]

backend/models.py

@@ -13,6 +13,8 @@ class User(Base):
     email: Mapped[str] = mapped_column(String, unique=True, nullable=False)
     password_hash: Mapped[str] = mapped_column(String, nullable=False)
     created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.now)
+    boosters: Mapped[int] = mapped_column(Integer, default=5, nullable=False)
+    boosters_countdown: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
 
     cards: Mapped[list["Card"]] = relationship(back_populates="user")
     decks: Mapped[list["Deck"]] = relationship(back_populates="user")

backend/requirements.txt

@@ -0,0 +1,8 @@
+fastapi==0.135.1
+httpx==0.28.1
+passlib==1.7.4
+pydantic==2.12.5
+python_jose==3.5.0
+SQLAlchemy==2.0.48
+python-multipart
+bcrypt==4.3.0