Fix ticket adjust: commit before cart-summary fetch

The tickets adjust_quantity route fetches cart-summary from cart, which
calls back to events for ticket counts. Without committing first, the
callback misses the just-adjusted tickets.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

account/bp/auth/routes.py

@@ -45,7 +45,7 @@ from .services import (
 SESSION_USER_KEY = "uid"
 ACCOUNT_SESSION_KEY = "account_sid"
 
-ALLOWED_CLIENTS = {"blog", "market", "cart", "events", "federation", "artdag", "artdag_l2"}
+ALLOWED_CLIENTS = {"blog", "market", "cart", "events", "federation", "orders", "artdag", "artdag_l2"}
 
 
 def register(url_prefix="/auth"):

blog/templates/_types/post/admin/_nav_entries_oob.html

@@ -0,0 +1,34 @@
+{# OOB swap for nav entries and calendars — blog's version using shared macro #}
+{% from 'macros/nav_entries.html' import nav_entries_oob %}
+
+{% set has_items = (associated_entries and associated_entries.entries) or calendars %}
+{% call nav_entries_oob(has_items) %}
+  {% if associated_entries and associated_entries.entries %}
+    {% for entry in associated_entries.entries %}
+      {% set _entry_path = '/' + post.slug + '/calendars/' + entry.calendar_slug + '/' + entry.start_at.year|string + '/' + entry.start_at.month|string + '/' + entry.start_at.day|string + '/entries/' + entry.id|string + '/' %}
+      <a
+        href="{{ events_url(_entry_path) }}"
+        class="{{styles.nav_button_less_pad}}">
+        <div class="w-8 h-8 rounded bg-stone-200 flex-shrink-0"></div>
+        <div class="flex-1 min-w-0">
+          <div class="font-medium truncate">{{ entry.name }}</div>
+          <div class="text-xs text-stone-600 truncate">
+            {{ entry.start_at.strftime('%b %d, %Y at %H:%M') }}
+            {% if entry.end_at %} – {{ entry.end_at.strftime('%H:%M') }}{% endif %}
+          </div>
+        </div>
+      </a>
+    {% endfor %}
+  {% endif %}
+  {% if calendars %}
+    {% for calendar in calendars %}
+      {% set local_href=events_url('/' + post.slug + '/calendars/' + calendar.slug + '/') %}
+      <a
+        href="{{ local_href }}"
+        class="{{styles.nav_button_less_pad}}">
+        <i class="fa fa-calendar" aria-hidden="true"></i>
+        <div>{{calendar.name}}</div>
+      </a>
+    {% endfor %}
+  {% endif %}
+{% endcall %}

cart/bp/fragments/routes.py

@@ -32,7 +32,8 @@ def register():
             g.s, user_id=user_id, session_id=session_id,
         )
         count = summary.count + summary.calendar_count + summary.ticket_count
-        return await render_template("fragments/cart_mini.html", cart_count=count)
+        oob = request.args.get("oob", "")
+        return await render_template("fragments/cart_mini.html", cart_count=count, oob=oob)
 
     async def _account_nav_item():
         from shared.infrastructure.urls import cart_url

cart/templates/fragments/cart_mini.html

@@ -1,4 +1,4 @@
-<div id="cart-mini">
+<div id="cart-mini" {% if oob %}hx-swap-oob="true"{% endif %}>
   {% if cart_count == 0 %}
   <div class="h-12 w-12 rounded-full overflow-hidden border border-stone-300 flex-shrink-0">
     <a

events/bp/all_events/routes.py

@@ -11,12 +11,12 @@ Routes:
 """
 from __future__ import annotations
 
-from quart import Blueprint, g, request, render_template, render_template_string, make_response
+from quart import Blueprint, g, request, render_template, make_response
 
 from shared.browser.app.utils.htmx import is_htmx_request
 from shared.infrastructure.cart_identity import current_cart_identity
 from shared.infrastructure.data_client import fetch_data
-from shared.contracts.dtos import CartSummaryDTO, PostDTO, dto_from_dict
+from shared.contracts.dtos import PostDTO, dto_from_dict
 from shared.services.registry import services
 
 
@@ -125,28 +125,24 @@ def register() -> Blueprint:
         # Load entry DTO for the widget template
         entry = await services.calendar.entry_by_id(g.s, entry_id)
 
-        # Updated cart count for OOB mini-cart
-        summary_params = {}
-        if ident["user_id"] is not None:
-            summary_params["user_id"] = ident["user_id"]
-        if ident["session_id"] is not None:
-            summary_params["session_id"] = ident["session_id"]
-        raw_summary = await fetch_data("cart", "cart-summary", params=summary_params, required=False)
-        summary = dto_from_dict(CartSummaryDTO, raw_summary) if raw_summary else CartSummaryDTO()
-        cart_count = summary.count + summary.calendar_count + summary.ticket_count
+        # Commit so cross-service calls see the updated tickets
+        await g.tx.commit()
+        g.tx = await g.s.begin()
+
+        from shared.infrastructure.fragments import fetch_fragment
+        frag_params = {"oob": "1"}
+        if ident["user_id"] is not None:
+            frag_params["user_id"] = str(ident["user_id"])
+        if ident["session_id"] is not None:
+            frag_params["session_id"] = ident["session_id"]
 
-        # Render widget + OOB cart-mini
         widget_html = await render_template(
             "_types/page_summary/_ticket_widget.html",
             entry=entry,
             qty=qty,
             ticket_url="/all-tickets/adjust",
         )
-        mini_html = await render_template_string(
-            '{% from "_types/cart/_mini.html" import mini with context %}'
-            '{{ mini(oob="true") }}',
-            cart_count=cart_count,
-        )
+        mini_html = await fetch_fragment("cart", "cart-mini", params=frag_params, required=False)
         return await make_response(widget_html + mini_html, 200)
 
     return bp

events/bp/calendar_entries/routes.py

@@ -3,14 +3,11 @@ from datetime import datetime, timezone
 from decimal import Decimal
 
 from quart import (
-    request, render_template, render_template_string, make_response,
+    request, render_template, make_response,
     Blueprint, g, redirect, url_for, jsonify,
 )
 
 
-from sqlalchemy import update, func as sa_func
-
-from models.calendars import CalendarEntry
 
 
 from .services.entries import (
@@ -206,40 +203,21 @@ def register():
         entry.ticket_price = ticket_price
         entry.ticket_count = ticket_count
 
-        # Count pending calendar entries from local session (sees the just-added entry)
-        user_id = getattr(g, "user", None) and g.user.id
-        cal_filters = [
-            CalendarEntry.deleted_at.is_(None),
-            CalendarEntry.state == "pending",
-        ]
-        if user_id:
-            cal_filters.append(CalendarEntry.user_id == user_id)
+        # Commit so cross-service calls see the new entry
+        await g.tx.commit()
+        g.tx = await g.s.begin()
 
-        cal_count = await g.s.scalar(
-            select(sa_func.count()).select_from(CalendarEntry).where(*cal_filters)
-        ) or 0
-
-        # Get product cart count via HTTP
         from shared.infrastructure.cart_identity import current_cart_identity
-        from shared.infrastructure.data_client import fetch_data
-        from shared.contracts.dtos import CartSummaryDTO, dto_from_dict
+        from shared.infrastructure.fragments import fetch_fragment
         ident = current_cart_identity()
-        summary_params = {}
+        frag_params = {"oob": "1"}
         if ident["user_id"] is not None:
-            summary_params["user_id"] = ident["user_id"]
+            frag_params["user_id"] = str(ident["user_id"])
         if ident["session_id"] is not None:
-            summary_params["session_id"] = ident["session_id"]
-        raw_summary = await fetch_data("cart", "cart-summary", params=summary_params, required=False)
-        cart_summary = dto_from_dict(CartSummaryDTO, raw_summary) if raw_summary else CartSummaryDTO()
-        product_count = cart_summary.count
-        total_count = product_count + cal_count
+            frag_params["session_id"] = ident["session_id"]
 
         html = await render_template("_types/day/_main_panel.html")
-        mini_html = await render_template_string(
-            '{% from "_types/cart/_mini.html" import mini with context %}'
-            '{{ mini(oob="true") }}',
-            cart_count=total_count,
-        )
+        mini_html = await fetch_fragment("cart", "cart-mini", params=frag_params, required=False)
         return await make_response(html + mini_html, 200)
     
     @bp.get("/add/")

events/bp/calendar_entry/routes.py

@@ -50,6 +50,7 @@ def register():
     @bp.before_request
     async def load_entry():
         """Load the calendar entry from the URL parameter."""
+        from quart import abort
         entry_id = request.view_args.get("entry_id")
         if entry_id:
             result = await g.s.execute(
@@ -60,6 +61,8 @@ def register():
                 )
             )
             g.entry = result.scalar_one_or_none()
+            if g.entry is None:
+                abort(404)
 
     @bp.context_processor
     async def inject_entry():

events/bp/page/routes.py

@@ -8,12 +8,10 @@ Routes:
 """
 from __future__ import annotations
 
-from quart import Blueprint, g, request, render_template, render_template_string, make_response
+from quart import Blueprint, g, request, render_template, make_response
 
 from shared.browser.app.utils.htmx import is_htmx_request
 from shared.infrastructure.cart_identity import current_cart_identity
-from shared.infrastructure.data_client import fetch_data
-from shared.contracts.dtos import CartSummaryDTO, dto_from_dict
 from shared.services.registry import services
 
 
@@ -108,28 +106,24 @@ def register() -> Blueprint:
         # Load entry DTO for the widget template
         entry = await services.calendar.entry_by_id(g.s, entry_id)
 
-        # Updated cart count for OOB mini-cart
-        summary_params = {}
-        if ident["user_id"] is not None:
-            summary_params["user_id"] = ident["user_id"]
-        if ident["session_id"] is not None:
-            summary_params["session_id"] = ident["session_id"]
-        raw_summary = await fetch_data("cart", "cart-summary", params=summary_params, required=False)
-        summary = dto_from_dict(CartSummaryDTO, raw_summary) if raw_summary else CartSummaryDTO()
-        cart_count = summary.count + summary.calendar_count + summary.ticket_count
+        # Commit so cross-service calls see the updated tickets
+        await g.tx.commit()
+        g.tx = await g.s.begin()
+
+        from shared.infrastructure.fragments import fetch_fragment
+        frag_params = {"oob": "1"}
+        if ident["user_id"] is not None:
+            frag_params["user_id"] = str(ident["user_id"])
+        if ident["session_id"] is not None:
+            frag_params["session_id"] = ident["session_id"]
 
-        # Render widget + OOB cart-mini
         widget_html = await render_template(
             "_types/page_summary/_ticket_widget.html",
             entry=entry,
             qty=qty,
             ticket_url=f"/{g.post_slug}/tickets/adjust",
         )
-        mini_html = await render_template_string(
-            '{% from "_types/cart/_mini.html" import mini with context %}'
-            '{{ mini(oob="true") }}',
-            cart_count=cart_count,
-        )
+        mini_html = await fetch_fragment("cart", "cart-mini", params=frag_params, required=False)
         return await make_response(widget_html + mini_html, 200)
 
     return bp

events/bp/tickets/routes.py

@@ -286,6 +286,10 @@ def register() -> Blueprint:
                         ticket_type_id=tt.id,
                     )
 
