From 8cc9bbb8bad27743a22a2456aa81705d09a57fd7 Mon Sep 17 00:00:00 2001
From: Julian Weng <julian.weng.us@gmail.com>
Date: Mon, 15 Apr 2024 19:14:22 -0400
Subject: [PATCH 1/4] Integrate ticket price field into ticket creation/list
 views, as well into ticket creation frontend.

---
 backend/clubs/views.py                        | 18 ++++++++-
 .../components/ClubEditPage/TicketsModal.tsx  | 37 +++++++++++++++++--
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/backend/clubs/views.py b/backend/clubs/views.py
index bbd974356..bb96dad64 100644
--- a/backend/clubs/views.py
+++ b/backend/clubs/views.py
@@ -46,6 +46,7 @@
     DurationField,
     ExpressionWrapper,
     F,
+    Max,
     Prefetch,
     Q,
     Sum,
@@ -2542,6 +2543,8 @@ def tickets(self, request, *args, **kwargs):
                                                 type: string
                                             count:
                                                 type: integer
+                                            price:
+                                                type: number
                                 available:
                                     type: array
                                     items:
@@ -2551,15 +2554,24 @@ def tickets(self, request, *args, **kwargs):
                                                 type: string
                                             count:
                                                 type: integer
+                                            price:
+                                                type: number
         ---
         """
         event = self.get_object()
         tickets = Ticket.objects.filter(event=event)
 
-        totals = tickets.values("type").annotate(count=Count("type")).order_by("type")
+        # Take price of first ticket of given type for now
+        totals = (
+            tickets.values("type")
+            .annotate(price=Max("price"))
+            .annotate(count=Count("type"))
+            .order_by("type")
+        )
         available = (
             tickets.filter(owner__isnull=True, holder__isnull=True)
             .values("type")
+            .annotate(price=Max("price"))
             .annotate(count=Count("type"))
             .order_by("type")
         )
@@ -2586,6 +2598,8 @@ def create_tickets(self, request, *args, **kwargs):
                                             type: string
                                         count:
                                             type: integer
+                                        price:
+                                            type: number
                             order_limit:
                                 type: int
                                 required: false
@@ -2608,7 +2622,7 @@ def create_tickets(self, request, *args, **kwargs):
 
         Ticket.objects.filter(event=event).delete()  # Idempotency
         tickets = [
-            Ticket(event=event, type=item["type"])
+            Ticket(event=event, type=item["type"], price=item["price"])
             for item in quantities
             for _ in range(item["count"])
         ]
diff --git a/frontend/components/ClubEditPage/TicketsModal.tsx b/frontend/components/ClubEditPage/TicketsModal.tsx
index 7b8158b1f..60fbffc89 100644
--- a/frontend/components/ClubEditPage/TicketsModal.tsx
+++ b/frontend/components/ClubEditPage/TicketsModal.tsx
@@ -55,12 +55,14 @@ const TicketItem = ({
   ticket,
   changeName,
   changeCount,
+  changePrice,
   deleteTicket,
   deletable,
   index,
 }): ReactElement => {
   const [name, setName] = useState(ticket.name)
   const [count, setCount] = useState(ticket.count)
+  const [price, setPrice] = useState(ticket.price)
 
   const handleNameChange = (e) => {
     setName(e.target.value)
@@ -72,6 +74,12 @@ const TicketItem = ({
     changeCount(e.target.value, index)
   }
 
+  const handlePriceChange = (e) => {
+    const rounded = Math.round(parseFloat(e.target.value) * 100) / 100
+    setPrice(rounded.toString())
+    changePrice(rounded.toString(), index)
+  }
+
   return (
     <div style={{ padding: '5px 0px' }}>
       <div
@@ -95,6 +103,13 @@ const TicketItem = ({
           placeholder="Ticket Count"
           onChange={handleCountChange}
         />
+        <Input
+          type="number"
+          className="input"
+          value={price}
+          placeholder="Ticket Price"
+          onChange={handlePriceChange}
+        />
         <button
           className="button is-danger"
           disabled={!deletable}
@@ -110,6 +125,7 @@ const TicketItem = ({
 type Ticket = {
   name: string
   count: string | null
+  price: string | null // Free if null
 }
 
 const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
@@ -119,7 +135,7 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
   const [submitting, setSubmitting] = useState(false)
 
   const [tickets, setTickets] = useState<Ticket[]>([
-    { name: 'Regular Ticket', count: null },
+    { name: 'Regular Ticket', count: null, price: null },
   ])
 
   const handleNameChange = (name, i) => {
@@ -134,6 +150,12 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
     setTickets(ticks)
   }
 
+  const handlePriceChange = (price, i) => {
+    const ticks = [...tickets]
+    ticks[i].price = price
+    setTickets(ticks)
+  }
+
   const deleteTicket = (i) => {
     const ticks = [...tickets]
     ticks.splice(i, 1)
@@ -142,7 +164,7 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
 
   const addNewTicket = () => {
     const ticks = [...tickets]
-    ticks.push({ name: '', count: null })
+    ticks.push({ name: '', count: null, price: null })
     setTickets(ticks)
   }
 
@@ -151,7 +173,11 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
       const quantities = tickets
         .filter((ticket) => ticket.count != null)
         .map((ticket) => {
-          return { type: ticket.name, count: parseInt(ticket.count || '') }
+          return {
+            type: ticket.name,
+            count: parseInt(ticket.count || ''),
+            price: parseInt(ticket.price || ''),
+          }
         })
       doApiRequest(`/events/${id}/tickets/?format=json`, {
         method: 'PUT',
@@ -168,7 +194,9 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
     (ticket) =>
       typeof ticket.name !== 'string' ||
       ticket.count === null ||
-      !Number.isInteger(parseInt(ticket.count || '0')),
+      !Number.isInteger(parseInt(ticket.count || '0')) ||
+      ticket.price === null ||
+      !Number.isInteger(parseInt(ticket.price || '0')),
   )
 
   return (
@@ -202,6 +230,7 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
               deletable={tickets.length !== 1}
               changeName={handleNameChange}
               changeCount={handleCountChange}
+              changePrice={handlePriceChange}
               deleteTicket={deleteTicket}
             />
           ))}

From 065c60cfed3f966010ee2bd6d74ff04442ea745a Mon Sep 17 00:00:00 2001
From: aviupadhyayula <aupadhy@gmail.com>
Date: Mon, 15 Apr 2024 20:04:42 -0400
Subject: [PATCH 2/4] Enforce non-negative ticket prices at creation

---
 backend/clubs/views.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/backend/clubs/views.py b/backend/clubs/views.py
index bb96dad64..7b495745b 100644
--- a/backend/clubs/views.py
+++ b/backend/clubs/views.py
@@ -2612,14 +2612,28 @@ def create_tickets(self, request, *args, **kwargs):
                             properties:
                                 detail:
                                     type: string
+            "400":
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                detail:
+                                    type: string
         ---
         """
         event = self.get_object()
 
         quantities = request.data.get("quantities")
 
