Merged in fix/SW-2438-change-to-breakfast-buffet-remove-dash (pull request #1918)

fix(SW-2438): change to breakfast buffet always and replace dash with empty string

* fix(SW-2438): change to breakfast buffet always and replace dash with empty string

* fix(SW-2438): remove none from ageOfChildren


Approved-by: Tobias Johansson
Approved-by: Matilda Landström

apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts

@@ -30,7 +30,7 @@ function getRate(cancellationRule: RateDefinition["cancellationRule"] | null) {
     case "NotCancellable":
       return RateEnum.save
     default:
-      return "-"
+      return ""
   }
 }
 
@@ -97,7 +97,7 @@ export function getTracking(
     })
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
-    ageOfChildren: rooms.map((r) => r.childrenAges?.join(",") ?? "-").join("|"),
+    ageOfChildren: rooms.map((r) => r.childrenAges?.join(",") ?? "").join("|"),
     analyticsRateCode: rooms
       .map((r) => getRate(r.rateDefinition.cancellationRule))
       .join("|"),
@@ -127,7 +127,7 @@ export function getTracking(
             .map((cbp) =>
               Array(cbp.quantity).fill(invertedBedTypeMap[cbp.bedType])
             )
-            .join(",") ?? "-"
+            .join(",") ?? ""
       )
       .join("|"),
     country: hotel?.address.country,
@@ -156,7 +156,7 @@ export function getTracking(
     rewardNightAvailability: booking.roomPoints > 0 ? "true" : "false",
     points: booking.roomPoints > 0 ? booking.roomPoints : undefined,
     roomPrice: rooms.reduce((total, room) => total + room.roomPrice, 0),
-    roomTypeCode: rooms.map((r) => r.roomTypeCode ?? "-").join(","),
+    roomTypeCode: rooms.map((r) => r.roomTypeCode ?? "").join(","),
     searchType: "hotel",
     specialRoomType: rooms
       .map((room) => getSpecialRoomType(room.packages))

apps/scandic-web/components/HotelReservation/EnterDetails/Tracking/tracking.ts

@@ -46,9 +46,9 @@ export function getTracking(
     ? undefined
     : storedRooms
         .map((r) => {
-          if (r.room.breakfast === undefined) return "-"
+          if (r.room.breakfast === undefined) return ""
           if (!r.room.breakfast) return "no breakfast"
-          return r.room.breakfast.description
+          return "breakfast buffet"
         })
         .join("|")
 
@@ -63,14 +63,12 @@ export function getTracking(
   }
   const hotelsTrackingData: TrackingSDKHotelInfo = {
     ageOfChildren: booking.rooms
-      .map(
+      .map((room) => room.childrenInRoom?.map((kid) => kid.age).join(",") ?? "")
-        (room) => room.childrenInRoom?.map((kid) => kid.age).join(",") ?? "-"
-      )
       .join("|"),
     analyticsRateCode: rooms.map((room) => room.rate).join("|"),
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     bedType: storedRooms
-      .map((r) => (r.room.bedType ? r.room.bedType.description : "-"))
+      .map((r) => (r.room.bedType ? r.room.bedType.description : ""))
       .join("|"),
     // Comma separated booking code values in "code,code,n/a" format for multiroom and "code" or "n/a" for singleroom
     // n/a is used whenever code is Not applicable as defined by Tracking team
@@ -90,7 +88,7 @@ export function getTracking(
         (room) =>
           room.childrenInRoom
             ?.map((kid) => ChildBedMapEnum[kid.bed])
-            .join(",") ?? "-"
+            .join(",") ?? ""
       )
       .join("|"),
     country: hotel?.address.country,
@@ -149,7 +147,7 @@ export function getTracking(
         } else if ("voucher" in room.roomRate) {
           return room.roomRate.voucher.rateCode
         }
-        return "-"
+        return ""
       })
       .join("|"),
 

apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/tracking.ts

@@ -44,7 +44,7 @@ export function getTracking(
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
     ageOfChildren: childrenInRoom
-      ?.map((c) => c?.map((k) => k.age).join(",") ?? "-")
+      ?.map((c) => c?.map((k) => k.age).join(",") ?? "")
       .join("|"),
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     availableResults: hotelsResult,
@@ -52,7 +52,7 @@ export function getTracking(
     bookingCodeAvailability: isBookingCodeRateAvailable ? "true" : "false",
     bookingTypeofDay: isWeekend(arrivalDate) ? "weekend" : "weekday",
     childBedPreference: childrenInRoom
-      ?.map((c) => c?.map((k) => ChildBedMapEnum[k.bed]).join(",") ?? "-")
+      ?.map((c) => c?.map((k) => ChildBedMapEnum[k.bed]).join(",") ?? "")
       .join("|"),
     country,
     departureDate: format(departureDate, "yyyy-MM-dd"),

apps/scandic-web/components/HotelReservation/SelectHotel/tracking.ts

@@ -43,13 +43,13 @@ export function getTracking(
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
     ageOfChildren: childrenInRoom
-      ?.map((c) => c?.map((k) => k.age).join(",") ?? "-")
+      ?.map((c) => c?.map((k) => k.age).join(",") ?? "")
       .join("|"),
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     availableResults: hotelsResult,
     bookingTypeofDay: isWeekend(arrivalDate) ? "weekend" : "weekday",
     childBedPreference: childrenInRoom
-      ?.map((c) => c?.map((k) => ChildBedMapEnum[k.bed]).join(",") ?? "-")
+      ?.map((c) => c?.map((k) => ChildBedMapEnum[k.bed]).join(",") ?? "")
       .join("|"),
     country,
     departureDate: format(departureDate, "yyyy-MM-dd"),

apps/scandic-web/components/HotelReservation/SelectRate/tracking.ts

@@ -36,12 +36,12 @@ export function getTracking(
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
     ageOfChildren: childrenInRoom
-      ?.map((c) => c?.map((k) => k.age).join(",") ?? "none")
+      ?.map((c) => c?.map((k) => k.age).join(",") ?? "")
       .join("|"),
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     bookingTypeofDay: isWeekend(arrivalDate) ? "weekend" : "weekday",
     childBedPreference: childrenInRoom
-      ?.map((c) => c?.map((k) => ChildBedMapEnum[k.bed]).join(",") ?? "-")
+      ?.map((c) => c?.map((k) => ChildBedMapEnum[k.bed]).join(",") ?? "")
       .join("|"),
     country,
     departureDate: format(departureDate, "yyyy-MM-dd"),

apps/scandic-web/utils/specialRoomType.ts

@@ -15,6 +15,6 @@ export function getSpecialRoomType(
   } else if (packageCodes?.includes(RoomPackageCodeEnum.PET_ROOM)) {
     return "pet room"
   } else {
-    return "-"
+    return ""
   }
 }