+        # Commit so cart's callback to events sees the updated tickets
+        await g.tx.commit()
+        g.tx = await g.s.begin()
+
         # Compute cart count for OOB mini-cart update
         from shared.infrastructure.data_client import fetch_data
         from shared.contracts.dtos import CartSummaryDTO, dto_from_dict

events/templates/_types/post/admin/_nav_entries_oob.html

@@ -0,0 +1,34 @@
+{# OOB swap for nav entries and calendars when toggling associations or editing calendars #}
+{% from 'macros/nav_entries.html' import nav_entries_oob %}
+
+{% set has_items = (associated_entries and associated_entries.entries) or calendars %}
+{% call nav_entries_oob(has_items) %}
+  {% if associated_entries and associated_entries.entries %}
+    {% for entry in associated_entries.entries %}
+      {% set _entry_path = '/' + post.slug + '/calendars/' + entry.calendar_slug + '/' + entry.start_at.year|string + '/' + entry.start_at.month|string + '/' + entry.start_at.day|string + '/entries/' + entry.id|string + '/' %}
+      <a
+        href="{{ events_url(_entry_path) }}"
+        class="{{styles.nav_button_less_pad}}">
+        <div class="w-8 h-8 rounded bg-stone-200 flex-shrink-0"></div>
+        <div class="flex-1 min-w-0">
+          <div class="font-medium truncate">{{ entry.name }}</div>
+          <div class="text-xs text-stone-600 truncate">
+            {{ entry.start_at.strftime('%b %d, %Y at %H:%M') }}
+            {% if entry.end_at %} – {{ entry.end_at.strftime('%H:%M') }}{% endif %}
+          </div>
+        </div>
+      </a>
+    {% endfor %}
+  {% endif %}
+  {% if calendars %}
+    {% for calendar in calendars %}
+      {% set local_href=events_url('/' + post.slug + '/calendars/' + calendar.slug + '/') %}
+      <a
+        href="{{ local_href }}"
+        class="{{styles.nav_button_less_pad}}">
+        <i class="fa fa-calendar" aria-hidden="true"></i>
+        <div>{{calendar.name}}</div>
+      </a>
+    {% endfor %}
+  {% endif %}
+{% endcall %}

shared/browser/templates/_types/post/admin/_nav_entries_oob.html

@@ -1,80 +0,0 @@
-{# OOB swap for nav entries and calendars when toggling associations or editing calendars #}
-{% import 'macros/links.html' as links %}
-
-{# Associated Entries and Calendars - vertical on mobile, horizontal with arrows on desktop #}
-{% if (associated_entries and associated_entries.entries) or calendars %}
-  <div class="flex flex-col sm:flex-row sm:items-center gap-2 border-r border-stone-200 mr-2 sm:max-w-2xl"
-       id="entries-calendars-nav-wrapper"
-       hx-swap-oob="true">
-    {# Left scroll arrow - desktop only #}
-    <button
-      class="entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
-      aria-label="Scroll left"
-      _="on click
-         set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft - 200">
-      <i class="fa fa-chevron-left"></i>
-    </button>
-
-    <div id="associated-items-container"
-         class="overflow-y-auto sm:overflow-x-auto sm:overflow-y-visible scrollbar-hide max-h-[50vh] sm:max-h-none"
-         style="scroll-behavior: smooth;"
-         _="on load or scroll
-            if window.innerWidth >= 640 and my.scrollWidth > my.clientWidth
-              remove .hidden from .entries-nav-arrow
-              add .flex to .entries-nav-arrow
-            else
-              add .hidden to .entries-nav-arrow
-              remove .flex from .entries-nav-arrow
-            end">
-      <div class="flex flex-col sm:flex-row gap-1">
-        {# Calendar entries #}
-        {% if associated_entries and associated_entries.entries %}
-          {% for entry in associated_entries.entries %}
-            {% set _entry_path = '/' + post.slug + '/calendars/' + entry.calendar_slug + '/' + entry.start_at.year|string + '/' + entry.start_at.month|string + '/' + entry.start_at.day|string + '/entries/' + entry.id|string + '/' %}
-            <a
-              href="{{ events_url(_entry_path) }}"
-              class="{{styles.nav_button_less_pad}}">
-              <div class="w-8 h-8 rounded bg-stone-200 flex-shrink-0"></div>
-              <div class="flex-1 min-w-0">
-                <div class="font-medium truncate">{{ entry.name }}</div>
-                <div class="text-xs text-stone-600 truncate">
-                  {{ entry.start_at.strftime('%b %d, %Y at %H:%M') }}
-                  {% if entry.end_at %} – {{ entry.end_at.strftime('%H:%M') }}{% endif %}
-                </div>
-              </div>
-            </a>
-          {% endfor %}
-        {% endif %}
-        {# Calendar links #}
-        {% if calendars %}
-          {% for calendar in calendars %}
-            {% set local_href=events_url('/' + post.slug + '/calendars/' + calendar.slug + '/') %}
-            <a
-              href="{{ local_href }}"
-              class="{{styles.nav_button_less_pad}}">
-              <i class="fa fa-calendar" aria-hidden="true"></i>
-              <div>{{calendar.name}}</div>
-            </a>
-          {% endfor %}
-        {% endif %}
-      </div>
-    </div>
-
-    <style>
-    .scrollbar-hide::-webkit-scrollbar { display: none; }
-    .scrollbar-hide { -ms-overflow-style: none; scrollbar-width: none; }
-    </style>
-
-    {# Right scroll arrow - desktop only #}
-    <button
-      class="entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
-      aria-label="Scroll right"
-      _="on click
-         set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft + 200">
-      <i class="fa fa-chevron-right"></i>
-    </button>
-  </div>
-{% else %}
-  {# Empty placeholder to remove nav items when all are disassociated/deleted #}
-  <div id="entries-calendars-nav-wrapper" hx-swap-oob="true"></div>
-{% endif %}

shared/browser/templates/macros/nav_entries.html

@@ -0,0 +1,58 @@
+{#
+  Composable scrollable nav entries container.
+
+  Usage:
+    {% call nav_entries_oob(has_items=True) %}
+      <a href="..." class="{{styles.nav_button_less_pad}}">...</a>
+      <a href="..." class="{{styles.nav_button_less_pad}}">...</a>
+    {% endcall %}
+
+  Each domain (events, blog, market) provides its own items via the caller block.
+#}
+
+{% macro nav_entries_oob(has_items) %}
+{% if has_items %}
+  <div class="flex flex-col sm:flex-row sm:items-center gap-2 border-r border-stone-200 mr-2 sm:max-w-2xl"
+       id="entries-calendars-nav-wrapper"
+       hx-swap-oob="true">
+    <button
+      class="entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
+      aria-label="Scroll left"
+      _="on click
+         set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft - 200">
+      <i class="fa fa-chevron-left"></i>
+    </button>
+
+    <div id="associated-items-container"
+         class="overflow-y-auto sm:overflow-x-auto sm:overflow-y-visible scrollbar-hide max-h-[50vh] sm:max-h-none"
+         style="scroll-behavior: smooth;"
+         _="on load or scroll
+            if window.innerWidth >= 640 and my.scrollWidth > my.clientWidth
+              remove .hidden from .entries-nav-arrow
+              add .flex to .entries-nav-arrow
+            else
+              add .hidden to .entries-nav-arrow
+              remove .flex from .entries-nav-arrow
+            end">
+      <div class="flex flex-col sm:flex-row gap-1">
+        {{ caller() }}
+      </div>
+    </div>
+
+    <style>
+    .scrollbar-hide::-webkit-scrollbar { display: none; }
+    .scrollbar-hide { -ms-overflow-style: none; scrollbar-width: none; }
+    </style>
+
+    <button
+      class="entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
+      aria-label="Scroll right"
+      _="on click
+         set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft + 200">
+      <i class="fa fa-chevron-right"></i>
+    </button>
+  </div>
+{% else %}
+  <div id="entries-calendars-nav-wrapper" hx-swap-oob="true"></div>
+{% endif %}
+{% endmacro %}