feat: add page admin market CRUD and update shared_lib
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 43s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 43s
- Market create/delete routes in post admin blueprint - markets.py service (create_market, soft_delete_market) - _markets_panel.html admin template with HTMX create/delete - Update shared_lib submodule (MarketPlace model, migration, URLs) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -533,4 +533,98 @@ def register():
|
|||||||
return redirect(redirect_url)
|
return redirect(redirect_url)
|
||||||
|
|
||||||
|
|
||||||
|
@bp.get("/markets/")
|
||||||
|
@require_admin
|
||||||
|
async def markets(slug: str):
|
||||||
|
"""List markets for this page."""
|
||||||
|
from models.market_place import MarketPlace
|
||||||
|
from sqlalchemy import select as sa_select
|
||||||
|
|
||||||
|
post = (g.post_data or {}).get("post", {})
|
||||||
|
post_id = post.get("id")
|
||||||
|
if not post_id:
|
||||||
|
return await make_response("Post not found", 404)
|
||||||
|
|
||||||
|
page_markets = (await g.s.execute(
|
||||||
|
sa_select(MarketPlace).where(
|
||||||
|
MarketPlace.post_id == post_id,
|
||||||
|
MarketPlace.deleted_at.is_(None),
|
||||||
|
).order_by(MarketPlace.name)
|
||||||
|
)).scalars().all()
|
||||||
|
|
||||||
|
html = await render_template(
|
||||||
|
"_types/post/admin/_markets_panel.html",
|
||||||
|
markets=page_markets,
|
||||||
|
post=post,
|
||||||
|
)
|
||||||
|
return await make_response(html)
|
||||||
|
|
||||||
|
@bp.post("/markets/new/")
|
||||||
|
@require_admin
|
||||||
|
async def create_market(slug: str):
|
||||||
|
"""Create a new market for this page."""
|
||||||
|
from ..services.markets import create_market as _create_market, MarketError
|
||||||
|
from models.market_place import MarketPlace
|
||||||
|
from sqlalchemy import select as sa_select
|
||||||
|
from quart import jsonify
|
||||||
|
|
||||||
|
post = (g.post_data or {}).get("post", {})
|
||||||
|
post_id = post.get("id")
|
||||||
|
if not post_id:
|
||||||
|
return jsonify({"error": "Post not found"}), 404
|
||||||
|
|
||||||
|
form = await request.form
|
||||||
|
name = (form.get("name") or "").strip()
|
||||||
|
|
||||||
|
try:
|
||||||
|
await _create_market(g.s, post_id, name)
|
||||||
|
except MarketError as e:
|
||||||
|
return jsonify({"error": str(e)}), 400
|
||||||
|
|
||||||
|
# Return updated markets list
|
||||||
|
page_markets = (await g.s.execute(
|
||||||
|
sa_select(MarketPlace).where(
|
||||||
|
MarketPlace.post_id == post_id,
|
||||||
|
MarketPlace.deleted_at.is_(None),
|
||||||
|
).order_by(MarketPlace.name)
|
||||||
|
)).scalars().all()
|
||||||
|
|
||||||
|
html = await render_template(
|
||||||
|
"_types/post/admin/_markets_panel.html",
|
||||||
|
markets=page_markets,
|
||||||
|
post=post,
|
||||||
|
)
|
||||||
|
return await make_response(html)
|
||||||
|
|
||||||
|
@bp.delete("/markets/<market_slug>/")
|
||||||
|
@require_admin
|
||||||
|
async def delete_market(slug: str, market_slug: str):
|
||||||
|
"""Soft-delete a market."""
|
||||||
|
from ..services.markets import soft_delete_market
|
||||||
|
from models.market_place import MarketPlace
|
||||||
|
from sqlalchemy import select as sa_select
|
||||||
|
from quart import jsonify
|
||||||
|
|
||||||
|
post = (g.post_data or {}).get("post", {})
|
||||||
|
post_id = post.get("id")
|
||||||
|
|
||||||
|
deleted = await soft_delete_market(g.s, slug, market_slug)
|
||||||
|
if not deleted:
|
||||||
|
return jsonify({"error": "Market not found"}), 404
|
||||||
|
|
||||||
|
# Return updated markets list
|
||||||
|
page_markets = (await g.s.execute(
|
||||||
|
sa_select(MarketPlace).where(
|
||||||
|
MarketPlace.post_id == post_id,
|
||||||
|
MarketPlace.deleted_at.is_(None),
|
||||||
|
).order_by(MarketPlace.name)
|
||||||
|
)).scalars().all()
|
||||||
|
|
||||||
|
html = await render_template(
|
||||||
|
"_types/post/admin/_markets_panel.html",
|
||||||
|
markets=page_markets,
|
||||||
|
post=post,
|
||||||
|
)
|
||||||
|
return await make_response(html)
|
||||||
|
|
||||||
return bp
|
return bp
|
||||||
|
|||||||
88
bp/post/services/markets.py
Normal file
88
bp/post/services/markets.py
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
import unicodedata
|
||||||
|
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
|
from models.market_place import MarketPlace
|
||||||
|
from models.ghost_content import Post
|
||||||
|
from models.page_config import PageConfig
|
||||||
|
from suma_browser.app.utils import utcnow
|
||||||
|
|
||||||
|
|
||||||
|
class MarketError(ValueError):
|
||||||
|
"""Base error for market service operations."""
|
||||||
|
|
||||||
|
|
||||||
|
def slugify(value: str, max_len: int = 255) -> str:
|
||||||
|
if value is None:
|
||||||
|
value = ""
|
||||||
|
value = unicodedata.normalize("NFKD", value)
|
||||||
|
value = value.encode("ascii", "ignore").decode("ascii")
|
||||||
|
value = value.lower()
|
||||||
|
value = value.replace("/", "-")
|
||||||
|
value = re.sub(r"[^a-z0-9]+", "-", value)
|
||||||
|
value = re.sub(r"-{2,}", "-", value)
|
||||||
|
value = value.strip("-")[:max_len].strip("-")
|
||||||
|
return value or "market"
|
||||||
|
|
||||||
|
|
||||||
|
async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPlace:
|
||||||
|
name = (name or "").strip()
|
||||||
|
if not name:
|
||||||
|
raise MarketError("Market name must not be empty.")
|
||||||
|
slug = slugify(name)
|
||||||
|
|
||||||
|
post = (await sess.execute(select(Post).where(Post.id == post_id))).scalar_one_or_none()
|
||||||
|
if not post:
|
||||||
|
raise MarketError(f"Post {post_id} does not exist.")
|
||||||
|
|
||||||
|
if not post.is_page:
|
||||||
|
raise MarketError("Markets can only be created on pages, not posts.")
|
||||||
|
|
||||||
|
pc = (await sess.execute(
|
||||||
|
select(PageConfig).where(PageConfig.post_id == post_id)
|
||||||
|
)).scalar_one_or_none()
|
||||||
|
if pc is None or not (pc.features or {}).get("market"):
|
||||||
|
raise MarketError("Market feature is not enabled for this page. Enable it in page settings first.")
|
||||||
|
|
||||||
|
# Look for existing (including soft-deleted)
|
||||||
|
existing = (await sess.execute(
|
||||||
|
select(MarketPlace).where(MarketPlace.post_id == post_id, MarketPlace.slug == slug)
|
||||||
|
)).scalar_one_or_none()
|
||||||
|
|
||||||
|
if existing:
|
||||||
|
if existing.deleted_at is not None:
|
||||||
|
existing.deleted_at = None # revive
|
||||||
|
existing.name = name
|
||||||
|
await sess.flush()
|
||||||
|
return existing
|
||||||
|
raise MarketError(f'Market with slug "{slug}" already exists for this page.')
|
||||||
|
|
||||||
|
market = MarketPlace(post_id=post_id, name=name, slug=slug)
|
||||||
|
sess.add(market)
|
||||||
|
await sess.flush()
|
||||||
|
return market
|
||||||
|
|
||||||
|
|
||||||
|
async def soft_delete_market(sess: AsyncSession, post_slug: str, market_slug: str) -> bool:
|
||||||
|
market = (
|
||||||
|
await sess.execute(
|
||||||
|
select(MarketPlace)
|
||||||
|
.join(Post, MarketPlace.post_id == Post.id)
|
||||||
|
.where(
|
||||||
|
Post.slug == post_slug,
|
||||||
|
MarketPlace.slug == market_slug,
|
||||||
|
MarketPlace.deleted_at.is_(None),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
).scalar_one_or_none()
|
||||||
|
|
||||||
|
if not market:
|
||||||
|
return False
|
||||||
|
|
||||||
|
market.deleted_at = utcnow()
|
||||||
|
await sess.flush()
|
||||||
|
return True
|
||||||
Submodule shared_lib updated: 3cc5730377...7eb66fbf24
44
templates/_types/post/admin/_markets_panel.html
Normal file
44
templates/_types/post/admin/_markets_panel.html
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
<div id="markets-panel">
|
||||||
|
<h3 class="text-lg font-semibold mb-3">Markets</h3>
|
||||||
|
|
||||||
|
{% if markets %}
|
||||||
|
<ul class="space-y-2 mb-4">
|
||||||
|
{% for m in markets %}
|
||||||
|
<li class="flex items-center justify-between p-3 bg-stone-50 rounded">
|
||||||
|
<div>
|
||||||
|
<span class="font-medium">{{ m.name }}</span>
|
||||||
|
<span class="text-stone-400 text-sm ml-2">/{{ m.slug }}/</span>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
hx-delete="{{ url_for('blog.post.admin.delete_market', slug=post.slug, market_slug=m.slug) }}"
|
||||||
|
hx-target="#markets-panel"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
hx-confirm="Delete market '{{ m.name }}'?"
|
||||||
|
class="text-red-600 hover:text-red-800 text-sm"
|
||||||
|
>Delete</button>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% else %}
|
||||||
|
<p class="text-stone-500 mb-4 text-sm">No markets yet.</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<form
|
||||||
|
hx-post="{{ url_for('blog.post.admin.create_market', slug=post.slug) }}"
|
||||||
|
hx-target="#markets-panel"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
class="flex gap-2"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
name="name"
|
||||||
|
placeholder="Market name"
|
||||||
|
required
|
||||||
|
class="flex-1 border border-stone-300 rounded px-3 py-1.5 text-sm"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="bg-stone-800 text-white px-4 py-1.5 rounded text-sm hover:bg-stone-700"
|
||||||
|
>Create</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
Reference in New Issue
Block a user