merge: semantic-compression — add compression helpers, macros, and coding philosophy

Applies Casey Muratori's semantic compression across all three packages: - count_where() helper: 30+ COUNT(*) call sites compressed - _forward_lead(): deduplicates lead forward routes - 5 SQLMesh macros for country code patterns (7 models) - skip_if_current() + write_jsonl_atomic() extract helpers Net: -118 lines (272 added, 390 removed) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-02 08:00:15 +01:00
parent b32b7cd748 f93e4fd0d1
commit 31017457a6
23 changed files with 269 additions and 378 deletions
--- a/web/src/padelnomics/admin/pipeline_routes.py
+++ b/web/src/padelnomics/admin/pipeline_routes.py
@@ -35,7 +35,7 @@ from pathlib import Path
 from quart import Blueprint, flash, redirect, render_template, request, url_for

 from ..auth.routes import role_required
-from ..core import csrf_protect
+from ..core import count_where, csrf_protect

 logger = logging.getLogger(__name__)

@@ -298,11 +298,8 @@ async def _inject_sidebar_data():
    """Load unread inbox count for the admin sidebar badge."""
    from quart import g

-    from ..core import fetch_one
-
    try:
-        row = await fetch_one("SELECT COUNT(*) as cnt FROM inbound_emails WHERE is_read = 0")
-        g.admin_unread_count = row["cnt"] if row else 0
+        g.admin_unread_count = await count_where("inbound_emails WHERE is_read = 0")
    except Exception:
        g.admin_unread_count = 0

--- a/web/src/padelnomics/admin/pseo_routes.py
+++ b/web/src/padelnomics/admin/pseo_routes.py
@@ -25,7 +25,7 @@ from ..content.health import (
    get_template_freshness,
    get_template_stats,
 )
