Merge branch 'develop' into feature/tracking

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

@@ -7,6 +7,7 @@ import { getLocations } from "@/lib/trpc/memoizedRequests"
 
 import {
   fetchAvailableHotels,
+  generateChildrenString,
   getFiltersFromHotels,
 } from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
 import HotelCardListing from "@/components/HotelReservation/HotelCardListing"
@@ -50,7 +51,8 @@ export default async function SelectHotelPage({
   const selectHotelParamsObject =
     getHotelReservationQueryParams(selectHotelParams)
   const adults = selectHotelParamsObject.room[0].adults // TODO: Handle multiple rooms
-  const children = selectHotelParamsObject.room[0].child?.length // TODO: Handle multiple rooms
+  const child = selectHotelParamsObject.room[0].child
+  const children = child ? generateChildrenString(child) : undefined // TODO: Handle multiple rooms
 
   const hotels = await fetchAvailableHotels({
     cityId: city.id,
@@ -80,7 +82,7 @@ export default async function SelectHotelPage({
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     departureDate: format(departureDate, "yyyy-MM-dd"),
     noOfAdults: adults,
-    noOfChildren: children,
+    noOfChildren: child?.length,
     noOfRooms: 1, // // TODO: Handle multiple rooms
     duration: differenceInCalendarDays(departureDate, arrivalDate),
     leadTime: differenceInCalendarDays(arrivalDate, new Date()),

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts

@@ -2,9 +2,11 @@ import { serverClient } from "@/lib/trpc/server"
 
 import { getLang } from "@/i18n/serverContext"
 
+import { BedTypeEnum } from "@/types/components/bookingWidget/enums"
 import { AvailabilityInput } from "@/types/components/hotelReservation/selectHotel/availabilityInput"
 import { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
 import { Filter } from "@/types/components/hotelReservation/selectHotel/hotelFilters"
+import { Child } from "@/types/components/hotelReservation/selectRate/selectRate"
 
 export async function fetchAvailableHotels(
   input: AvailabilityInput
@@ -41,3 +43,19 @@ export function getFiltersFromHotels(hotels: HotelData[]) {
 
   return filterList
 }
+
+const bedTypeMap: Record<number, string> = {
+  [BedTypeEnum.IN_ADULTS_BED]: "ParentsBed",
+  [BedTypeEnum.IN_CRIB]: "Crib",
+  [BedTypeEnum.IN_EXTRA_BED]: "ExtraBed",
+}
+
+export function generateChildrenString(children: Child[]): string {
+  return `[${children
+    ?.map((child) => {
+      const age = child.age
+      const bedType = bedTypeMap[+child.bed]
+      return `${age}:${bedType}`
+    })
+    .join(",")}]`
+}