From 317619ea78b09964099a2d23aedb49d8f888ee0e Mon Sep 17 00:00:00 2001
From: Christel Westerberg <christel.westerberg@scandichotels.com>
Date: Wed, 30 Oct 2024 16:39:04 +0100
Subject: [PATCH] fix: preload requests to avoid needing to promise.all

---
 .../(standard)/[step]/@summary/page.tsx       | 22 +++----
 .../(standard)/[step]/page.tsx                | 61 ++++++++-----------
 2 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@summary/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@summary/page.tsx
index f1e1897e1..38444447f 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@summary/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@summary/page.tsx
@@ -24,18 +24,16 @@ export default async function SummaryPage({
     return notFound()
   }
 
-  const [user, availability] = await Promise.all([
-    getProfileSafely(),
-    getSelectedRoomAvailability({
-      hotelId: parseInt(hotel),
-      adults,
-      children,
-      roomStayStartDate: fromDate,
-      roomStayEndDate: toDate,
-      rateCode,
-      roomTypeCode,
-    }),
-  ])
+  const availability = await getSelectedRoomAvailability({
+    hotelId: parseInt(hotel),
+    adults,
+    children,
+    roomStayStartDate: fromDate,
+    roomStayEndDate: toDate,
+    rateCode,
+    roomTypeCode,
+  })
+  const user = await getProfileSafely()
 
   if (!availability) {
     console.error("No hotel or availability data", availability)
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx
index dc07ed3f0..e5bf9f73b 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx
@@ -52,46 +52,37 @@ export default async function StepPage({
     toDate,
   } = getQueryParamsForEnterDetails(selectRoomParams)
 
-  void getRoomAvailability({
-    hotelId: parseInt(hotelId),
-    adults,
-    children,
-    roomStayStartDate: fromDate,
-    roomStayEndDate: toDate,
-    rateCode
-  })
-
-
   if (!rateCode || !roomTypeCode) {
     return notFound()
   }
 
-  const [
-    hotelData,
-    user,
-    savedCreditCards,
-    breakfastPackages,
-    roomAvailability,
-  ] = await Promise.all([
-    getHotelData({
-      hotelId,
-      language: lang,
-      include: [HotelIncludeEnum.RoomCategories],
-    }),
+  void getSelectedRoomAvailability({
+    hotelId: parseInt(searchParams.hotel),
+    adults,
+    children,
+    roomStayStartDate: fromDate,
+    roomStayEndDate: toDate,
+    rateCode,
+    roomTypeCode,
+  })
 
-    getProfileSafely(),
-    getCreditCardsSafely(),
-    getBreakfastPackages(searchParams.hotel),
-    getSelectedRoomAvailability({
-      hotelId: parseInt(searchParams.hotel),
-      adults,
-      children,
-      roomStayStartDate: fromDate,
-      roomStayEndDate: toDate,
-      rateCode,
-      roomTypeCode,
-    }),
-  ])
+  const hotelData = await getHotelData({
+    hotelId,
+    language: lang,
+    include: [HotelIncludeEnum.RoomCategories],
+  })
+  const roomAvailability = await getSelectedRoomAvailability({
+    hotelId: parseInt(searchParams.hotel),
+    adults,
+    children,
+    roomStayStartDate: fromDate,
+    roomStayEndDate: toDate,
+    rateCode,
+    roomTypeCode,
+  })
+  const breakfastPackages = await getBreakfastPackages(searchParams.hotel)
+  const user = await getProfileSafely()
+  const savedCreditCards = await getCreditCardsSafely()
 
   if (!isValidStep(params.step) || !hotelData || !roomAvailability) {
     return notFound()