-from ..core import csrf_protect, fetch_all, fetch_one
+from ..core import count_where, csrf_protect, fetch_all, fetch_one

 bp = Blueprint(
    "pseo",
@@ -41,8 +41,7 @@ async def _inject_sidebar_data():
    from quart import g

    try:
-        row = await fetch_one("SELECT COUNT(*) as cnt FROM inbound_emails WHERE is_read = 0")
-        g.admin_unread_count = row["cnt"] if row else 0
+        g.admin_unread_count = await count_where("inbound_emails WHERE is_read = 0")
    except Exception:
        g.admin_unread_count = 0

@@ -80,8 +79,7 @@ async def pseo_dashboard():
    total_published = sum(r["stats"]["published"] for r in template_rows)
    stale_count = sum(1 for f in freshness if f["status"] == "stale")

-    noindex_row = await fetch_one("SELECT COUNT(*) as cnt FROM articles WHERE noindex = 1")
-    noindex_count = noindex_row["cnt"] if noindex_row else 0
+    noindex_count = await count_where("articles WHERE noindex = 1")

    # Recent generation jobs — enough for the dashboard summary.
    jobs = await fetch_all(
--- a/web/src/padelnomics/admin/routes.py
+++ b/web/src/padelnomics/admin/routes.py
@@ -28,6 +28,7 @@ from ..auth.routes import role_required
 from ..core import (
    EMAIL_ADDRESSES,
    config,
+    count_where,
    csrf_protect,
    execute,
    fetch_all,
@@ -91,8 +92,7 @@ async def _inject_admin_sidebar_data():
    """Load unread inbox count for sidebar badge on every admin page."""
    from quart import g
    try:
-        row = await fetch_one("SELECT COUNT(*) as cnt FROM inbound_emails WHERE is_read = 0")
-        g.admin_unread_count = row["cnt"] if row else 0
+        g.admin_unread_count = await count_where("inbound_emails WHERE is_read = 0")
    except Exception:
        logger.exception("Failed to load admin sidebar unread count")
        g.admin_unread_count = 0
@@ -114,76 +114,32 @@ async def get_dashboard_stats() -> dict:
    now = utcnow()
    today = now.date().isoformat()
    week_ago = (now - timedelta(days=7)).strftime("%Y-%m-%d %H:%M:%S")
-    users_total = await fetch_one("SELECT COUNT(*) as count FROM users WHERE deleted_at IS NULL")
-    users_today = await fetch_one(
-        "SELECT COUNT(*) as count FROM users WHERE created_at >= ? AND deleted_at IS NULL",
-        (today,)
-    )
-    users_week = await fetch_one(
-        "SELECT COUNT(*) as count FROM users WHERE created_at >= ? AND deleted_at IS NULL",
-        (week_ago,)
-    )

-    subs = await fetch_one(
-        "SELECT COUNT(*) as count FROM subscriptions WHERE status = 'active'"
+    # Two queries that aren't simple COUNT(*) — keep as fetch_one
+    planner_row = await fetch_one(
+        "SELECT COUNT(DISTINCT user_id) AS n FROM scenarios WHERE deleted_at IS NULL"
    )
-
-    tasks_pending = await fetch_one("SELECT COUNT(*) as count FROM tasks WHERE status = 'pending'")
-    tasks_failed = await fetch_one("SELECT COUNT(*) as count FROM tasks WHERE status = 'failed'")
-
-    # Lead funnel stats
-    leads_total = await fetch_one(
-        "SELECT COUNT(*) as count FROM lead_requests WHERE lead_type = 'quote'"
-    )
-    leads_new = await fetch_one(
-        "SELECT COUNT(*) as count FROM lead_requests WHERE status = 'new' AND lead_type = 'quote'"
-    )
-    leads_verified = await fetch_one(
-        "SELECT COUNT(*) as count FROM lead_requests WHERE verified_at IS NOT NULL AND lead_type = 'quote'"
-    )
-    leads_unlocked = await fetch_one(
-        "SELECT COUNT(*) as count FROM lead_requests WHERE unlock_count > 0 AND lead_type = 'quote'"
-    )
-
-    # Planner users
-    planner_users = await fetch_one(
-        "SELECT COUNT(DISTINCT user_id) as count FROM scenarios WHERE deleted_at IS NULL"
-    )
-
-    # Supplier stats
-    suppliers_claimed = await fetch_one(
-        "SELECT COUNT(*) as count FROM suppliers WHERE claimed_by IS NOT NULL"
-    )
-    suppliers_growth = await fetch_one(
-        "SELECT COUNT(*) as count FROM suppliers WHERE tier = 'growth'"
-    )
-    suppliers_pro = await fetch_one(
-        "SELECT COUNT(*) as count FROM suppliers WHERE tier = 'pro'"
-    )
-    total_credits_spent = await fetch_one(
-        "SELECT COALESCE(SUM(ABS(delta)), 0) as total FROM credit_ledger WHERE delta < 0"
-    )
-    leads_unlocked_by_suppliers = await fetch_one(
-        "SELECT COUNT(*) as count FROM lead_forwards"
+    credits_row = await fetch_one(
+        "SELECT COALESCE(SUM(ABS(delta)), 0) AS n FROM credit_ledger WHERE delta < 0"
    )

    return {
-        "users_total": users_total["count"] if users_total else 0,
-        "users_today": users_today["count"] if users_today else 0,
-        "users_week": users_week["count"] if users_week else 0,
-        "active_subscriptions": subs["count"] if subs else 0,
-        "tasks_pending": tasks_pending["count"] if tasks_pending else 0,
-        "tasks_failed": tasks_failed["count"] if tasks_failed else 0,
-        "leads_total": leads_total["count"] if leads_total else 0,
-        "leads_new": leads_new["count"] if leads_new else 0,
-        "leads_verified": leads_verified["count"] if leads_verified else 0,
-        "leads_unlocked": leads_unlocked["count"] if leads_unlocked else 0,
-        "planner_users": planner_users["count"] if planner_users else 0,
-        "suppliers_claimed": suppliers_claimed["count"] if suppliers_claimed else 0,
-        "suppliers_growth": suppliers_growth["count"] if suppliers_growth else 0,
-        "suppliers_pro": suppliers_pro["count"] if suppliers_pro else 0,
-        "total_credits_spent": total_credits_spent["total"] if total_credits_spent else 0,
-        "leads_unlocked_by_suppliers": leads_unlocked_by_suppliers["count"] if leads_unlocked_by_suppliers else 0,
+        "users_total": await count_where("users WHERE deleted_at IS NULL"),
+        "users_today": await count_where("users WHERE created_at >= ? AND deleted_at IS NULL", (today,)),
+        "users_week": await count_where("users WHERE created_at >= ? AND deleted_at IS NULL", (week_ago,)),
+        "active_subscriptions": await count_where("subscriptions WHERE status = 'active'"),
+        "tasks_pending": await count_where("tasks WHERE status = 'pending'"),
+        "tasks_failed": await count_where("tasks WHERE status = 'failed'"),
+        "leads_total": await count_where("lead_requests WHERE lead_type = 'quote'"),
+        "leads_new": await count_where("lead_requests WHERE status = 'new' AND lead_type = 'quote'"),
+        "leads_verified": await count_where("lead_requests WHERE verified_at IS NOT NULL AND lead_type = 'quote'"),
+        "leads_unlocked": await count_where("lead_requests WHERE unlock_count > 0 AND lead_type = 'quote'"),
+        "planner_users": planner_row["n"] if planner_row else 0,
+        "suppliers_claimed": await count_where("suppliers WHERE claimed_by IS NOT NULL"),
+        "suppliers_growth": await count_where("suppliers WHERE tier = 'growth'"),
+        "suppliers_pro": await count_where("suppliers WHERE tier = 'pro'"),
+        "total_credits_spent": credits_row["n"] if credits_row else 0,
+        "leads_unlocked_by_suppliers": await count_where("lead_forwards WHERE 1=1"),
    }


@@ -446,10 +402,7 @@ async def get_leads(
        params.append(f"-{days} days")

    where = " AND ".join(wheres)
-    count_row = await fetch_one(
-        f"SELECT COUNT(*) as cnt FROM lead_requests WHERE {where}", tuple(params)
-    )
-    total = count_row["cnt"] if count_row else 0
+    total = await count_where(f"lead_requests WHERE {where}", tuple(params))

    offset = (page - 1) * per_page
    rows = await fetch_all(
@@ -679,26 +632,14 @@ async def lead_new():
    return await render_template("admin/lead_form.html", data={}, statuses=LEAD_STATUSES)


-@bp.route("/leads/<int:lead_id>/forward", methods=["POST"])
-@role_required("admin")
-@csrf_protect
-async def lead_forward(lead_id: int):
-    """Manually forward a lead to a supplier (no credit cost)."""
-    form = await request.form
-    supplier_id = int(form.get("supplier_id", 0))
-
-    if not supplier_id:
-        await flash("Select a supplier.", "error")
-        return redirect(url_for("admin.lead_detail", lead_id=lead_id))
-
-    # Check if already forwarded
+async def _forward_lead(lead_id: int, supplier_id: int) -> str | None:
+    """Forward a lead to a supplier. Returns error message or None on success."""
    existing = await fetch_one(
        "SELECT 1 FROM lead_forwards WHERE lead_id = ? AND supplier_id = ?",
        (lead_id, supplier_id),
    )
    if existing:
-        await flash("Already forwarded to this supplier.", "warning")
-        return redirect(url_for("admin.lead_detail", lead_id=lead_id))
+        return "Already forwarded to this supplier."

    now = utcnow_iso()
    await execute(
@@ -710,15 +651,27 @@ async def lead_forward(lead_id: int):
        "UPDATE lead_requests SET unlock_count = unlock_count + 1, status = 'forwarded' WHERE id = ?",
        (lead_id,),
    )
-
-    # Enqueue forward email
    from ..worker import enqueue
-    await enqueue("send_lead_forward_email", {
-        "lead_id": lead_id,
-        "supplier_id": supplier_id,
-    })
+    await enqueue("send_lead_forward_email", {"lead_id": lead_id, "supplier_id": supplier_id})
+    return None

-    await flash("Lead forwarded to supplier.", "success")
+
+@bp.route("/leads/<int:lead_id>/forward", methods=["POST"])
+@role_required("admin")
+@csrf_protect
+async def lead_forward(lead_id: int):
+    """Manually forward a lead to a supplier (no credit cost)."""
+    form = await request.form
+    supplier_id = int(form.get("supplier_id", 0))
+    if not supplier_id:
+        await flash("Select a supplier.", "error")
+        return redirect(url_for("admin.lead_detail", lead_id=lead_id))
+
+    error = await _forward_lead(lead_id, supplier_id)
+    if error:
+        await flash(error, "warning")
+    else:
+        await flash("Lead forwarded to supplier.", "success")
    return redirect(url_for("admin.lead_detail", lead_id=lead_id))


@@ -751,25 +704,9 @@ async def lead_forward_htmx(lead_id: int):
        return Response("Select a supplier.", status=422)
    supplier_id = int(supplier_id_str)

-    existing = await fetch_one(
-        "SELECT 1 FROM lead_forwards WHERE lead_id = ? AND supplier_id = ?",
-        (lead_id, supplier_id),
-    )
-    if existing:
-        return Response("Already forwarded to this supplier.", status=422)
-
-    now = utcnow_iso()
-    await execute(
-        """INSERT INTO lead_forwards (lead_id, supplier_id, credit_cost, status, created_at)
-           VALUES (?, ?, 0, 'sent', ?)""",
-        (lead_id, supplier_id, now),
-    )
-    await execute(
-        "UPDATE lead_requests SET unlock_count = unlock_count + 1, status = 'forwarded' WHERE id = ?",
-        (lead_id,),
-    )
-    from ..worker import enqueue
-    await enqueue("send_lead_forward_email", {"lead_id": lead_id, "supplier_id": supplier_id})
+    error = await _forward_lead(lead_id, supplier_id)
+    if error:
+        return Response(error, status=422)

    lead = await get_lead_detail(lead_id)
    return await render_template(
@@ -929,13 +866,10 @@ async def get_suppliers_list(

 async def get_supplier_stats() -> dict:
    """Get aggregate supplier stats for the admin list header."""
-    claimed = await fetch_one("SELECT COUNT(*) as cnt FROM suppliers WHERE claimed_by IS NOT NULL")
-    growth = await fetch_one("SELECT COUNT(*) as cnt FROM suppliers WHERE tier = 'growth'")
-    pro = await fetch_one("SELECT COUNT(*) as cnt FROM suppliers WHERE tier = 'pro'")
    return {
-        "claimed": claimed["cnt"] if claimed else 0,
-        "growth": growth["cnt"] if growth else 0,
-        "pro": pro["cnt"] if pro else 0,
+        "claimed": await count_where("suppliers WHERE claimed_by IS NOT NULL"),
+        "growth": await count_where("suppliers WHERE tier = 'growth'"),
+        "pro": await count_where("suppliers WHERE tier = 'pro'"),
    }


@@ -1017,11 +951,7 @@ async def supplier_detail(supplier_id: int):
        (supplier_id,),
    )

-    enquiry_row = await fetch_one(
-        "SELECT COUNT(*) as cnt FROM supplier_enquiries WHERE supplier_id = ?",
-        (supplier_id,),
-    )
-    enquiry_count = enquiry_row["cnt"] if enquiry_row else 0
+    enquiry_count = await count_where("supplier_enquiries WHERE supplier_id = ?", (supplier_id,))

    # Email activity timeline — correlate by contact_email (no FK)
    timeline = []
@@ -1239,7 +1169,6 @@ _PRODUCT_CATEGORIES = [
@role_required("admin")
 async def billing_products():
    """Read-only overview of Paddle products, subscriptions, and revenue proxies."""
-    active_subs_row = await fetch_one("SELECT COUNT(*) as cnt FROM subscriptions WHERE status = 'active'")
    mrr_row = await fetch_one(
        """SELECT COALESCE(SUM(
               CASE WHEN pp.key LIKE '%_yearly' THEN pp.price_cents / 12
@@ -1249,14 +1178,12 @@ async def billing_products():
           JOIN paddle_products pp ON s.plan = pp.key
           WHERE s.status = 'active' AND pp.billing_type = 'subscription'"""
    )
-    active_boosts_row = await fetch_one("SELECT COUNT(*) as cnt FROM supplier_boosts WHERE status = 'active'")
-    bp_exports_row = await fetch_one("SELECT COUNT(*) as cnt FROM business_plan_exports WHERE status = 'completed'")

    stats = {
-        "active_subs": (active_subs_row or {}).get("cnt", 0),
+        "active_subs": await count_where("subscriptions WHERE status = 'active'"),
        "mrr_cents": (mrr_row or {}).get("total_cents", 0),
-        "active_boosts": (active_boosts_row or {}).get("cnt", 0),
-        "bp_exports": (bp_exports_row or {}).get("cnt", 0),
+        "active_boosts": await count_where("supplier_boosts WHERE status = 'active'"),
+        "bp_exports": await count_where("business_plan_exports WHERE status = 'completed'"),
    }

    products_rows = await fetch_all("SELECT * FROM paddle_products ORDER BY key")
@@ -1342,23 +1269,18 @@ async def get_email_log(

 async def get_email_stats() -> dict:
    """Aggregate email stats for the list header."""
-    total = await fetch_one("SELECT COUNT(*) as cnt FROM email_log")
-    delivered = await fetch_one("SELECT COUNT(*) as cnt FROM email_log WHERE last_event = 'delivered'")
-    bounced = await fetch_one("SELECT COUNT(*) as cnt FROM email_log WHERE last_event = 'bounced'")
    today = utcnow().date().isoformat()
-    sent_today = await fetch_one("SELECT COUNT(*) as cnt FROM email_log WHERE created_at >= ?", (today,))
    return {
-        "total": total["cnt"] if total else 0,
-        "delivered": delivered["cnt"] if delivered else 0,
-        "bounced": bounced["cnt"] if bounced else 0,
-        "sent_today": sent_today["cnt"] if sent_today else 0,
+        "total": await count_where("email_log WHERE 1=1"),
+        "delivered": await count_where("email_log WHERE last_event = 'delivered'"),
+        "bounced": await count_where("email_log WHERE last_event = 'bounced'"),
+        "sent_today": await count_where("email_log WHERE created_at >= ?", (today,)),
    }


 async def get_unread_count() -> int:
    """Count unread inbound emails."""
-    row = await fetch_one("SELECT COUNT(*) as cnt FROM inbound_emails WHERE is_read = 0")
-    return row["cnt"] if row else 0
+    return await count_where("inbound_emails WHERE is_read = 0")


@bp.route("/emails")
@@ -1824,11 +1746,7 @@ async def template_detail(slug: str):
    columns = await get_table_columns(config["data_table"])
    sample_rows = await fetch_template_data(config["data_table"], limit=10)

-    # Count generated articles
-    row = await fetch_one(
-        "SELECT COUNT(*) as cnt FROM articles WHERE template_slug = ?", (slug,),
-    )
-    generated_count = row["cnt"] if row else 0
+    generated_count = await count_where("articles WHERE template_slug = ?", (slug,))

    return await render_template(
        "admin/template_detail.html",
@@ -1959,8 +1877,8 @@ async def _query_scenarios(search: str, country: str, venue_type: str) -> tuple[
        f"SELECT * FROM published_scenarios WHERE {where} ORDER BY created_at DESC LIMIT 500",
        tuple(params),
    )
-    total_row = await fetch_one("SELECT COUNT(*) as cnt FROM published_scenarios")
-    return rows, (total_row["cnt"] if total_row else 0)
+    total = await count_where("published_scenarios WHERE 1=1")
+    return rows, total


@bp.route("/scenarios")
@@ -2927,11 +2845,9 @@ _CSV_IMPORT_LIMIT = 500  # guard against huge uploads

 async def get_follow_up_due_count() -> int:
    """Count pipeline suppliers with follow_up_at <= today."""
-    row = await fetch_one(
-        """SELECT COUNT(*) as cnt FROM suppliers
-           WHERE outreach_status IS NOT NULL AND follow_up_at <= date('now')"""
+    return await count_where(
+        "suppliers WHERE outreach_status IS NOT NULL AND follow_up_at <= date('now')"
    )
-    return row["cnt"] if row else 0


 async def get_outreach_pipeline() -> dict:
--- a/web/src/padelnomics/core.py
+++ b/web/src/padelnomics/core.py
@@ -192,6 +192,15 @@ async def fetch_all(sql: str, params: tuple = ()) -> list[dict]:
        return [dict(row) for row in rows]


+async def count_where(table_where: str, params: tuple = ()) -> int:
+    """Count rows matching a condition. Compresses the fetch_one + null-check pattern.
+
+    Usage: await count_where("users WHERE deleted_at IS NULL")
+    """
+    row = await fetch_one(f"SELECT COUNT(*) AS n FROM {table_where}", params)
+    return row["n"] if row else 0
+
+
 async def execute(sql: str, params: tuple = ()) -> int:
    """Execute SQL and return lastrowid."""
    db = await get_db()
--- a/web/src/padelnomics/dashboard/routes.py
+++ b/web/src/padelnomics/dashboard/routes.py
@@ -6,7 +6,7 @@ from pathlib import Path
 from quart import Blueprint, flash, g, redirect, render_template, request, url_for

 from ..auth.routes import login_required, update_user
-from ..core import csrf_protect, fetch_one, soft_delete, utcnow_iso
+from ..core import count_where, csrf_protect, fetch_one, soft_delete, utcnow_iso
 from ..i18n import get_translations

 bp = Blueprint(
@@ -18,17 +18,13 @@ bp = Blueprint(


 async def get_user_stats(user_id: int) -> dict:
-    scenarios = await fetch_one(
-        "SELECT COUNT(*) as count FROM scenarios WHERE user_id = ? AND deleted_at IS NULL",
-        (user_id,),
-    )
-    leads = await fetch_one(
-        "SELECT COUNT(*) as count FROM lead_requests WHERE user_id = ?",
-        (user_id,),
-    )
    return {
-        "scenarios": scenarios["count"] if scenarios else 0,
-        "leads": leads["count"] if leads else 0,
+        "scenarios": await count_where(
+            "scenarios WHERE user_id = ? AND deleted_at IS NULL", (user_id,)
+        ),
+        "leads": await count_where(
+            "lead_requests WHERE user_id = ?", (user_id,)
+        ),
    }


--- a/web/src/padelnomics/directory/routes.py
+++ b/web/src/padelnomics/directory/routes.py
@@ -6,7 +6,7 @@ from pathlib import Path

 from quart import Blueprint, g, make_response, redirect, render_template, request, url_for

-from ..core import csrf_protect, execute, fetch_all, fetch_one, utcnow_iso
+from ..core import count_where, csrf_protect, execute, fetch_all, fetch_one, utcnow_iso
 from ..i18n import COUNTRY_LABELS, get_translations

 bp = Blueprint(
@@ -79,11 +79,7 @@ async def _build_directory_query(q, country, category, region, page, per_page=24

    where = " AND ".join(wheres) if wheres else "1=1"

-    count_row = await fetch_one(
-        f"SELECT COUNT(*) as cnt FROM suppliers s WHERE {where}",
-        tuple(params),
-    )
-    total = count_row["cnt"] if count_row else 0
+    total = await count_where(f"suppliers s WHERE {where}", tuple(params))

    offset = (page - 1) * per_page
    # Tier-based ordering: sticky first, then pro > growth > free, then name
@@ -159,16 +155,16 @@ async def index():
        "SELECT category, COUNT(*) as cnt FROM suppliers GROUP BY category ORDER BY cnt DESC"
    )

-    total_suppliers = await fetch_one("SELECT COUNT(*) as cnt FROM suppliers")
-    total_countries = await fetch_one("SELECT COUNT(DISTINCT country_code) as cnt FROM suppliers")
+    total_suppliers = await count_where("suppliers")
+    total_countries = await count_where("(SELECT DISTINCT country_code FROM suppliers)")

    return await render_template(
        "directory.html",
        **ctx,
        country_counts=country_counts,
        category_counts=category_counts,
-        total_suppliers=total_suppliers["cnt"] if total_suppliers else 0,
-        total_countries=total_countries["cnt"] if total_countries else 0,
+        total_suppliers=total_suppliers,
+        total_countries=total_countries,
    )


@@ -204,11 +200,9 @@ async def supplier_detail(slug: str):
    # Enquiry count (Basic+)
    enquiry_count = 0
    if supplier.get("tier") in ("basic", "growth", "pro"):
-        row = await fetch_one(
-            "SELECT COUNT(*) as cnt FROM supplier_enquiries WHERE supplier_id = ?",
-            (supplier["id"],),
+        enquiry_count = await count_where(
+            "supplier_enquiries WHERE supplier_id = ?", (supplier["id"],)
        )
-        enquiry_count = row["cnt"] if row else 0

    lang = g.get("lang", "en")
    cat_labels, country_labels, region_labels = get_directory_labels(lang)
--- a/web/src/padelnomics/planner/routes.py
+++ b/web/src/padelnomics/planner/routes.py
@@ -12,6 +12,7 @@ from quart import Blueprint, Response, g, jsonify, render_template, request
 from ..auth.routes import login_required
 from ..core import (
    config,
+    count_where,
    csrf_protect,
    execute,
    feature_gate,
@@ -50,11 +51,9 @@ COUNTRY_PRESETS = {


 async def count_scenarios(user_id: int) -> int:
-    row = await fetch_one(
-        "SELECT COUNT(*) as cnt FROM scenarios WHERE user_id = ? AND deleted_at IS NULL",
-        (user_id,),
+    return await count_where(
+        "scenarios WHERE user_id = ? AND deleted_at IS NULL", (user_id,)
    )
-    return row["cnt"] if row else 0


 async def get_default_scenario(user_id: int) -> dict | None:
--- a/web/src/padelnomics/public/routes.py
+++ b/web/src/padelnomics/public/routes.py
@@ -5,7 +5,7 @@ from pathlib import Path

 from quart import Blueprint, g, render_template, request, session

-from ..core import check_rate_limit, csrf_protect, execute, fetch_all, fetch_one
+from ..core import check_rate_limit, count_where, csrf_protect, execute, fetch_all, fetch_one
 from ..i18n import get_translations

 bp = Blueprint(
@@ -17,13 +17,9 @@ bp = Blueprint(

 async def _supplier_counts():
    """Fetch aggregate supplier stats for landing/marketing pages."""
-    total = await fetch_one("SELECT COUNT(*) as cnt FROM suppliers")
-    countries = await fetch_one(
-        "SELECT COUNT(DISTINCT country_code) as cnt FROM suppliers"
-    )
    return (
-        total["cnt"] if total else 0,
-        countries["cnt"] if countries else 0,
+        await count_where("suppliers"),
+        await count_where("(SELECT DISTINCT country_code FROM suppliers)"),
    )


@@ -75,15 +71,15 @@ async def suppliers():
    total_suppliers, total_countries = await _supplier_counts()

    # Live stats
-    calc_requests = await fetch_one("SELECT COUNT(*) as cnt FROM scenarios WHERE deleted_at IS NULL")
+    calc_requests = await count_where("scenarios WHERE deleted_at IS NULL")
    avg_budget = await fetch_one(
        "SELECT AVG(budget_estimate) as avg FROM lead_requests WHERE budget_estimate > 0 AND lead_type = 'quote'"
    )
-    active_suppliers = await fetch_one(
-        "SELECT COUNT(*) as cnt FROM suppliers WHERE tier IN ('growth', 'pro') AND claimed_by IS NOT NULL"
+    active_suppliers = await count_where(
+        "suppliers WHERE tier IN ('growth', 'pro') AND claimed_by IS NOT NULL"
    )
-    monthly_leads = await fetch_one(
-        "SELECT COUNT(*) as cnt FROM lead_requests WHERE lead_type = 'quote' AND created_at >= date('now', '-30 days')"
+    monthly_leads = await count_where(
+        "lead_requests WHERE lead_type = 'quote' AND created_at >= date('now', '-30 days')"
    )

    # Lead feed preview — 3 recent verified hot/warm leads, anonymized
@@ -100,10 +96,10 @@ async def suppliers():
        "suppliers.html",
        total_suppliers=total_suppliers,
        total_countries=total_countries,
-        calc_requests=calc_requests["cnt"] if calc_requests else 0,
+        calc_requests=calc_requests,
        avg_budget=int(avg_budget["avg"]) if avg_budget and avg_budget["avg"] else 0,
-        active_suppliers=active_suppliers["cnt"] if active_suppliers else 0,
-        monthly_leads=monthly_leads["cnt"] if monthly_leads else 0,
+        active_suppliers=active_suppliers,
+        monthly_leads=monthly_leads,
        preview_leads=preview_leads,
    )

--- a/web/src/padelnomics/suppliers/routes.py
+++ b/web/src/padelnomics/suppliers/routes.py
@@ -11,6 +11,7 @@ from werkzeug.utils import secure_filename
 from ..core import (
    capture_waitlist_email,
    config,
+    count_where,
    csrf_protect,
    execute,
    feature_gate,
@@ -776,9 +777,8 @@ async def dashboard_overview():
    supplier = g.supplier

    # Leads unlocked count
-    unlocked = await fetch_one(
-        "SELECT COUNT(*) as cnt FROM lead_forwards WHERE supplier_id = ?",
-        (supplier["id"],),
+    leads_unlocked = await count_where(
+        "lead_forwards WHERE supplier_id = ?", (supplier["id"],)
    )

    # New leads matching supplier's area since last login
@@ -787,22 +787,20 @@ async def dashboard_overview():
    new_leads_count = 0
    if service_area:
        placeholders = ",".join("?" * len(service_area))
-        row = await fetch_one(
-            f"""SELECT COUNT(*) as cnt FROM lead_requests
+        new_leads_count = await count_where(
+            f"""lead_requests
                WHERE lead_type = 'quote' AND status = 'new' AND verified_at IS NOT NULL
                AND country IN ({placeholders})
                AND NOT EXISTS (SELECT 1 FROM lead_forwards WHERE lead_id = lead_requests.id AND supplier_id = ?)""",
            (*service_area, supplier["id"]),
        )
-        new_leads_count = row["cnt"] if row else 0
    else:
-        row = await fetch_one(
-            """SELECT COUNT(*) as cnt FROM lead_requests
+        new_leads_count = await count_where(
+            """lead_requests
               WHERE lead_type = 'quote' AND status = 'new' AND verified_at IS NOT NULL
               AND NOT EXISTS (SELECT 1 FROM lead_forwards WHERE lead_id = lead_requests.id AND supplier_id = ?)""",
            (supplier["id"],),
        )
-        new_leads_count = row["cnt"] if row else 0

    # Recent activity (last 10 events from credit_ledger + lead_forwards)
    recent_activity = await fetch_all(
@@ -825,16 +823,14 @@ async def dashboard_overview():
    # Enquiry count for Basic tier
    enquiry_count = 0
    if supplier.get("tier") == "basic":
-        eq_row = await fetch_one(
-            "SELECT COUNT(*) as cnt FROM supplier_enquiries WHERE supplier_id = ?",
-            (supplier["id"],),
+        enquiry_count = await count_where(
+            "supplier_enquiries WHERE supplier_id = ?", (supplier["id"],)
        )
-        enquiry_count = eq_row["cnt"] if eq_row else 0

    return await render_template(
        "suppliers/partials/dashboard_overview.html",
        supplier=supplier,
-        leads_unlocked=unlocked["cnt"] if unlocked else 0,
+        leads_unlocked=leads_unlocked,
        new_leads_count=new_leads_count,
        recent_activity=recent_activity,
        active_boosts=active_boosts,