Prevent unregistered clubs from selling tickets, display events from clubs which require reapproval

Author: julianweng

backend/clubs/models.py

@@ -355,6 +355,7 @@ class Club(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    # signifies the existence of a previous instance within history with approved=True
     ghost = models.BooleanField(default=False)
     history = HistoricalRecords(cascade_delete_history=True)
 

backend/clubs/views.py

@@ -1762,7 +1762,7 @@ def directory(self, request, *args, **kwargs):
         """
         serializer = ClubMinimalSerializer(
             Club.objects.all()
-            .exclude(Q(approved=False) | Q(archived=True))
+            .exclude((~Q(approved=True) & Q(ghost=False)) | Q(archived=True))
             .order_by(Lower("name")),
             many=True,
         )
@@ -2463,7 +2463,19 @@ def add_to_cart(self, request, *args, **kwargs):
                                     type: boolean
         ---
         """
-        event = self.get_object()
+        event = self.get_object().select_related("club")
+        # As clubs cannot go from historically approved to unapproved, we can
+        # check here without checking further on in the checkout process
+        # (the only exception is archiving a club, which is checked)
+        if not event.club.approved and not event.club.ghost:
+            return Response(
+                {
+                    "detail": """This club has not been approved
+                                 and cannot sell tickets.""",
+                    "success": False,
+                },
+                status=status.HTTP_403_FORBIDDEN,
+            )
         cart, _ = Cart.objects.get_or_create(owner=self.request.user)
 
         # Check if the event has already ended
@@ -5236,6 +5248,7 @@ def cart(self, request, *args, **kwargs):
 
         tickets_to_replace = cart.tickets.filter(
             Q(owner__isnull=False)
+            | Q(event__club__archived=True)
             | Q(holder__isnull=False)
             | Q(event__end_time__lt=now)
             | Q(event__ticket_drop_time__gt=timezone.now())
@@ -5370,6 +5383,7 @@ def initiate_checkout(self, request, *args, **kwargs):
         # are locked, we shouldn't block.
         tickets = cart.tickets.select_for_update(skip_locked=True).filter(
             Q(holder__isnull=True) | Q(holder=self.request.user),
+            event__club__archived=False,
             owner__isnull=True,
             event__ticket_drop_time__lt=timezone.now(),
             buyable=True,

frontend/pages/events/[id].tsx

@@ -269,6 +269,8 @@ const EventPage: React.FC<EventPageProps> = ({
     event.ticket_drop_time !== null &&
     new Date(event.ticket_drop_time) > new Date()
 
+  const historicallyApproved = club.approved !== true && !club.is_ghost
+
   return (
     <>
       <Modal
@@ -390,17 +392,20 @@ const EventPage: React.FC<EventPageProps> = ({
                     disabled={
                       totalAvailableTickets === 0 ||
                       endTime < DateTime.now() ||
-                      notDroppedYet
+                      notDroppedYet ||
+                      historicallyApproved
                     }
                     onClick={() => setShowTicketModal(true)}
                   >
-                    {endTime < DateTime.now()
-                      ? 'Event Ended'
-                      : notDroppedYet
-                        ? 'Tickets Not Available Yet'
-                        : totalAvailableTickets === 0
-                          ? 'Sold Out'
-                          : 'Get Tickets'}
+                    {historicallyApproved
+                      ? 'Club Not Approved'
+                      : endTime < DateTime.now()
+                        ? 'Event Ended'
+                        : notDroppedYet
+                          ? 'Tickets Not Available Yet'
+                          : totalAvailableTickets === 0
+                            ? 'Sold Out'
+                            : 'Get Tickets'}
                   </button>
                 </Card>
               )}

frontend/pages/events/index.tsx

@@ -37,9 +37,9 @@ export const getServerSideProps = (async (ctx) => {
   // TODO: Add caching
   const [baseProps, clubs, events] = await Promise.all([
     getBaseProps(ctx),
-    doApiRequest('/clubs/directory/?format=json', data)
-      .then((resp) => resp.json() as Promise<Club[]>)
-      .then((resp) => resp.filter(({ approved }) => approved)),
+    doApiRequest('/clubs/directory/?format=json', data).then(
+      (resp) => resp.json() as Promise<Club[]>,
+    ),
     doApiRequest(`/events/?${params.toString()}`, data).then(
       (resp) => resp.json() as Promise<ClubEvent[]>,
     ),