Merged in feat/sw-3207-refactor-select-hotel-tracking (pull request #2587)

feat(SW-3207): Refactor select-hotel tracking

* Refactor select-hotel tracking


Approved-by: Bianca Widstam

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/page.tsx

@@ -11,7 +11,7 @@ import { FamilyAndFriendsCodes } from "@/constants/booking"
 import FnFNotAllowedAlert from "@/components/HotelReservation/FnFNotAllowedAlert/FnFNotAllowedAlert"
 import SelectHotel from "@/components/HotelReservation/SelectHotel"
 import { getHotels } from "@/components/HotelReservation/SelectHotel/helpers"
-import { getTracking } from "@/components/HotelReservation/SelectHotel/tracking"
+import { getSelectHotelTracking } from "@/components/HotelReservation/SelectHotel/tracking"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import { getHotelSearchDetails } from "@/utils/hotelSearchDetails"
@@ -38,18 +38,10 @@ export default async function AlternativeHotelsPage(
     return notFound()
   }
 
-  const {
-    adultsInRoom,
-    bookingCode,
-    childrenInRoom,
-    city,
-    cityIdentifier,
-    hotel: isAlternativeFor,
-    noOfRooms,
-    redemption,
-  } = searchDetails
-
-  if (bookingCode && FamilyAndFriendsCodes.includes(bookingCode)) {
+  if (
+    booking.bookingCode &&
+    FamilyAndFriendsCodes.includes(booking.bookingCode)
+  ) {
     const cookieStore = await cookies()
     const isInvalidFNF = cookieStore.get("sc")?.value !== "1"
 
@@ -64,22 +56,22 @@ export default async function AlternativeHotelsPage(
     fromDate: booking.fromDate,
     toDate: booking.toDate,
     rooms: booking.rooms,
-    isAlternativeFor,
-    bookingCode,
-    city,
-    redemption: !!redemption,
+    isAlternativeFor: searchDetails.hotel,
+    bookingCode: booking.bookingCode,
+    city: searchDetails.city,
+    redemption: !!searchDetails.redemption,
   })
 
   const arrivalDate = new Date(booking.fromDate)
   const departureDate = new Date(booking.toDate)
 
-  const isRedemptionAvailability = redemption
+  const isRedemptionAvailability = searchDetails.redemption
     ? hotels.some(
         (hotel) => hotel.availability.productType?.redemptions?.length
       )
     : false
 
-  const isBookingCodeRateAvailable = bookingCode
+  const isBookingCodeRateAvailable = booking.bookingCode
     ? hotels.some(
         (hotel) =>
           hotel.availability.bookingCode &&
@@ -87,24 +79,29 @@ export default async function AlternativeHotelsPage(
       )
     : false
 
-  const { hotelsTrackingData, pageTrackingData } = getTracking(
-    params.lang,
-    !!isAlternativeFor,
+  const { hotelsTrackingData, pageTrackingData } = getSelectHotelTracking({
+    lang: params.lang,
+    pageId: searchDetails.hotel ? "alternative-hotels" : "select-hotel",
+    pageName: searchDetails.hotel
+      ? "hotelreservation|alternative-hotels"
+      : "hotelreservation|select-hotel",
+    siteSections: searchDetails.hotel
+      ? "hotelreservation|alternative-hotels"
+      : "hotelreservation|select-hotel",
     arrivalDate,
     departureDate,
-    adultsInRoom,
-    childrenInRoom,
-    hotels?.length ?? 0,
-    booking.hotelId,
-    noOfRooms,
-    hotels?.[0]?.hotel.address.country,
-    hotels?.[0]?.hotel.address.city,
-    cityIdentifier,
-    bookingCode,
+    rooms: booking.rooms,
+    hotelsResult: hotels?.length ?? 0,
+    searchTerm: searchDetails.hotel
+      ? booking.hotelId
+      : searchDetails.cityIdentifier,
+    country: hotels?.[0]?.hotel.address.country,
+    hotelCity: hotels?.[0]?.hotel.address.city,
+    bookingCode: booking.bookingCode,
     isBookingCodeRateAvailable,
-    redemption,
-    isRedemptionAvailability
-  )
+    isRedemption: searchDetails.redemption,
+    isRedemptionAvailable: isRedemptionAvailability,
+  })
 
   const mapHref = alternativeHotelsMap(params.lang)
 
@@ -114,17 +111,17 @@ export default async function AlternativeHotelsPage(
       defaultMessage: "Alternatives for {value}",
     },
     {
-      value: isAlternativeFor.name,
+      value: searchDetails.hotel.name,
     }
   )
   const suspenseKey = stringify(searchParams)
   return (
     <>
       <SelectHotel
-        bookingCode={bookingCode}
-        city={city}
+        bookingCode={booking.bookingCode}
+        city={searchDetails.city}
         hotels={hotels}
-        isAlternative={!!isAlternativeFor}
+        isAlternative={!!searchDetails.hotel}
         isBookingCodeRateAvailable={isBookingCodeRateAvailable}
         mapHref={mapHref}
         title={title}

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx

@@ -11,7 +11,7 @@ import { FamilyAndFriendsCodes } from "@/constants/booking"
 import FnFNotAllowedAlert from "@/components/HotelReservation/FnFNotAllowedAlert/FnFNotAllowedAlert"
 import SelectHotel from "@/components/HotelReservation/SelectHotel"
 import { getHotels } from "@/components/HotelReservation/SelectHotel/helpers"
-import { getTracking } from "@/components/HotelReservation/SelectHotel/tracking"
+import { getSelectHotelTracking } from "@/components/HotelReservation/SelectHotel/tracking"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getHotelSearchDetails } from "@/utils/hotelSearchDetails"
 
@@ -31,17 +31,10 @@ export default async function SelectHotelPage(
 
   if (!searchDetails || !searchDetails.city) return notFound()
 
-  const {
-    adultsInRoom,
-    bookingCode,
-    childrenInRoom,
-    city,
-    cityIdentifier,
-    noOfRooms,
-    redemption,
-  } = searchDetails
-
-  if (bookingCode && FamilyAndFriendsCodes.includes(bookingCode)) {
+  if (
+    booking.bookingCode &&
+    FamilyAndFriendsCodes.includes(booking.bookingCode)
+  ) {
     const cookieStore = await cookies()
     const isInvalidFNF = cookieStore.get("sc")?.value !== "1"
 
@@ -50,26 +43,25 @@ export default async function SelectHotelPage(
     }
   }
 
+  const { city, redemption } = searchDetails
+
   const hotels = await getHotels({
     fromDate: booking.fromDate,
     toDate: booking.toDate,
     rooms: booking.rooms,
     isAlternativeFor: null,
-    bookingCode,
-    city,
+    bookingCode: booking.bookingCode,
+    city: city,
     redemption: !!redemption,
   })
 
-  const arrivalDate = new Date(booking.fromDate)
-  const departureDate = new Date(booking.toDate)
-
   const isRedemptionAvailability = redemption
     ? hotels.some(
         (hotel) => hotel.availability.productType?.redemptions?.length
       )
     : false
 
-  const isBookingCodeRateAvailable = bookingCode
+  const isBookingCodeRateAvailable = booking.bookingCode
     ? hotels.some(
         (hotel) =>
           hotel.availability.bookingCode &&
@@ -77,31 +69,33 @@ export default async function SelectHotelPage(
       )
     : false
 
-  const { hotelsTrackingData, pageTrackingData } = getTracking(
-    params.lang,
-    false,
+  const arrivalDate = new Date(booking.fromDate)
+  const departureDate = new Date(booking.toDate)
+
+  const { hotelsTrackingData, pageTrackingData } = getSelectHotelTracking({
+    rooms: booking.rooms,
+    lang: params.lang,
+    pageId: "select-hotel",
+    pageName: "hotelreservation|select-hotel",
+    siteSections: "hotelreservation|select-hotel",
     arrivalDate,
     departureDate,
-    adultsInRoom,
-    childrenInRoom,
-    hotels?.length ?? 0,
-    booking.hotelId,
-    noOfRooms,
-    hotels?.[0]?.hotel.address.country,
-    hotels?.[0]?.hotel.address.city,
-    cityIdentifier,
-    bookingCode,
+    hotelsResult: hotels?.length ?? 0,
+    searchTerm: booking.hotelId,
+    country: hotels?.[0]?.hotel.address.country,
+    hotelCity: hotels?.[0]?.hotel.address.city,
+    bookingCode: booking.bookingCode,
     isBookingCodeRateAvailable,
-    redemption,
-    isRedemptionAvailability
-  )
+    isRedemption: redemption,
+    isRedemptionAvailable: isRedemptionAvailability,
+  })
 
   const mapHref = selectHotelMap(params.lang)
   const suspenseKey = stringify(searchParams)
   return (
     <>
       <SelectHotel
-        bookingCode={bookingCode}
+        bookingCode={booking.bookingCode}
         isBookingCodeRateAvailable={isBookingCodeRateAvailable}
         city={city}
         hotels={hotels}