feat: articles v2

Author: Leoglme

.gitignore

@@ -6,4 +6,5 @@ api/*.pyc
 api/.env
 web/.env
 web/goupixdex.key
-web/goupixdex.key.pub
+web/goupixdex.key.pub
+dashboard-main

api/migrations/004_article_sale_price.sql

@@ -0,0 +1,4 @@
+-- Realized sale amount and channel (Vinted / eBay).
+
+ALTER TABLE articles ADD COLUMN IF NOT EXISTS sold_price DECIMAL(12, 2) NULL;
+ALTER TABLE articles ADD COLUMN IF NOT EXISTS sale_source VARCHAR(16) NULL;

api/models/article.py

@@ -25,6 +25,9 @@ class Article(Base):
     condition: Mapped[str] = mapped_column(String(64), default="Near Mint")
     purchase_price: Mapped[Decimal] = mapped_column(Numeric(12, 2))
     sell_price: Mapped[Decimal | None] = mapped_column(Numeric(12, 2), nullable=True)
+    # Actual proceeds; sale_source is vinted | ebay
+    sold_price: Mapped[Decimal | None] = mapped_column(Numeric(12, 2), nullable=True)
+    sale_source: Mapped[str | None] = mapped_column(String(16), nullable=True)
     is_sold: Mapped[bool] = mapped_column(Boolean(), default=False)
     created_at: Mapped[dt.datetime] = mapped_column(
         DateTime(timezone=True),

api/routes/articles.py

@@ -555,7 +555,8 @@ def mark_sold(
         raise HTTPException(status_code=404, detail="Article not found")
     article.is_sold = True
     article.sold_at = dt.datetime.now(dt.UTC)
-    article.sell_price = body.sell_price
+    article.sold_price = body.sold_price
+    article.sale_source = body.sale_source
     db.commit()
     db.refresh(article)
     return article_service.article_to_dict(article)

api/schemas/articles.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+from typing import Literal
 
 from pydantic import BaseModel, Field
 
@@ -15,7 +16,10 @@ class ArticleUpdate(BaseModel):
 
 
 class SoldPatch(BaseModel):
-    sell_price: Decimal = Field(ge=0)
+    """Mark as sold: actual proceeds and channel (listing price ``sell_price`` is unchanged)."""
+
+    sold_price: Decimal = Field(ge=0)
+    sale_source: Literal["vinted", "ebay"] = "vinted"
 
 
 class BulkIdsBody(BaseModel):

api/seeders/article_seeder.py

@@ -16,7 +16,7 @@
 _DEV_PREFIX = "[DEV] "
 
 
-class _ArticleSeed(TypedDict):
+class _ArticleSeed(TypedDict, total=False):
     title: str
     description: str
     pokemon_name: str | None
@@ -25,8 +25,12 @@ class _ArticleSeed(TypedDict):
     condition: str
     purchase_price: Decimal
     sell_price: Decimal | None
+    sold_price: Decimal | None
+    sale_source: str | None
     is_sold: bool
     sold_at: dt.datetime | None
+    published_on_vinted: bool
+    published_on_ebay: bool
     images: list[str]
 
 
@@ -38,6 +42,121 @@ def _load_dotenv() -> None:
     load_dotenv(_ROOT / ".env")
 
 
+def _specs() -> list[tuple[str, str, str]]:
+    """(pokemon, set_code, card_number) — long list for pagination / dashboard tests."""
+    return [
+        ("Pikachu", "SV8", "025/162"),
+        ("Mewtwo", "M1L", "131/086"),
+        ("Herbizarre", "M1L", "065/063"),
+        ("Évoli", "SV-P", "040"),
+        ("Dracaufeu", "SV3", "125/198"),
+        ("Tortank", "SV3", "184/198"),
+        ("Florizarre", "SV3", "003/198"),
+        ("Lucario", "SV4", "078/182"),
+        ("Amphinobi", "SV2", "054/198"),
+        ("Garchomp", "SV4", "096/182"),
+        ("Tyranocif", "SV4", "066/182"),
+        ("Métalosse", "SV4", "112/182"),
+        ("Zacian", "SSH", "138/202"),
+        ("Zamazenta", "SSH", "139/202"),
+        ("Éthernatos", "SV4", "141/182"),
+        ("Palkia", "SV5", "204/191"),
+        ("Dialga", "SV5", "205/191"),
+        ("Rayquaza", "SV6", "029/167"),
+        ("Latias", "SV6", "073/167"),
+        ("Latios", "SV6", "074/167"),
+        ("Mew", "SV4", "053/182"),
+        ("Celebi", "SV4", "004/182"),
+        ("Ho-Oh", "SV4", "144/182"),
+        ("Lugia", "SV4", "145/182"),
+        ("Kyogre", "SV5", "032/191"),
+        ("Groudon", "SV5", "033/191"),
+        ("Giratina", "SV5", "130/191"),
+        ("Arceus", "SV5", "166/191"),
+        ("Darkrai", "SV5", "077/191"),
+        ("Genesect", "SV5", "181/191"),
+        ("Volcanion", "SV6", "136/167"),
+        ("Magearna", "SV6", "131/167"),
+        ("Marshadow", "SV6", "080/167"),
+        ("Zeraora", "SV6", "152/167"),
+        ("Évoli V", "SWSH", "065/203"),
+        ("Évoli VMAX", "SWSH", "066/203"),
+        ("Pikachu V", "SWSH", "043/172"),
+        ("Pikachu VMAX", "SWSH", "044/172"),
+        ("Raichu", "SV1", "026/198"),
+        ("Raichu Alola", "SV1", "027/198"),
+        ("Mimiqui", "SV2", "097/198"),
+        ("Boréas", "SV3", "144/198"),
+        ("Fulguris", "SV3", "145/198"),
+        ("Démétéros", "SV3", "146/198"),
+        ("Kyurem", "SV3", "047/198"),
+        ("Reshiram", "SV3", "048/198"),
+        ("Zekrom", "SV3", "049/198"),
+        ("Nymphali", "SV8", "075/162"),
+        ("Aquali", "SV8", "076/162"),
+        ("Pyroli", "SV8", "077/162"),
+        ("Voltali", "SV8", "078/162"),
+        ("Phyllali", "SV8", "079/162"),
+        ("Givrali", "SV8", "080/162"),
+        ("Noctali", "SV8", "081/162"),
+        ("Mentali", "SV8", "082/162"),
+        ("Dimoret", "SV8", "083/162"),
+        ("Nigosier", "SV8", "084/162"),
+        ("Couverdure", "SV8", "085/162"),
+        ("Motisma", "SV8", "086/162"),
+        ("Motisma", "SV8", "087/162"),
+        ("Motisma", "SV8", "088/162"),
+    ]
+
+
+def _build_samples(now: dt.datetime) -> list[_ArticleSeed]:
+    specs = _specs()
+    out: list[_ArticleSeed] = []
+    for i, (pokemon, set_code, card_number) in enumerate(specs):
+        n = i + 1
+        purchase = Decimal("2.00") + Decimal(i % 17) * Decimal("1.25")
+        sell = (purchase * Decimal("1.35")).quantize(Decimal("0.01"))
+        # Mix: many sold vs in-stock; varied marketplace flags
+        sold = i % 5 != 0 and i % 7 != 1
+        vinted_pub = not sold and (i % 3 == 0 or i % 11 == 2)
+        ebay_pub = not sold and (i % 4 == 1) and (i % 6 != 0)
+
+        sold_at: dt.datetime | None = None
+        sold_price: Decimal | None = None
+        sale_src: str | None = None
+        if sold:
+            sold_at = now - dt.timedelta(days=(i % 90) + 1)
+            sale_src = "ebay" if i % 3 == 0 else "vinted"
+            # Realized price sometimes slightly below listed price
+            sold_price = (sell - Decimal("0.50")) if i % 5 == 0 else sell
+
+        seed_url = f"https://picsum.photos/seed/goupix-dev-{n}/400/560"
+        imgs: list[str] = [] if i % 9 == 0 else [seed_url]
+        if i % 13 == 0:
+            imgs = [seed_url, f"https://picsum.photos/seed/goupix-dev-{n}b/400/560"]
+
+        row: _ArticleSeed = {
+            "title": f"{_DEV_PREFIX}{pokemon} — {set_code} {card_number}",
+            "description": f"Seed dev #{n}\nSérie {set_code}\nÉtat Near Mint",
+            "pokemon_name": pokemon,
+            "set_code": set_code,
+            "card_number": card_number,
+            "condition": "Near Mint",
+            "purchase_price": purchase,
+            "sell_price": None if sold and i % 8 == 3 else sell,
+            "sold_price": sold_price,
+            "sale_source": sale_src,
+            "is_sold": sold,
+            "sold_at": sold_at,
+            "published_on_vinted": vinted_pub,
+            "published_on_ebay": ebay_pub,
+            "images": imgs,
+        }
+        out.append(row)
+
+    return out
+
+
 def main() -> None:
     _load_dotenv()
 
@@ -75,78 +194,26 @@ def main() -> None:
             print(f"Removed {removed} previous dev article(s).")
 
         now = dt.datetime.now(dt.UTC)
-        samples: list[_ArticleSeed] = [
-            {
-                "title": f"{_DEV_PREFIX}Pikachu — Couronne Stellaire SV8 025/162 NM",
-                "description": "Langue : Japonais\nSérie : Couronne Stellaire\nÉtat : Near Mint\nCarte de test seed.",
-                "pokemon_name": "Pikachu",
-                "set_code": "SV8",
-                "card_number": "025/162",
-                "condition": "Near Mint",
-                "purchase_price": Decimal("3.50"),
-                "sell_price": None,
-                "is_sold": False,
-                "sold_at": None,
-                "images": ["https://picsum.photos/seed/goupix-pika/400/560"],
-            },
-            {
-                "title": f"{_DEV_PREFIX}Mewtwo ex — M1L 131/086",
-                "description": "Exemple listing FR / test données.\nNuméro : 131/086\nÉtat : Near Mint",
-                "pokemon_name": "Mewtwo",
-                "set_code": "M1L",
-                "card_number": "131/086",
-                "condition": "Near Mint",
-                "purchase_price": Decimal("12.00"),
-                "sell_price": Decimal("22.90"),
-                "is_sold": True,
-                "sold_at": now,
-                "images": [
-                    "https://picsum.photos/seed/goupix-m2a/400/560",
-                    "https://picsum.photos/seed/goupix-m2b/400/560",
-                ],
-            },
-            {
-                "title": f"{_DEV_PREFIX}Herbizarre AR — Mega Brave 065/063",
-                "description": "Langue : Japonais\nNom : Herbizarre / Ivysaur\nNuméro : 065/063 AR",
-                "pokemon_name": "Herbizarre",
-                "set_code": "M1L",
-                "card_number": "065/063",
-                "condition": "Near Mint",
-                "purchase_price": Decimal("8.25"),
-                "sell_price": None,
-                "is_sold": False,
-                "sold_at": None,
-                "images": [],
-            },
-            {
-                "title": f"{_DEV_PREFIX}Évoli promo — SV-P 040",
-                "description": "Carte promo seed.\nÉtat : Near Mint",
-                "pokemon_name": "Évoli",
-                "set_code": "SV-P",
-                "card_number": "040",
-                "condition": "Near Mint",
-                "purchase_price": Decimal("1.00"),
-                "sell_price": None,
-                "is_sold": False,
-                "sold_at": None,
-                "images": ["https://picsum.photos/seed/goupix-eevee/400/560"],
-            },
-        ]
+        samples = _build_samples(now)
 
         for s in samples:
-            imgs = s["images"]
+            imgs = s.get("images") or []
             article = Article(
                 user_id=user.id,
                 title=s["title"],
                 description=s["description"],
-                pokemon_name=s["pokemon_name"],
-                set_code=s["set_code"],
-                card_number=s["card_number"],
-                condition=s["condition"],
+                pokemon_name=s.get("pokemon_name"),
+                set_code=s.get("set_code"),
+                card_number=s.get("card_number"),
+                condition=s.get("condition") or "Near Mint",
                 purchase_price=s["purchase_price"],
-                sell_price=s["sell_price"],
-                is_sold=s["is_sold"],
-                sold_at=s["sold_at"],
+                sell_price=s.get("sell_price"),
+                sold_price=s.get("sold_price"),
+                sale_source=s.get("sale_source"),
+                is_sold=bool(s.get("is_sold")),
+                sold_at=s.get("sold_at"),
+                published_on_vinted=bool(s.get("published_on_vinted")),
+                published_on_ebay=bool(s.get("published_on_ebay")),
             )
             db.add(article)
             db.flush()

api/services/article_service.py

@@ -42,6 +42,8 @@ def article_to_dict(article: Article) -> dict[str, Any]:
         "condition": article.condition,
         "purchase_price": float(article.purchase_price),
         "sell_price": float(article.sell_price) if article.sell_price is not None else None,
+        "sold_price": float(article.sold_price) if article.sold_price is not None else None,
+        "sale_source": article.sale_source,
         "is_sold": article.is_sold,
         "published_on_vinted": bool(article.published_on_vinted),
         "vinted_published_at": article.vinted_published_at.isoformat()

api/services/desktop_stubs_service.py

@@ -26,6 +26,9 @@ def article_from_api_dict(d: dict[str, Any]) -> Article:
         a.purchase_price = Decimal(str(d["purchase_price"]))
         sp = d.get("sell_price")
         a.sell_price = Decimal(str(sp)) if sp is not None else None
+        sdp = d.get("sold_price")
+        a.sold_price = Decimal(str(sdp)) if sdp is not None else None
+        a.sale_source = d.get("sale_source")
         a.is_sold = bool(d.get("is_sold", False))
         return a
 

api/services/stats_service.py

@@ -20,10 +20,22 @@ def _as_utc(value: dt.datetime | None) -> dt.datetime | None:
     return value.astimezone(dt.UTC)
 
 
+def _sale_proceeds_eur(article: Article) -> float | None:
+    """Proceeds: ``sold_price`` when set, otherwise legacy fallback to ``sell_price``."""
+    if article.sold_price is not None:
+        return float(article.sold_price)
+    if article.sell_price is not None:
+        return float(article.sell_price)
+    return None
+
+
 def _profit_eur(article: Article) -> float:
-    if not article.is_sold or article.sell_price is None:
+    if not article.is_sold:
+        return 0.0
+    proceeds = _sale_proceeds_eur(article)
+    if proceeds is None:
         return 0.0
-    return float(article.sell_price - article.purchase_price)
+    return proceeds - float(article.purchase_price)
 
 
 def _hours_to_sell(article: Article) -> float | None:
@@ -62,7 +74,7 @@ def in_month(a: Article) -> bool:
     profit_total = sum(_profit_eur(a) for a in sold)
 
     vinted_revenue = sum(
-        float(a.sell_price) for a in sold if a.sell_price is not None
+        p for a in sold for p in [_sale_proceeds_eur(a)] if p is not None
     )
 
     top_profitable = sorted(sold, key=_profit_eur, reverse=True)[:5]
@@ -81,10 +93,11 @@ def in_month(a: Article) -> bool:
     monthly_revenue: dict[str, float] = {}
     for a in sold:
         sold_at = _as_utc(a.sold_at)
-        if sold_at is None or a.sell_price is None:
+        proceeds = _sale_proceeds_eur(a)
+        if sold_at is None or proceeds is None:
             continue
         key = sold_at.strftime("%Y-%m")
-        monthly_revenue[key] = monthly_revenue.get(key, 0.0) + float(a.sell_price)
+        monthly_revenue[key] = monthly_revenue.get(key, 0.0) + proceeds
     revenue_timeline: list[dict[str, Any]] = []
     cumulative_rev = 0.0
     for month_key in sorted(monthly_revenue.keys()):
@@ -103,18 +116,23 @@ def in_month(a: Article) -> bool:
         key=lambda a: _as_utc(a.sold_at) or now,
         reverse=True,
     )[:30]
-    recent_sales_payload = [
-        {
-            "article_id": a.id,
-            "title": a.title,
-            "pokemon_name": a.pokemon_name,
-            "sold_at": a.sold_at.isoformat() if a.sold_at else None,
-            "sell_price_eur": float(a.sell_price) if a.sell_price is not None else None,
-            "purchase_price_eur": float(a.purchase_price),
-            "profit_eur": round(_profit_eur(a), 2),
-        }
-        for a in recent_sales
-    ]
+    recent_sales_payload = []
+    for a in recent_sales:
+        proceeds = _sale_proceeds_eur(a)
+        recent_sales_payload.append(
+            {
+                "article_id": a.id,
+                "title": a.title,
+                "pokemon_name": a.pokemon_name,
+                "sold_at": a.sold_at.isoformat() if a.sold_at else None,
+                "listing_price_eur": float(a.sell_price) if a.sell_price is not None else None,
+                "sold_price_eur": float(a.sold_price) if a.sold_price is not None else None,
+                "realized_price_eur": round(proceeds, 2) if proceeds is not None else None,
+                "sale_source": a.sale_source,
+                "purchase_price_eur": float(a.purchase_price),
+                "profit_eur": round(_profit_eur(a), 2),
+            }
+        )
 
     market_sum: float | None = None
     market_sum_unsold: float | None = None