Merge pull request #99 from mbpictures/feature/limit-ticket-amount

feature/limit-ticket-amount

Author: mbpictures

cypress/fixtures/admin/events.json

@@ -32,14 +32,16 @@
             "price": 30.99,
             "color": "#00AA00",
             "occupiedColor": "#FF0000",
-            "activeColor": "#00FF00"
+            "activeColor": "#00FF00",
+            "maxTickets": null
         },
         {
             "label": "Premium",
             "price": 60.99,
             "color": "#0000AA",
             "occupiedColor": "#FF0000",
-            "activeColor": "#0000FF"
+            "activeColor": "#0000FF",
+            "maxTickets": null
         }
     ]
 }

locale/de/seatselection.json

@@ -4,5 +4,6 @@
     "event-booked-out": "Tut uns leid, aber das Event ist bereits voll ausgebucht",
     "seat-map-preview": "Sitzplan Vorschau",
     "seat-booked": "Dieser Platz wurde bereits gebucht",
-    "tickets-left": "Tickets verfügbar: {{ticketsLeft}}"
+    "tickets-left": "Tickets verfügbar: {{ticketsLeft}}",
+    "max-tickets": "Maximale Tickets pro Bestellung: {{maxTickets}}"
 }

locale/en/seatselection.json

@@ -4,5 +4,6 @@
     "event-booked-out": "We are sorry, but the event is already fully booked",
     "seat-map-preview": "Seat Map Preview",
     "seat-booked": "This seat has already been booked",
-    "tickets-left": "Tickets left: {{ticketsLeft}}"
+    "tickets-left": "Tickets left: {{ticketsLeft}}",
+    "max-tickets": "Maximum tickets per order: {{maxTickets}}"
 }

prisma/schema.prisma

