From 7fd8a0419bad0a38118b6ecaee967425b15cff73 Mon Sep 17 00:00:00 2001
From: Filip Borum Poulsen <fbp@deif.com>
Date: Sun, 23 Apr 2023 19:01:30 +0200
Subject: [PATCH] Fixed mistake where cancelled timeslots was not orderable

---
 server/src/routes/createOrder.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/routes/createOrder.ts b/server/src/routes/createOrder.ts
index 9d0e869..639547a 100644
--- a/server/src/routes/createOrder.ts
+++ b/server/src/routes/createOrder.ts
@@ -106,10 +106,15 @@ router.post("/order", UserAuth, async (req: AuthedRequest, res: Response) => {
             ) as weekly_timeslot_available,
             EXISTS(
                 SELECT 1 FROM public.reserved_timeslots
+                JOIN orders ON reserved_timeslots.id = orders.timeslot_id
                 WHERE
                     ((start_time >= $5 AND start_time < $6)
                     OR (end_time > $5 AND end_time <= $6))
                     AND trainer_id = $1
+                    AND (
+                        orders.order_status = 'Confirmed'
+                        OR orders.order_status = 'Created'
+                    )
             ) as time_already_reserved;
             `, [
                 orderBody.trainer,