Some checks failed
Build and Deploy / build-and-deploy (push) Has been cancelled
Phase 1 - Relations service (internal): owns ContainerRelation, exposes get-children data + attach/detach-child actions. Retargeted events, blog, market callers from cart to relations. Phase 2 - Likes service (internal): unified Like model replaces ProductLike and PostLike with generic target_type/target_slug/target_id. Exposes is-liked, liked-slugs, liked-ids data + toggle action. Phase 3 - PageConfig → blog: moved ownership to blog with direct DB queries, removed proxy endpoints from cart. Phase 4 - Orders service (public): owns Order/OrderItem + SumUp checkout flow. Cart checkout now delegates to orders via create-order action. Webhook/return routes and reconciliation moved to orders. Phase 5 - Infrastructure: docker-compose, deploy.sh, Dockerfiles updated for all 3 new services. Added orders_url helper and factory model imports. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
179 lines
5.3 KiB
Python
179 lines
5.3 KiB
Python
from __future__ import annotations
|
|
|
|
from urllib.parse import urljoin
|
|
|
|
from quart import (
|
|
g,
|
|
request,
|
|
)
|
|
from shared.config import config
|
|
from .products import products, products_nocounts
|
|
from .blacklist.product_details import is_blacklisted_heading
|
|
|
|
from shared.utils import host_url
|
|
|
|
|
|
from shared.infrastructure.data_client import fetch_data
|
|
from ...market.filters.qs import decode
|
|
|
|
|
|
def _hx_fragment_request() -> bool:
|
|
return request.headers.get("HX-Request", "").lower() == "true"
|
|
|
|
async def _productInfo(top_slug=None, sub_slug=None):
|
|
"""
|
|
Shared query logic for home / category / subcategory pages.
|
|
Pulls filters from qs.decode(), queries products(), and orders brands/stickers/etc.
|
|
"""
|
|
|
|
q = decode()
|
|
page, search, sort = q.page, q.search, q.sort
|
|
selected_brands, selected_stickers, selected_labels = q.selected_brands, q.selected_stickers, q.selected_labels
|
|
liked = q.liked
|
|
|
|
# Get market_id from hydrated market context
|
|
market = getattr(g, "market", None)
|
|
market_id = market.id if market else None
|
|
|
|
if top_slug is not None and sub_slug is not None:
|
|
list_url = urljoin(config()["base_url"], f"/{top_slug}/{sub_slug}")
|
|
else:
|
|
if top_slug is not None:
|
|
list_url = top_slug
|
|
else:
|
|
list_url = ""
|
|
if not _hx_fragment_request() or page==1:
|
|
items, brands, stickers, labels, total_pages, liked_count, search_count = await products(
|
|
list_url,
|
|
selected_brands=selected_brands,
|
|
selected_stickers=selected_stickers,
|
|
selected_labels=selected_labels,
|
|
page=page,
|
|
search=search,
|
|
sort=sort,
|
|
user_id=g.user.id if g.user else None,
|
|
liked = liked,
|
|
market_id=market_id,
|
|
)
|
|
|
|
brands_ordered = _order_brands_selected_first(brands, selected_brands)
|
|
|
|
return {
|
|
"products": items,
|
|
"page": page,
|
|
"search": search,
|
|
"sort": sort,
|
|
"total_pages": int(total_pages or 1),
|
|
"brands": brands_ordered,
|
|
"selected_brands": selected_brands,
|
|
"stickers": stickers,
|
|
"selected_stickers": selected_stickers,
|
|
"labels": labels,
|
|
"selected_labels": selected_labels,
|
|
"liked": liked,
|
|
"liked_count": liked_count,
|
|
"search_count": search_count
|
|
}
|
|
else:
|
|
items, total_pages = await products_nocounts(
|
|
g.s,
|
|
list_url,
|
|
selected_brands=selected_brands,
|
|
selected_stickers=selected_stickers,
|
|
selected_labels=selected_labels,
|
|
page=page,
|
|
search=search,
|
|
sort=sort,
|
|
user_id=g.user.id if g.user else None,
|
|
liked = liked,
|
|
market_id=market_id,
|
|
)
|
|
return {
|
|
"products": items,
|
|
"page": page,
|
|
"search": search,
|
|
"sort": sort,
|
|
"total_pages": int(total_pages or 1),
|
|
}
|
|
|
|
|
|
def _order_brands_selected_first(brands, selected):
|
|
"""Return brands with the selected brand(s) first."""
|
|
if not brands or not selected:
|
|
return brands
|
|
sel = [(s or "").strip() for s in selected]
|
|
head = [s for s in brands if (s.get("name") or "").strip() in sel]
|
|
tail = [s for s in brands if (s.get("name") or "").strip() not in sel]
|
|
return head + tail
|
|
|
|
|
|
def _order_stickers_selected_first(
|
|
stickers: list[dict], selected_stickers: list[str] | None
|
|
):
|
|
if not stickers or not selected_stickers:
|
|
return stickers
|
|
sel = [(s or "").strip().lower() for s in selected_stickers]
|
|
head = [s for s in stickers if (s.get("name") or "").strip().lower() in sel]
|
|
tail = [
|
|
s
|
|
for s in stickers
|
|
if (s.get("name") or "").strip().lower() not in sel
|
|
]
|
|
return head + tail
|
|
|
|
|
|
def _order_labels_selected_first(
|
|
labels: list[dict], selected_labels: list[str] | None
|
|
):
|
|
if not labels or not selected_labels:
|
|
return labels
|
|
sel = [(s or "").strip().lower() for s in selected_labels]
|
|
head = [s for s in labels if (s.get("name") or "").strip().lower() in sel]
|
|
tail = [
|
|
s
|
|
for s in labels
|
|
if (s.get("name") or "").strip().lower() not in sel
|
|
]
|
|
return head + tail
|
|
|
|
def _massage_product(d):
|
|
"""
|
|
Normalise the product dict for templates:
|
|
- inject APP_ROOT into HTML
|
|
- drop blacklisted sections
|
|
"""
|
|
massaged = {
|
|
**d,
|
|
"description_html": d["description_html"].replace(
|
|
"[**__APP_ROOT__**]", g.root
|
|
),
|
|
"sections": [
|
|
{
|
|
**section,
|
|
"html": section["html"].replace(
|
|
"[**__APP_ROOT__**]", g.root
|
|
),
|
|
}
|
|
for section in d["sections"]
|
|
if not is_blacklisted_heading(section["title"])
|
|
],
|
|
}
|
|
return massaged
|
|
|
|
|
|
# Re-export from canonical shared location
|
|
from shared.infrastructure.http_utils import vary as _vary, current_url_without_page as _current_url_without_page
|
|
|
|
async def _is_liked(user_id: int | None, slug: str) -> bool:
|
|
"""
|
|
Check if this user has liked this product.
|
|
"""
|
|
if not user_id:
|
|
return False
|
|
liked_data = await fetch_data("likes", "is-liked", params={
|
|
"user_id": user_id, "target_type": "product", "target_slug": slug,
|
|
}, required=False)
|
|
return (liked_data or {}).get("liked", False)
|
|
|
|
|