@@ -64,6 +64,7 @@ model Category {
   occupiedColor String?
   events        CategoriesOnEvents[]
   tickets       Ticket[]
+  maxTickets    Int?
 }
 
 model CategoriesOnEvents {

src/components/admin/dialogs/ManageCategoryDialog.tsx

@@ -39,7 +39,8 @@ export const ManageCategoryDialog = ({ open, onClose, onChange, category, curren
         price: Yup.number().required("Price is required"),
         color: Yup.string(),
         activeColor: Yup.string(),
-        occupiedColor: Yup.string()
+        occupiedColor: Yup.string(),
+        maxTickets: Yup.number().nullable()
     });
 
 
@@ -49,7 +50,8 @@ export const ManageCategoryDialog = ({ open, onClose, onChange, category, curren
             price: category?.price ?? 0,
             color: category?.color ?? SEAT_COLORS.normal,
             activeColor: category?.activeColor ?? SEAT_COLORS.active,
-            occupiedColor: category?.occupiedColor ?? SEAT_COLORS.occupied
+            occupiedColor: category?.occupiedColor ?? SEAT_COLORS.occupied,
+            maxTickets: category?.maxTickets ?? null
         },
         validationSchema: schema,
         onSubmit: async (values) => {
@@ -83,6 +85,7 @@ export const ManageCategoryDialog = ({ open, onClose, onChange, category, curren
         formik.setFieldValue("color", category.color);
         formik.setFieldValue("activeColor", category.activeColor);
         formik.setFieldValue("occupiedColor", category.occupiedColor);
+        formik.setFieldValue("maxTickets", category.maxTickets);
     }, [category]);
 
     const handleDeleteCategory = async () => {
@@ -222,6 +225,19 @@ export const ManageCategoryDialog = ({ open, onClose, onChange, category, curren
                                         hideTextfield
                                     />
                                 </Stack>
+                                <Stack
+                                    direction={"column"}
+                                    spacing={2}
+                                >
+                                    <TextField
+                                        label={"Maximum Tickets"}
+                                        sx={{ flexGrow: 1 }}
+                                        {...getFieldProps("maxTickets")}
+                                    />
+                                    <Typography variant="caption">
+                                        Leave empty for unlimited tickets per order
+                                    </Typography>
+                                </Stack>
                                 <Stack direction={"row"}>
                                     <LoadingButton
                                         fullWidth

src/components/seatselection/free/SeatSelectionFreeEntry.tsx

@@ -37,6 +37,7 @@ export const SeatSelectionFreeEntry = ({
         label: string;
         price: number;
         ticketsLeft: number;
+        maxTickets: number | null;
     }>;
     index: number;
     currentlySelectedCategories: Array<number>;
@@ -57,21 +58,25 @@ export const SeatSelectionFreeEntry = ({
 
     const getTicketsLeft = (categoryId?: number) => {
         return categories.find((value) => value.id === (categoryId ?? category))?.ticketsLeft ?? Infinity;
+    };
+
+    const getMaxTickets = (categoryId?: number) => {
+        return categories.find((value) => value.id === (categoryId ?? category))?.maxTickets ?? Infinity;
     }
 
     const handleChange = (event) => {
         if (event.target.value === "") {
             setTicketAmount(-1);
             return;
         }
-        const newValue = Math.min(isNaN(parseInt(event.target.value)) ? 0 : parseInt(event.target.value), getTicketsLeft());
+        const newValue = Math.min(isNaN(parseInt(event.target.value)) ? 0 : parseInt(event.target.value), getTicketsLeft(), getMaxTickets());
         setTicketAmount(newValue);
         onChange(index, newValue, category, category);
     };
 
     const onAdd = () => {
         if (category === -1) return;
-        const val = Math.min(ticketAmount + 1, getTicketsLeft());
+        const val = Math.min(ticketAmount + 1, getTicketsLeft(), getMaxTickets());
         setTicketAmount(val);
         onChange(index, val, category, category);
     };
@@ -83,7 +88,7 @@ export const SeatSelectionFreeEntry = ({
     };
 
     const handleCategoryChange = (event) => {
-        onChange(index, Math.min(ticketAmount, getTicketsLeft(parseInt(event.target.value))), parseInt(event.target.value), category);
+        onChange(index, Math.min(ticketAmount, getTicketsLeft(parseInt(event.target.value)), getMaxTickets(parseInt(event.target.value))), parseInt(event.target.value), category);
     };
 
     const price =
@@ -123,6 +128,13 @@ export const SeatSelectionFreeEntry = ({
                                 </Typography>
                             )
                         }
+                        {
+                            getMaxTickets() < Infinity && (
+                                <Typography variant={"caption"}>
+                                    {t("seatselection:max-tickets", {maxTickets: getMaxTickets()})}
+                                </Typography>
+                            )
+                        }
                     </Stack>
                     <Box width={20} />
                     <Stack>

src/constants/serverUtil.ts

@@ -11,8 +11,8 @@ import { eventDateIsBookable } from "./util";
 import { SeatMap } from "../components/seatselection/seatmap/SeatSelectionMap";
 import { randomBytes } from "crypto";
 import { Prisma } from ".prisma/client";
-import OrderFindManyArgs = Prisma.OrderFindManyArgs;
-import SelectSubset = Prisma.SelectSubset;
+type OrderFindManyArgs = Prisma.OrderFindManyArgs;
+type SelectSubset<X, U> = Prisma.SelectSubset<X, U>;
 
 export function getStaticAssetFile(file, options = null) {
     let basePath = process.cwd();
@@ -183,7 +183,8 @@ export const validateOrder = async (tickets: Tickets, eventDateId, reservationId
                     categories: {
                         select: {
                             categoryId: true,
-                            maxAmount: true
+                            maxAmount: true,
+                            category: true,
                         }
                     }
                 }
@@ -212,6 +213,20 @@ export const validateOrder = async (tickets: Tickets, eventDateId, reservationId
 
     let currentAmounts = await getCategoryTicketAmount(eventDateId, tickets, reservationId);
     let invalidTickets = [];
+    const orderTicketSum = tickets.reduce((group, ticket) => {
+        if (!group[ticket.categoryId]) group[ticket.categoryId] = 0;
+        group[ticket.categoryId] += ticket.amount;
+        return group;
+    }, {} as Record<number, number>);
+    const invalidTicketCategories = Object.entries(orderTicketSum).filter(entry => {
+        const category = eventDate.event.categories.find(c => c.categoryId === parseInt(entry[0]))?.category;
+        const maxPerOrder = category ? (category.maxTickets ?? 0) : 0;
+        return entry[1] > maxPerOrder && maxPerOrder > 0;
+    }).map(entry => parseInt(entry[0], 10));
+    if (invalidTicketCategories.length > 0) {
+        return [false, tickets.filter(ticket => invalidTicketCategories.includes(ticket.categoryId))];
+    }
+
     for (let ticket of tickets) {
         if (typeof currentAmounts[ticket.categoryId] === "undefined")
             currentAmounts[ticket.categoryId] = 0;

src/pages/api/admin/category/[id].ts

@@ -53,14 +53,15 @@ export default async function handler(
     }
 
     if (req.method === "PUT") {
-        const { label, price, color, activeColor, occupiedColor } =
+        const { label, price, color, activeColor, occupiedColor, maxTickets } =
             req.body;
         const data = {
             ...(label && { label }),
             ...(price && { price }),
             ...(color && { color }),
             ...(activeColor && { activeColor }),
-            ...(occupiedColor && { occupiedColor })
+            ...(occupiedColor && { occupiedColor }),
+            ...(maxTickets && maxTickets !== "" && { maxTickets: parseInt(maxTickets) }),
         };
         await prisma.category.update({
             where: {

src/pages/api/admin/category/index.ts

@@ -23,14 +23,15 @@ export default async function handler(
     }
 
     if (req.method === "POST") {
-        const { label, price, color, activeColor, occupiedColor } = req.body;
+        const { label, price, color, activeColor, occupiedColor, maxTickets } = req.body;
         const category = await prisma.category.create({
             data: {
                 label: label,
                 price: parseFloat(price),
                 color: color,
                 activeColor: activeColor,
-                occupiedColor: occupiedColor
+                occupiedColor: occupiedColor,
+                maxTickets: maxTickets === "" || maxTickets === null ? null : parseInt(maxTickets)
             }
         });
         res.status(200).end(category.id.toFixed(0));

src/pages/api/admin/ticket/[id].ts

@@ -26,9 +26,15 @@ export default async function handler(
         include: {
             order: {
                 include: {
-                    user: true
+                    user: true,
+                    eventDate: {
+                        include: {
+                            event: true
+                        }
+                    }
                 }
-            }
+            },
+            category: true
         }
     });
     if (!ticket)