feat: persistance filters multiple sell and auto etiquette

Author: Leoglme

api/assets/goupixdex-logo.png

@@ -199,13 +199,14 @@ async def publish_vinted_for_article(
     return {
         "vinted": {
             "status": "running",
-            "stream_path": f"/articles/{article_id}/vinted-progress",
+            "stream_path": f"/articles/{article_id}/listing-progress",
         },
     }
 
 
-@router.get("/{article_id}/vinted-progress")
-async def vinted_progress_stream(
+@router.get("/{article_id}/listing-progress")
+@router.get("/{article_id}/vinted-progress", include_in_schema=False)
+async def article_listing_progress_stream(
     article_id: int,
     _: Annotated[int, Depends(get_user_id_introspected)],
 ) -> StreamingResponse:

api/desktop_vinted_server.py

@@ -24,6 +24,7 @@
 from routes import pricing_route
 from routes import scan as scan_routes
 from routes import settings_route
+from routes import shipping_route
 from routes import stats_route
 from routes import users as users_routes
 
@@ -103,3 +104,4 @@ def health() -> dict[str, str]:
 app.include_router(pricing_route.router)
 app.include_router(stats_route.router)
 app.include_router(scan_routes.router)
+app.include_router(shipping_route.router)

api/main.py

@@ -24,3 +24,6 @@ supabase>=2.0.0
 requests>=2.31.0
 browser-cookie3>=0.19.0
 vinted-scraper>=3.0.0
+
+# Shipping label PDF generation (Avery L7173 — 8 labels per A4)
+reportlab>=4.0.0

api/requirements.txt

@@ -66,6 +66,21 @@ def _parse_sold_at_iso(value: str | None) -> dt.datetime | None:
         ) from exc
 
 
+def _parse_optional_iso_dt(value: str | None) -> dt.datetime | None:
+    """Parse ISO-ish datetime without raising (e.g. wardrobe import)."""
+    if value is None or not str(value).strip():
+        return None
+    raw = str(value).strip()
+    try:
+        return dt.datetime.fromisoformat(raw.replace("Z", "+00:00"))
+    except ValueError:
+        pass
+    try:
+        return dt.datetime.strptime(raw[:10], "%Y-%m-%d").replace(tzinfo=dt.UTC)
+    except ValueError:
+        return None
+
+
 @router.post("/bulk-delete", status_code=status.HTTP_200_OK)
 def bulk_delete_articles(
     body: BulkIdsBody,
@@ -218,14 +233,16 @@ def list_articles(
     return [article_service.article_to_dict(a) for a in rows]
 
 
-@router.get("/{article_id}/vinted-progress")
-async def vinted_progress_stream(
+@router.get("/{article_id}/listing-progress")
+@router.get("/{article_id}/vinted-progress", include_in_schema=False)
+async def article_listing_progress_stream(
     article_id: int,
     user: Annotated[User, Depends(get_current_user_from_token_str)],
     db: Annotated[Session, Depends(get_db)],
 ) -> StreamingResponse:
     """
     SSE stream for Vinted and/or eBay publish steps (JWT via ``Authorization`` or ``?token=``).
+    Legacy path: ``/vinted-progress`` (alias).
     """
     article = article_service.get_article(db, article_id, user.id)
     if article is None:
@@ -267,7 +284,7 @@ def publish_vinted_for_article(
 ) -> dict[str, Any]:
     """
     Start Vinted publish for an existing article (images already stored).
-    Follow SSE ``GET /articles/{id}/vinted-progress``.
+    Follow SSE ``GET /articles/{id}/listing-progress``.
     """
     article = article_service.get_article(db, article_id, user.id)
     if article is None:
@@ -300,7 +317,7 @@ def publish_vinted_for_article(
     return {
         "vinted": {
             "status": "running",
-            "stream_path": f"/articles/{article_id}/vinted-progress",
+            "stream_path": f"/articles/{article_id}/listing-progress",
         },
     }
 
@@ -368,7 +385,7 @@ def publish_ebay_for_article(
     return {
         "ebay": {
             "status": "running",
-            "stream_path": f"/articles/{article_id}/vinted-progress",
+            "stream_path": f"/articles/{article_id}/listing-progress",
         },
     }
 
@@ -387,10 +404,14 @@ async def create_article(
     card_number: str | None = Form(None),
     condition: str = Form("Near Mint"),
     sell_price: str | None = Form(None),
+    sold_price: str | None = Form(None),
+    sale_source: str | None = Form(None),
     publish_to_vinted: str | None = Form(None),
     publish_to_ebay: str | None = Form(None),
     is_sold: str | None = Form(None),
     sold_at: str | None = Form(None),
+    wardrobe_vinted_listed: str | None = Form(None),
+    vinted_published_at: str | None = Form(None),
     images: list[UploadFile] | None = File(None),
 ) -> dict[str, Any]:
     settings = get_settings()
@@ -399,6 +420,19 @@ async def create_article(
     if sold_flag and sold_at_dt is None:
         sold_at_dt = dt.datetime.now(dt.UTC)
 
+    sell_dec = _parse_decimal(sell_price)
+    proceeds_dec = _parse_decimal(sold_price) if sold_flag and sold_price else None
+    if sold_flag and proceeds_dec is None:
+        proceeds_dec = sell_dec
+
+    sale_src: str | None = None
+    if sold_flag:
+        raw_ss = (sale_source or "").strip().lower()
+        if raw_ss in ("vinted", "ebay"):
+            sale_src = raw_ss[:16]
+        elif _form_bool(wardrobe_vinted_listed):
+            sale_src = "vinted"
+
     article = Article(
         user_id=user.id,
         title=title.strip(),
@@ -408,10 +442,20 @@ async def create_article(
         card_number=card_number.strip() if card_number else None,
         condition=condition.strip() or "Near Mint",
         purchase_price=_parse_decimal_required(purchase_price),
-        sell_price=_parse_decimal(sell_price),
+        sell_price=sell_dec,
+        sold_price=proceeds_dec if sold_flag else None,
+        sale_source=sale_src,
         is_sold=sold_flag,
         sold_at=sold_at_dt if sold_flag else None,
     )
+
+    if _form_bool(wardrobe_vinted_listed):
+        article.published_on_vinted = True
+        vp = _parse_optional_iso_dt(vinted_published_at)
+        if vp is not None:
+            article.vinted_published_at = vp
+        elif not sold_flag:
+            article.vinted_published_at = dt.datetime.now(dt.UTC)
     db.add(article)
     db.flush()
 
@@ -446,7 +490,7 @@ async def create_article(
     want_vinted = raw_want_vinted and ms.vinted_enabled
     raw_want_ebay = _form_bool(publish_to_ebay) and not sold_flag
 
-    stream_path = f"/articles/{article.id}/vinted-progress"
+    stream_path = f"/articles/{article.id}/listing-progress"
     want_both_server = (
         want_vinted
         and not vinted_local_desktop

api/routes/articles.py

@@ -0,0 +1,96 @@
+"""Shipping labels: list eBay buyer orders + render an A4 sheet of labels (Avery L7173)."""
+
+from __future__ import annotations
+
+from typing import Annotated, Any
+
+from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi.responses import Response
+from pydantic import BaseModel, Field
+from sqlalchemy.orm import Session
+
+from core.database import get_db
+from core.deps import get_current_user
+from core.security import decrypt_ebay_token
+from models.user import User
+from services.ebay_orders_service import list_unshipped_orders
+from services.ebay_publish_service import ensure_ebay_access_token
+from services.shipping_label_service import LabelAddress, render_labels_pdf
+
+router = APIRouter(prefix="/shipping", tags=["shipping"])
+
+
+class ShippingLabelInput(BaseModel):
+    """One recipient block. Edits made before printing never touch the eBay order."""
+
+    full_name: str = Field(..., min_length=1, max_length=120)
+    line1: str = Field(..., min_length=1, max_length=180)
+    line2: str | None = Field(default=None, max_length=180)
+    postal_code: str = Field(..., min_length=1, max_length=20)
+    city: str = Field(..., min_length=1, max_length=80)
+    state: str | None = Field(default=None, max_length=80)
+    country_code: str | None = Field(default="FR", max_length=3)
+
+
+class ShippingLabelsBody(BaseModel):
+    addresses: list[ShippingLabelInput] = Field(..., min_length=1, max_length=200)
+
+
+@router.get("/ebay-orders")
+async def shipping_ebay_orders(
+    db: Annotated[Session, Depends(get_db)],
+    user: Annotated[User, Depends(get_current_user)],
+) -> dict[str, Any]:
+    """List eBay buyer orders that still need shipping (NOT_STARTED / IN_PROGRESS, last 90 days)."""
+    if not decrypt_ebay_token(user.ebay_refresh_token):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Connect eBay first (OAuth).",
+        )
+    try:
+        token = await ensure_ebay_access_token(db, user)
+    except RuntimeError as exc:
+        raise HTTPException(status_code=400, detail=str(exc)) from exc
+
+    try:
+        orders = await list_unshipped_orders(token)
+    except Exception as exc:
+        raise HTTPException(
+            status_code=status.HTTP_502_BAD_GATEWAY,
+            detail=f"eBay Fulfillment API error: {exc}",
+        ) from exc
+    return {"orders": orders, "count": len(orders)}
+
+
+@router.post("/labels.pdf")
+async def shipping_labels_pdf(
+    body: ShippingLabelsBody,
+    user: Annotated[User, Depends(get_current_user)],  # noqa: ARG001 (auth gate)
+) -> Response:
+    """
+    Render the supplied recipient blocks as an A4 PDF (Avery L7173 — 99×57 mm, 8 per page).
+
+    Same endpoint serves both the in-app preview (iframe) and the final download — guarantees
+    the on-screen rendering matches the printed output byte-for-byte.
+    """
+    addresses = [
+        LabelAddress(
+            full_name=row.full_name.strip(),
+            line1=row.line1.strip(),
+            line2=row.line2.strip() if row.line2 else None,
+            postal_code=row.postal_code.strip(),
+            city=row.city.strip(),
+            state=row.state.strip() if row.state else None,
+            country_code=(row.country_code or "FR").strip().upper() or "FR",
+        )
+        for row in body.addresses
+    ]
+    pdf = render_labels_pdf(addresses)
+    return Response(
+        content=pdf,
+        media_type="application/pdf",
+        headers={
+            "Content-Disposition": 'inline; filename="goupixdex-etiquettes.pdf"',
+            "Cache-Control": "no-store",
+        },
+    )