Prefetch program times, add test for query count

pyproject.toml

@@ -80,7 +80,7 @@ dependencies = [
   "protobuf==6.33.*",
   "psycopg2-binary",
   "pycountry",
-  "pycparser==3.0",
+  "pycparser==2.23",
   "pycryptodome==3.23.*",
   "pypdf==6.5.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab

src/pretix/api/views/item.py

@@ -106,7 +106,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
             'variations', 'addons', 'bundles', 'meta_values', 'meta_values__property',
             'variations__meta_values', 'variations__meta_values__property',
             'require_membership_types', 'variations__require_membership_types',
-            'limit_sales_channels', 'variations__limit_sales_channels',
+            'limit_sales_channels', 'variations__limit_sales_channels', 'program_times'
         ).all()
 
     def perform_create(self, serializer):

src/pretix/base/exporters/orderlist.py

@@ -364,7 +364,7 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.city,
                     order.invoice_address.country if order.invoice_address.country else
                     order.invoice_address.country_old,
-                    order.invoice_address.state_for_address,
+                    order.invoice_address.state,
                     order.invoice_address.custom_field,
                     order.invoice_address.vat_id,
                 ]
@@ -515,7 +515,7 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.city,
                     order.invoice_address.country if order.invoice_address.country else
                     order.invoice_address.country_old,
-                    order.invoice_address.state_for_address,
+                    order.invoice_address.state,
                     order.invoice_address.vat_id,
                 ]
             except InvoiceAddress.DoesNotExist:
@@ -732,7 +732,7 @@ class OrderListExporter(MultiSheetListExporter):
                     op.zipcode or '',
                     op.city or '',
                     op.country if op.country else '',
-                    op.state_for_address or '',
+                    op.state or '',
                     op.voucher.code if op.voucher else '',
                     op.pseudonymization_id,
                     op.secret,
@@ -797,7 +797,7 @@ class OrderListExporter(MultiSheetListExporter):
                         order.invoice_address.city,
                         order.invoice_address.country if order.invoice_address.country else
                         order.invoice_address.country_old,
-                        order.invoice_address.state_for_address,
+                        order.invoice_address.state,
                         order.invoice_address.vat_id,
                     ]
                 except InvoiceAddress.DoesNotExist:

src/pretix/base/models/customers.py

@@ -349,7 +349,7 @@ class AttendeeProfile(models.Model):
     def state_name(self):
         sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
         if sd:
-            return _(sd.name)
+            return sd.name
         return self.state
 
     @property

src/pretix/base/models/items.py