-        # Atomicity ensures idempotency
+        # Ticket prices must be non-negative
+        if any(item.get("price", 0) < 0 for item in quantities):
+            return Response(
+                {"detail": "Ticket price cannot be negative."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
+        # Atomicity ensures idempotency
         Ticket.objects.filter(event=event).delete()  # Idempotency
         tickets = [
             Ticket(event=event, type=item["type"], price=item["price"])

From 47216b6d2c4c8c16162bf596e03c642047a8c248 Mon Sep 17 00:00:00 2001
From: Julian Weng <julian.weng.us@gmail.com>
Date: Mon, 15 Apr 2024 20:58:28 -0400
Subject: [PATCH 3/4] Add frontend checks for fractional/negative ticket count
 and cost.

---
 .../components/ClubEditPage/TicketsModal.tsx  | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/frontend/components/ClubEditPage/TicketsModal.tsx b/frontend/components/ClubEditPage/TicketsModal.tsx
index 60fbffc89..fcb769cf5 100644
--- a/frontend/components/ClubEditPage/TicketsModal.tsx
+++ b/frontend/components/ClubEditPage/TicketsModal.tsx
@@ -70,8 +70,9 @@ const TicketItem = ({
   }
 
   const handleCountChange = (e) => {
-    setCount(e.target.value)
-    changeCount(e.target.value, index)
+    const rounded = Math.round(parseFloat(e.target.value))
+    setCount(rounded.toString())
+    changeCount(rounded.toString(), index)
   }
 
   const handlePriceChange = (e) => {
@@ -176,17 +177,23 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
           return {
             type: ticket.name,
             count: parseInt(ticket.count || ''),
-            price: parseInt(ticket.price || ''),
+            price: parseFloat(ticket.price || ''),
           }
         })
       doApiRequest(`/events/${id}/tickets/?format=json`, {
         method: 'PUT',
         body: {
-          quantities: quantities,
+          quantities,
         },
+      }).then((res) => {
+        if (res.ok) {
+          notify(<>Tickets Created!</>, 'success')
+          setSubmitting(false)
+        } else {
+          notify(<>Error creating tickets</>, 'error')
+          setSubmitting(false)
+        }
       })
-      notify(<>Tickets Created!</>, 'success')
-      setSubmitting(false)
     }
   }
 
@@ -195,8 +202,10 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
       typeof ticket.name !== 'string' ||
       ticket.count === null ||
       !Number.isInteger(parseInt(ticket.count || '0')) ||
+      parseInt(ticket.count || '0') < 0 ||
       ticket.price === null ||
-      !Number.isInteger(parseInt(ticket.price || '0')),
+      !Number.isFinite(parseFloat(ticket.price || '0')) ||
+      parseFloat(ticket.price || '0') < 0,
   )
 
   return (
@@ -209,15 +218,7 @@ const TicketsModal = (props: { event: ClubEvent }): ReactElement => {
       />
       <ModalBody>
         <Title>{name}</Title>
-        <Text>
-          Create new tickets for this event. To be filled with actual
-          instructions. Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-          sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-          enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi
-          ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur.
-        </Text>
+        <Text>Create new tickets for this event.</Text>
         <Line />
         <SectionContainer>
           <h1>Tickets</h1>

From 2ab6f3cbb55a0f45aa4fad839485ba6df66f55e3 Mon Sep 17 00:00:00 2001
From: Julian Weng <julian.weng.us@gmail.com>
Date: Mon, 15 Apr 2024 21:01:36 -0400
Subject: [PATCH 4/4] Prevent users from entering negative/fractional ticket
 counts/price for now.

---
 frontend/components/ClubEditPage/TicketsModal.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/components/ClubEditPage/TicketsModal.tsx b/frontend/components/ClubEditPage/TicketsModal.tsx
index fcb769cf5..8e08ec825 100644
--- a/frontend/components/ClubEditPage/TicketsModal.tsx
+++ b/frontend/components/ClubEditPage/TicketsModal.tsx
@@ -70,13 +70,15 @@ const TicketItem = ({
   }
 
   const handleCountChange = (e) => {
-    const rounded = Math.round(parseFloat(e.target.value))
+    let rounded = Math.round(parseFloat(e.target.value))
+    rounded = rounded < 0 ? 0 : rounded
     setCount(rounded.toString())
     changeCount(rounded.toString(), index)
   }
 
   const handlePriceChange = (e) => {
-    const rounded = Math.round(parseFloat(e.target.value) * 100) / 100
+    let rounded = Math.round(parseFloat(e.target.value) * 100) / 100
+    rounded = rounded < 0 ? 0 : rounded
     setPrice(rounded.toString())
     changePrice(rounded.toString(), index)
   }