Merged in feat/SW-1353 (pull request #1513)

feat: add multiroom tracking to booking flow

Approved-by: Linus Flood

apps/scandic-web/server/routers/hotels/query.ts

@@ -499,20 +499,20 @@ export const hotelQueryRouter = router({
         const { lang } = input
         const apiLang = toApiLang(lang)
         const {
-          hotelId,
-          roomStayStartDate,
-          roomStayEndDate,
-          uniqueAdultsCount,
-          childArray,
+          adultsCount,
           bookingCode,
+          childArray,
+          hotelId,
           rateCode,
+          roomStayEndDate,
+          roomStayStartDate,
         } = input
 
         const metricsData = {
           hotelId,
           roomStayStartDate,
           roomStayEndDate,
-          uniqueAdultsCount,
+          adultsCount,
           childArray: childArray ? JSON.stringify(childArray) : undefined,
           bookingCode,
         }
@@ -525,15 +525,15 @@ export const hotelQueryRouter = router({
         )
 
         const availabilityResponses = await Promise.allSettled(
-          uniqueAdultsCount.map(async (adultCount: number) => {
+          adultsCount.map(async (adultCount: number, idx: number) => {
+            const kids = childArray?.[idx]
             const params: Record<string, string | number | undefined> = {
               roomStayStartDate,
               roomStayEndDate,
               adults: adultCount,
-              ...(childArray &&
-                childArray.length > 0 && {
-                  children: generateChildrenString(childArray),
-                }),
+              ...(kids?.length && {
+                children: generateChildrenString(kids),
+              }),
               ...(bookingCode && { bookingCode }),
               language: apiLang,
             }
@@ -769,9 +769,9 @@ export const hotelQueryRouter = router({
                 type: matchingRoom.mainBed.type,
                 extraBed: matchingRoom.fixedExtraBed
                   ? {
-                      type: matchingRoom.fixedExtraBed.type,
-                      description: matchingRoom.fixedExtraBed.description,
-                    }
+                    type: matchingRoom.fixedExtraBed.type,
+                    description: matchingRoom.fixedExtraBed.description,
+                  }
                   : undefined,
               }
             }
@@ -794,23 +794,27 @@ export const hotelQueryRouter = router({
         )
 
         return {
-          selectedRoom,
-          rateDetails: rateDefinition?.generalTerms,
+          bedTypes,
+          breakfastIncluded: !!rateDefinition?.breakfastIncluded,
+          cancellationRule: rateDefinition?.cancellationRule,
           cancellationText: rateDefinition?.cancellationText ?? "",
           isFlexRate:
             rateDefinition?.cancellationRule ===
             CancellationRuleEnum.CancellableBefore6PM,
-          mustBeGuaranteed: !!rateDefinition?.mustBeGuaranteed,
           memberMustBeGuaranteed: !!memberRateDefinition?.mustBeGuaranteed,
-          breakfastIncluded: !!rateDefinition?.breakfastIncluded,
+          memberRate: rates?.member,
+          mustBeGuaranteed: !!rateDefinition?.mustBeGuaranteed,
+          publicRate: rates?.public,
+          rate: selectedRoom.products[0].rate,
+          rateDefinitionTitle: rateDefinition?.title ?? "",
+          rateDetails: rateDefinition?.generalTerms,
           // Send rate Title when it is a booking code rate
           rateTitle:
             rateDefinition?.rateType !== RateTypeEnum.Regular
               ? rateDefinition?.title
               : undefined,
-          memberRate: rates?.member,
-          publicRate: rates?.public,
-          bedTypes,
+          rateType: rateDefinition?.rateType ?? "",
+          selectedRoom,
         }
       }),
     hotelsByCityWithBookingCode: serviceProcedure
@@ -1096,9 +1100,9 @@ export const hotelQueryRouter = router({
 
               return hotelData
                 ? {
-                    ...hotelData,
-                    url: hotelPage?.url ?? null,
-                  }
+                  ...hotelData,
+                  url: hotelPage?.url ?? null,
+                }
                 : null
             })
           )