Allow existing sessions to be found (#537)

Co-authored-by: zlrkw11 <[email protected]>
UoaWDCC · Jun 28, 2024 · 90ef032 · 90ef032
1 parent 88f78d5
commit 90ef032
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/server/src/service-layer/controllers/PaymentController.ts b/server/src/service-layer/controllers/PaymentController.ts
@@ -265,38 +265,19 @@ export class PaymentController extends Controller {
     const userDataService = new UserDataService()
 
     try {
+      /**
+       * Declare these with outer scope as they are used in most paths
+       */
+      const { startDate, endDate } = requestBody
       const userData = await userDataService.getUserData(uid)
+
       const { newUser, stripeCustomerId } =
         await stripeService.createCustomerIfNotExist(
           request.user,
           userData,
           userDataService
         )
 
-      /**
-       * Declare these with outer scope as they are used in most paths
-       */
-      const { startDate, endDate } = requestBody
-
-      const dateTimestampsInBooking = timestampsInRange(startDate, endDate)
-      const totalDays = dateTimestampsInBooking.length
-
-      /**
-       * Used for formatted display to user
-       */
-      const BOOKING_START_DATE = UTCDateToDdMmYyyy(
-        new Date(firestoreTimestampToDate(dateTimestampsInBooking[0]))
-      )
-
-      /**
-       * Used for formatted display to user
-       */
-      const BOOKING_END_DATE = UTCDateToDdMmYyyy(
-        new Date(
-          firestoreTimestampToDate(dateTimestampsInBooking[totalDays - 1])
-        )
-      )
-
       /**
        * The amount of time users have to complete a session
        */
@@ -340,6 +321,25 @@ export class PaymentController extends Controller {
         }
       }
 
+      const dateTimestampsInBooking = timestampsInRange(startDate, endDate)
+      const totalDays = dateTimestampsInBooking.length
+
+      /**
+       * Used for formatted display to user
+       */
+      const BOOKING_START_DATE = UTCDateToDdMmYyyy(
+        new Date(firestoreTimestampToDate(dateTimestampsInBooking[0]))
+      )
+
+      /**
+       * Used for formatted display to user
+       */
+      const BOOKING_END_DATE = UTCDateToDdMmYyyy(
+        new Date(
+          firestoreTimestampToDate(dateTimestampsInBooking[totalDays - 1])
+        )
+      )
+
       const MAX_BOOKING_DAYS = 10
       // Validate number of dates to avoid kiddies from forging bookings
       if (totalDays > MAX_BOOKING_DAYS) {