Optimize Checkout Page One READ queries (#1021)

* remove unneeded local variable from TickeTier.tickets_sold_count, return .count() directly * use .tickets_available in .tickets_sold_minus_available calculation * Fix copy on joined waitlist template --------- Co-authored-by: Tahmid Khan <[email protected]>
SocialPass · Feb 13, 2024 · eeeda23 · eeeda23
1 parent 584be88
commit eeeda23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/backend/apps/root/models.py b/backend/apps/root/models.py
@@ -505,7 +505,7 @@ def clean(self, *args, **kwargs):
                 raise GoogleWalletAPIRequestError(
                     "Something went wrong while handling the Google event class."
                 )
-        
+
         return super().clean(*args, **kwargs)
 
     def transition_draft(self, save=True):
@@ -966,13 +966,11 @@ def generate_tx_type(self):
 
     @cached_property
     def tickets_sold_count(self):
-        tickets = Ticket.objects.filter(ticket_tier=self)
-        return tickets.count()
+        return Ticket.objects.filter(ticket_tier=self).count()
 
     @cached_property
     def tickets_available(self):
-        tickets = Ticket.objects.filter(ticket_tier=self)
-        return self.capacity - tickets.count()
+        return self.capacity - self.tickets_sold_count
 
     @cached_property
     def tickets_sold_exceeding_capacity(self):

diff --git a/backend/templates/checkout/joined_waiting_queue.html b/backend/templates/checkout/joined_waiting_queue.html
@@ -31,10 +31,10 @@ <h3>
 				<span class="text-success-emphasis me-1">
 					<i class="fa-light fa-check"></i>
 				</span>
-				{% trans "Joined Waiting Queue" %}
+				{% trans "Joined Waitlist" %}
 			</h3>
 			<p>
-				{% trans "You have successfully joined the waiting queue for this event. If the organizer decides, you'll be sent an email, so please be on the lookout for that." %}
+				{% trans "You have successfully joined the waitlist. The event organizer reviews all submissions, and if selected, you will receive your tickets." %}
 			</p>
 			<div>
 				<a href="{% url 'checkout:checkout_one' object.event.team.slug object.event.slug %}?checkout_type={{ object.tx_type }}&name={{ object.name }}&email={{ object.email }}">