@@ -594,11 +594,10 @@ class Item(LoggedModel):
         on_delete=models.SET_NULL,
         verbose_name=_("Only show after sellout of"),
         help_text=_("If you select a product here, this product will only be shown when that product is "
-                    "no longer available. This will happen either because the other product has sold out or because "
-                    "the time is outside of the sales window for the other product. If combined with the option "
-                    "to hide sold-out products, this allows you to swap out products for more expensive ones once "
-                    "the cheaper option is sold out. There might be a short period in which both products are visible "
-                    "while all tickets of the referenced product are reserved, but not yet sold.")
+                    "sold out. If combined with the option to hide sold-out products, this allows you to "
+                    "swap out products for more expensive ones once the cheaper option is sold out. There might "
+                    "be a short period in which both products are visible while all tickets of the referenced "
+                    "product are reserved, but not yet sold.")
     )
     hidden_if_item_available_mode = models.CharField(
         choices=UNAVAIL_MODES,

src/pretix/base/models/orders.py

@@ -1675,7 +1675,7 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
     def state_name(self):
         sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
         if sd:
-            return _(sd.name)
+            return sd.name
         return self.state
 
     @property
@@ -3480,7 +3480,7 @@ class InvoiceAddress(models.Model):
     def state_name(self):
         sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
         if sd:
-            return _(sd.name)
+            return sd.name
         return self.state
 
     @property

src/pretix/base/models/waitinglist.py

@@ -159,7 +159,6 @@ class WaitingListEntry(LoggedModel):
         if availability[1] is None or availability[1] < 1:
             raise WaitingListException(_('This product is currently not available.'))
 
-        event = self.event
         ev = self.subevent or self.event
         if ev.seat_category_mappings.filter(product=self.item).exists():
             # Generally, we advertise the waiting list to be based on quotas only. This makes it dangerous
@@ -192,7 +191,6 @@ class WaitingListEntry(LoggedModel):
 
         with transaction.atomic():
             locked_wle = WaitingListEntry.objects.select_for_update(of=OF_SELF).get(pk=self.pk)
-            locked_wle.event = event
             if locked_wle.voucher:
                 raise WaitingListException(_('A voucher has already been sent to this person.'))
             e = locked_wle.email
@@ -229,7 +227,6 @@ class WaitingListEntry(LoggedModel):
             locked_wle.save()
 
         self.refresh_from_db()
-        self.event = event
 
         with language(self.locale, self.event.settings.region):
             self.send_mail(

src/pretix/base/views/js_helpers.py

@@ -82,7 +82,7 @@ def _info(cc):
     statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
     return {
         'data': [
-            {'name': gettext(s.name), 'code': s.code[3:]}
+            {'name': s.name, 'code': s.code[3:]}
             for s in sorted(statelist, key=lambda s: s.name)
         ],
         **info,

src/pretix/control/views/auth.py

@@ -363,7 +363,7 @@ class Forgot(TemplateView):
                 else:
                     messages.info(request, _('If the address is registered to valid account, then we have sent you an email containing further instructions.'))
 
-            return redirect('control:auth.forgot')
+                return redirect('control:auth.forgot')
         else:
             return self.get(request, *args, **kwargs)
 

src/pretix/presale/templates/pretixpresale/event/fragment_cart.html

@@ -519,7 +519,7 @@
         <dialog role="alertdialog" id="cart-extend-confirmation-dialog" class="inline-dialog" aria-labelledby="cart-deadline">
             <form method="dialog">
                 <p>
-                    <button class="btn btn-success" value="OK">
+                    <button class="btn btn-success" autofocus value="OK">
                         <span role="img" aria-label="{% trans "OK" %}.">
                             {% icon "check" %}
                         </span>

src/pretix/presale/views/event.py

@@ -311,8 +311,7 @@ def get_grouped_items(event, *, channel: SalesChannel, subevent=None, voucher=No
                 )
             else:
                 q = item.hidden_if_item_available.check_quotas(subevent=subevent, _cache=quota_cache, include_bundled=True)
-                time_available = item.hidden_if_item_available.is_available()
-                item._dependency_available = (q[0] == Quota.AVAILABILITY_OK) and time_available
+                item._dependency_available = q[0] == Quota.AVAILABILITY_OK
             if item._dependency_available and item.hidden_if_item_available_mode == Item.UNAVAIL_MODE_HIDDEN:
                 item._remove = True
                 continue

src/tests/api/test_items.py

@@ -50,6 +50,7 @@ from pretix.base.models import (
     QuestionOption, Quota,
 )
 from pretix.base.models.orders import OrderFee
+from pretix.testutils.queries import assert_num_queries
 
 
 @pytest.fixture
@@ -422,6 +423,13 @@ def test_item_list(token_client, organizer, event, team, item):
     assert [] == resp.data['results']
 
 
+@pytest.mark.django_db
+def test_item_list_queries(token_client, organizer, event, team, item, item3):
+    with assert_num_queries(18):
+        resp = token_client.get('/api/v1/organizers/{}/events/{}/items/'.format(organizer.slug, event.slug))
+        assert resp.status_code == 200
+
+
 @pytest.mark.django_db
 def test_item_detail(token_client, organizer, event, team, item):
     res = dict(TEST_ITEM_RES)

src/tests/presale/test_event.py

@@ -46,7 +46,6 @@ from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.utils.timezone import now
 from django_scopes import scopes_disabled
-from freezegun import freeze_time
 from tests.base import SoupTest
 from tests.testdummy.signals import FoobarSalesChannel
 
@@ -273,48 +272,6 @@ class ItemDisplayTest(EventTestMixin, SoupTest):
         resp = self.client.get('/%s/%s/' % (self.orga.slug, self.event.slug))
         self.assertNotIn("Early-bird", resp.rendered_content)
 
-    def tiered_availability_by_date_and_quota(self, q1_size, q2_size, time_offset, expected_phase):
-        current_time = now()
-
-        with scopes_disabled():
-            q1 = Quota.objects.create(event=self.event, name='Phase 1', size=q1_size)
-            item1 = Item.objects.create(
-                event=self.event,
-                name='Phase 1',
-                default_price=0,
-                available_from=current_time,
-                available_until=current_time + datetime.timedelta(days=1),
-                available_from_mode=Item.UNAVAIL_MODE_HIDDEN,
-                available_until_mode=Item.UNAVAIL_MODE_HIDDEN,
-                hidden_if_item_available_mode=Item.UNAVAIL_MODE_HIDDEN,
-            )
-            q1.items.add(item1)
-            q2 = Quota.objects.create(event=self.event, name='Phase 2', size=q2_size)
-            item2 = Item.objects.create(
-                event=self.event,
-                name='Phase 2',
-                default_price=0,
-                available_from=current_time + datetime.timedelta(days=0),
-                available_until=current_time + datetime.timedelta(days=2),
-                available_from_mode=Item.UNAVAIL_MODE_HIDDEN,
-                available_until_mode=Item.UNAVAIL_MODE_HIDDEN,
-                hidden_if_item_available_mode=Item.UNAVAIL_MODE_HIDDEN,
-                hidden_if_item_available=item1
-            )
-            q2.items.add(item2)
-            with freeze_time(current_time + time_offset):
-                resp = self.client.get('/%s/%s/' % (self.orga.slug, self.event.slug))
-                self.assertIn(expected_phase, resp.rendered_content)
-
-    def test_tiered_availability_by_date_and_quota_phase1_available(self):
-        self.tiered_availability_by_date_and_quota(1, 1, datetime.timedelta(seconds=1), "Phase 1")
-
-    def test_tiered_availability_by_date_and_quota_phase1_sold_out(self):
-        self.tiered_availability_by_date_and_quota(0, 1, datetime.timedelta(seconds=1), "Phase 2")
-
-    def test_tiered_availability_by_date_and_quota_phase1_timed_out(self):
-        self.tiered_availability_by_date_and_quota(1, 1, datetime.timedelta(days=1, hours=1), "Phase 2")
-
     def test_subevents_inactive_unknown(self):
         self.event.has_subevents = True
         self.event.save()