feat: bedtypes is selectable again

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/RateSummary/MobileSummary/index.tsx

@@ -27,21 +27,14 @@ export default function MobileSummary({
   const scrollY = useRef(0)
   const [isSummaryOpen, setIsSummaryOpen] = useState(false)
 
-  const {
-    booking,
-    bookingRooms,
-    roomsAvailability,
-    rateSummary,
-    vat,
-    packages,
-  } = useRatesStore((state) => ({
-    booking: state.booking,
-    bookingRooms: state.booking.rooms,
-    roomsAvailability: state.roomsAvailability,
-    rateSummary: state.rateSummary,
-    vat: state.vat,
-    packages: state.packages,
-  }))
+  const { booking, bookingRooms, roomsAvailability, rateSummary, vat } =
+    useRatesStore((state) => ({
+      booking: state.booking,
+      bookingRooms: state.booking.rooms,
+      roomsAvailability: state.roomsAvailability,
+      rateSummary: state.rateSummary,
+      vat: state.vat,
+    }))
 
   function toggleSummaryOpen() {
     setIsSummaryOpen(!isSummaryOpen)
@@ -78,7 +71,7 @@ export default function MobileSummary({
   }
 
   const rooms = rateSummary.map((room, index) =>
-    room ? mapRate(room, index, bookingRooms, packages) : null
+    room ? mapRate(room, index, bookingRooms, room.packages) : null
   )
 
   const containsBookingCodeRate = rateSummary.find(

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/RateSummary/MobileSummary/mapRate.ts

@@ -11,10 +11,6 @@ export function mapRate(
   bookingRooms: Room[],
   packages: NonNullable<Packages>
 ) {
-  const roomPackages = room.packages
-    .map((code) => packages.find((pkg) => pkg.code === code))
-    .filter((pkg): pkg is NonNullable<typeof pkg> => Boolean(pkg))
-
   const rate = {
     adults: bookingRooms[index].adults,
     cancellationText: room.product.rateDefinition?.cancellationText ?? "",
@@ -39,7 +35,7 @@ export function mapRate(
     },
     roomRate: room.product,
     roomType: room.roomType,
-    packages: roomPackages,
+    packages,
   }
 
   if ("corporateCheque" in room.product) {

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/RateSummary/index.tsx

@@ -30,7 +30,7 @@ export default function RateSummary({ isUserLoggedIn }: RateSummaryProps) {
     bookingCode,
     bookingRooms,
     dates,
-    petRoomPackage,
+    isFetchingPackages,
     rateSummary,
     roomsAvailability,
     searchParams,
@@ -41,7 +41,7 @@ export default function RateSummary({ isUserLoggedIn }: RateSummaryProps) {
       checkInDate: state.booking.fromDate,
       checkOutDate: state.booking.toDate,
     },
-    petRoomPackage: state.petRoomPackage,
+    isFetchingPackages: state.rooms.some((room) => room.isFetchingPackages),
     rateSummary: state.rateSummary,
     roomsAvailability: state.roomsAvailability,
     searchParams: state.searchParams,
@@ -123,7 +123,7 @@ export default function RateSummary({ isUserLoggedIn }: RateSummaryProps) {
     })
   }
 
-  if (!rateSummary.length) {
+  if (!rateSummary.length || isFetchingPackages) {
     return null
   }
 
@@ -149,8 +149,7 @@ export default function RateSummary({ isUserLoggedIn }: RateSummaryProps) {
   const totalPriceToShow = getTotalPrice(
     mainRoomProduct,
     rateSummary,
-    isUserLoggedIn,
-    petRoomPackage
+    isUserLoggedIn
   )
 
   const rateProduct = rateSummary.find((rate) => rate?.product)?.product
@@ -248,7 +247,7 @@ export default function RateSummary({ isUserLoggedIn }: RateSummaryProps) {
                         return total
                       }
 
-                      const { features, packages: roomPackages, product } = rate
+                      const { packages: roomPackages, product } = rate
 
                       const memberExists = "member" in product && product.member
                       const publicExists = "public" in product && product.public
@@ -266,21 +265,15 @@ export default function RateSummary({ isUserLoggedIn }: RateSummaryProps) {
                         return total
                       }
 
-                      const hasSelectedPetRoom = roomPackages.includes(
-                        RoomPackageCodeEnum.PET_ROOM
+                      const hasSelectedPetRoom = roomPackages.find(
+                        (pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM
                       )
                       if (!hasSelectedPetRoom) {
                         return total + price
                       }
-                      const isPetRoom = features.find(
-                        (feature) =>
-                          feature.code === RoomPackageCodeEnum.PET_ROOM
+                      return (
+                        total + price + hasSelectedPetRoom.localPrice.totalPrice
                       )
-                      const petRoomPrice =
-                        isPetRoom && petRoomPackage
-                          ? Number(petRoomPackage.localPrice.totalPrice)
-                          : 0
-                      return total + price + petRoomPrice
                     }, 0),
                     currency: mainRoomCurrency,
                   }}

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/RateSummary/utils.ts

@@ -1,17 +1,11 @@
 import type { Price } from "@/types/components/hotelReservation/price"
-import {
-  type RoomPackage,
-  RoomPackageCodeEnum,
-} from "@/types/components/hotelReservation/selectRate/roomFilter"
 import type { Rate } from "@/types/components/hotelReservation/selectRate/selectRate"
 import { CurrencyEnum } from "@/types/enums/currency"
-import type { Packages } from "@/types/requests/packages"
 import type { RedemptionProduct } from "@/types/trpc/routers/hotel/roomAvailability"
 
 export function calculateTotalPrice(
   selectedRateSummary: Rate[],
-  isUserLoggedIn: boolean,
-  petRoomPackage: RoomPackage | undefined
+  isUserLoggedIn: boolean
 ) {
   return selectedRateSummary.reduce<Price>(
     (total, room, idx) => {
@@ -32,35 +26,26 @@ export function calculateTotalPrice(
         return total
       }
 
-      const isPetRoom = room.features.find(
-        (feature) => feature.code === RoomPackageCodeEnum.PET_ROOM
+      const packagesPrice = room.packages.reduce(
+        (total, pkg) => {
+          total.local = total.local + pkg.localPrice.totalPrice
+          if (pkg.requestedPrice.totalPrice) {
+            total.requested = total.requested + pkg.requestedPrice.totalPrice
+          }
+          return total
+        },
+        { local: 0, requested: 0 }
       )
-      let petRoomPriceLocal = 0
-      if (
-        petRoomPackage &&
-        isPetRoom &&
-        room.packages.includes(RoomPackageCodeEnum.PET_ROOM)
-      ) {
-        petRoomPriceLocal = Number(petRoomPackage.localPrice.totalPrice)
-      }
-      let petRoomPriceRequested = 0
-      if (
-        petRoomPackage &&
-        isPetRoom &&
-        room.packages.includes(RoomPackageCodeEnum.PET_ROOM)
-      ) {
-        petRoomPriceRequested = Number(petRoomPackage.requestedPrice.totalPrice)
-      }
 
       total.local.currency = rate.localPrice.currency
       total.local.price =
-        total.local.price + rate.localPrice.pricePerStay + petRoomPriceLocal
+        total.local.price + rate.localPrice.pricePerStay + packagesPrice.local
 
       if (rate.localPrice.regularPricePerStay) {
         total.local.regularPrice =
           (total.local.regularPrice || 0) +
           rate.localPrice.regularPricePerStay +
-          petRoomPriceLocal
+          packagesPrice.local
       }
 
       if (rate.requestedPrice) {
@@ -78,13 +63,13 @@ export function calculateTotalPrice(
         total.requested.price =
           total.requested.price +
           rate.requestedPrice.pricePerStay +
-          petRoomPriceRequested
+          packagesPrice.requested
 
         if (rate.requestedPrice.regularPricePerStay) {
           total.requested.regularPrice =
             (total.requested.regularPrice || 0) +
             rate.requestedPrice.regularPricePerStay +
-            petRoomPriceRequested
+            packagesPrice.requested
         }
       }
 
@@ -199,8 +184,7 @@ export function calculateCorporateChequePrice(selectedRateSummary: Rate[]) {
 export function getTotalPrice(
   mainRoomProduct: Rate | null,
   rateSummary: Array<Rate | null>,
-  isUserLoggedIn: boolean,
-  petRoomPackage: NonNullable<Packages>[number] | undefined
+  isUserLoggedIn: boolean
 ): Price | null {
   const summaryArray = rateSummary.filter((rate): rate is Rate => rate !== null)
 
@@ -209,7 +193,7 @@ export function getTotalPrice(
   }
 
   if (!mainRoomProduct) {
-    return calculateTotalPrice(summaryArray, isUserLoggedIn, petRoomPackage)
+    return calculateTotalPrice(summaryArray, isUserLoggedIn)
   }
 
   const { product } = mainRoomProduct
@@ -222,5 +206,5 @@ export function getTotalPrice(
     return calculateVoucherPrice(summaryArray)
   }
 
-  return calculateTotalPrice(summaryArray, isUserLoggedIn, petRoomPackage)
+  return calculateTotalPrice(summaryArray, isUserLoggedIn)
 }