mirror of
https://github.com/pretix/pretix.git
synced 2026-11-17 02:26:03 +00:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bc232af78 | ||
|
|
b288bee219 | ||
|
|
3e428bb757 | ||
|
|
588a7d5e97 | ||
|
|
fb86431d65 | ||
|
|
c7657de08d | ||
|
|
ab14d58957 |
No files matched your search
@@ -23,6 +23,7 @@ import json
|
||||
import logging
|
||||
import os
|
||||
from collections import Counter, defaultdict
|
||||
from contextlib import nullcontext
|
||||
from datetime import timedelta
|
||||
from decimal import Decimal
|
||||
|
||||
@@ -79,6 +80,7 @@ from pretix.base.settings import (
|
||||
from pretix.base.signals import register_ticket_outputs
|
||||
from pretix.helpers.countries import CachedCountries
|
||||
from pretix.multidomain.urlreverse import eventreverse_absolute
|
||||
from pretix.testutils.queries import assert_num_queries
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -473,7 +475,10 @@ class PdfDataSerializer(serializers.Field):
|
||||
return {}
|
||||
|
||||
ev = instance.subevent or instance.order.event
|
||||
with language(instance.order.locale, instance.order.event.settings.region):
|
||||
with (
|
||||
language(instance.order.locale, instance.order.event.settings.region),
|
||||
assert_num_queries(0) if settings.DEBUG else nullcontext(), # PDF vars should not introduce additional queries per-order / per-position!
|
||||
):
|
||||
# This needs to have some extra performance improvements to avoid creating hundreds of queries when
|
||||
# we serialize a list.
|
||||
|
||||
|
||||
@@ -271,7 +271,7 @@ class OrderViewSetMixin:
|
||||
Prefetch('meta_values', ItemVariationMetaValue.objects.select_related('property'), to_attr='meta_values_cached')
|
||||
)),
|
||||
'answers', 'answers__options', 'answers__question',
|
||||
'item__category',
|
||||
'item__category', 'item__program_times',
|
||||
'addon_to__answers', 'addon_to__answers__options', 'addon_to__answers__question',
|
||||
Prefetch('subevent', queryset=self.request.event.subevents.prefetch_related(
|
||||
Prefetch('meta_values', to_attr='meta_values_cached', queryset=SubEventMetaValue.objects.select_related('property'))
|
||||
@@ -1115,7 +1115,7 @@ class OrderPositionViewSetMixin:
|
||||
)),
|
||||
'variation',
|
||||
'answers', 'answers__options', 'answers__question',
|
||||
'item__category',
|
||||
'item__category', 'item__program_times',
|
||||
'addon_to__answers', 'addon_to__answers__options', 'addon_to__answers__question',
|
||||
Prefetch('addons', qs.select_related('item', 'variation')),
|
||||
Prefetch('subevent', queryset=self.request.event.subevents.prefetch_related(
|
||||
|
||||
+13
-3
@@ -95,6 +95,10 @@ if not settings.DEBUG:
|
||||
|
||||
|
||||
DEFAULT_VARIABLES = OrderedDict((
|
||||
# For performance reasons, `evaluate` functions are not allowed to cause additional database
|
||||
# queries, except if an additional `evaluate_bulk` function is provided.
|
||||
# Alternatively, `evaluate_bulk` can be set to False, hiding the variable by default, making
|
||||
# it only available to consumers that call get_variables with allow_non_bulk_evaluatable=True.
|
||||
("secret", {
|
||||
"label": _("Ticket code (barcode content)"),
|
||||
"editor_sample": "tdmruoekvkpbv1o2mv8xccvqcikvr58u",
|
||||
@@ -390,7 +394,8 @@ DEFAULT_VARIABLES = OrderedDict((
|
||||
"editor_sample": _("Add-on 1\n2x Add-on 2"),
|
||||
"evaluate": lambda op, order, ev: "\n".join([
|
||||
str(p) for p in generate_compressed_addon_list(op, order, ev, only_checked_in=True)
|
||||
])
|
||||
]),
|
||||
"evaluate_bulk": False,
|
||||
}),
|
||||
("organizer", {
|
||||
"label": _("Organizer name"),
|
||||
@@ -664,7 +669,7 @@ def get_images(event):
|
||||
return v
|
||||
|
||||
|
||||
def get_variables(event):
|
||||
def get_variables(event, allow_non_bulk_evaluatable=False):
|
||||
v = copy.copy(DEFAULT_VARIABLES)
|
||||
|
||||
templating_context = PlaceholderContext(event=event)
|
||||
@@ -717,6 +722,11 @@ def get_variables(event):
|
||||
for recv, res in layout_text_variables.send(sender=event):
|
||||
v.update(res)
|
||||
|
||||
if not allow_non_bulk_evaluatable:
|
||||
for k in list(v.keys()):
|
||||
if v[k].get('evaluate_bulk') is False:
|
||||
del v[k]
|
||||
|
||||
return v
|
||||
|
||||
|
||||
@@ -818,7 +828,7 @@ class Renderer:
|
||||
def __init__(self, event, layout, background_file):
|
||||
self.layout = layout
|
||||
self.background_file = background_file
|
||||
self.variables = get_variables(event)
|
||||
self.variables = get_variables(event, allow_non_bulk_evaluatable=True)
|
||||
self.images = get_images(event)
|
||||
self.event = event
|
||||
if self.background_file:
|
||||
|
||||
@@ -1072,10 +1072,13 @@ dictionaries as values that contain keys like in the following example::
|
||||
}
|
||||
|
||||
The ``evaluate`` member will be called with the order position, order and event as arguments. The event might
|
||||
also be a subevent, if applicable.
|
||||
also be a subevent, if applicable. For performance reasons, ``evaluate`` functions are not allowed to cause
|
||||
additional database queries (all data must be retrieved from already prefetched attributes), except if an
|
||||
additional `evaluate_bulk` function is provided.
|
||||
|
||||
The ``evaluate_bulk`` member is optional but can significantly improve performance in some situations because you
|
||||
can perform database fetches in bulk instead of single queries for every position.
|
||||
can perform database fetches in bulk instead of single queries for every position. If set to False, the variable
|
||||
is hidden by default, making it only available to consumers that call get_variables with allow_non_bulk_evaluatable=True.
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@@ -68,6 +68,10 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
|
||||
checkin_qr_warning = False
|
||||
title = None
|
||||
|
||||
# only set to True in subclasses if this layout is never used by
|
||||
# one of our apps that fetch their placeholders using `?pdf_data=true`
|
||||
allow_non_bulk_evaluatable = False
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
if 'placeholders' in request.GET:
|
||||
return self.get_placeholders_help(request)
|
||||
@@ -278,7 +282,7 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
|
||||
return HttpResponseBadRequest()
|
||||
|
||||
def get_variables(self):
|
||||
return get_variables(self.request.event)
|
||||
return get_variables(self.request.event, allow_non_bulk_evaluatable=self.allow_non_bulk_evaluatable)
|
||||
|
||||
def get_images(self):
|
||||
return get_images(self.request.event)
|
||||
|
||||
@@ -2160,7 +2160,7 @@ def test_blocked_secret_list(token_client, organizer, event):
|
||||
|
||||
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_queries):
|
||||
def test_pdf_data(token_client, organizer, event, order, item, django_assert_num_queries, django_assert_max_num_queries):
|
||||
# order detail
|
||||
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/{}/?pdf_data=true'.format(
|
||||
organizer.slug, event.slug, order.code
|
||||
@@ -2176,7 +2176,7 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
|
||||
assert not resp.data['positions'][0].get('pdf_data')
|
||||
|
||||
# order list
|
||||
with django_assert_max_num_queries(34):
|
||||
with django_assert_num_queries(31):
|
||||
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
|
||||
organizer.slug, event.slug
|
||||
))
|
||||
@@ -2190,8 +2190,19 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
|
||||
assert resp.status_code == 200
|
||||
assert not resp.data['results'][0]['positions'][0].get('pdf_data')
|
||||
|
||||
with scopes_disabled():
|
||||
df = event.questions.create(container_type='O', question='Another order-level', type='S')
|
||||
order.answers.create(question=df, answer='Hello')
|
||||
order.positions.create(item=item, price=Decimal("23"), attendee_name_parts={"full_name": "Jane", "_scheme": "full"}, canceled=False, positionid=3)
|
||||
|
||||
# test order list again, with more objects (to detect N+1 database queries bugs due to missing prefetch)
|
||||
with django_assert_num_queries(31): # <-- this number should stay the same as in the django_assert_num_queries above!
|
||||
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
|
||||
organizer.slug, event.slug
|
||||
))
|
||||
|
||||
# position list
|
||||
with django_assert_max_num_queries(36):
|
||||
with django_assert_max_num_queries(33):
|
||||
resp = token_client.get('/api/v1/organizers/{}/events/{}/orderpositions/?pdf_data=true'.format(
|
||||
organizer.slug, event.slug
|
||||
))
|
||||
|
||||
Reference in new issue
Block a user