Merged in feat/SW-717-multiroom-select-hotel-api (pull request #1225)

Feat/SW-717 multiroom select hotel api

components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx

@@ -10,13 +10,14 @@ import { safeTry } from "@/utils/safeTry"
 import { isValidSession } from "@/utils/session"
 
 import { generateChildrenString } from "../../utils"
+import { combineRoomAvailabilities } from "../utils"
 import Rooms from "."
 
 import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
 import type { RoomsContainerProps } from "@/types/components/hotelReservation/selectRate/roomsContainer"
 
 export async function RoomsContainer({
-  adultCount,
+  adultArray,
   childArray,
   fromDate,
   hotelId,
@@ -42,7 +43,7 @@ export async function RoomsContainer({
       hotelId: hotelId.toString(),
       startDate: fromDateString,
       endDate: toDateString,
-      adults: adultCount,
+      adults: adultArray[0],
       children: childArray ? childArray.length : undefined,
       packageCodes: [
         RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
@@ -52,35 +53,35 @@ export async function RoomsContainer({
     })
   )
 
-  const roomsAvailabilityPromise = safeTry(
-    getRoomsAvailability({
-      hotelId: hotelId,
-      roomStayStartDate: fromDateString,
-      roomStayEndDate: toDateString,
-      adults: adultCount,
-      children:
-        childArray && childArray.length > 0
-          ? generateChildrenString(childArray)
-          : undefined,
-    })
-  )
+  const uniqueAdultCounts = [...new Set(adultArray)]
+  const roomsAvailabilityPromises = uniqueAdultCounts.map((adultCount) => {
+    return safeTry(
+      getRoomsAvailability({
+        hotelId: hotelId,
+        roomStayStartDate: fromDateString,
+        roomStayEndDate: toDateString,
+        adults: adultCount,
+        children:
+          childArray && childArray.length > 0
+            ? generateChildrenString(childArray)
+            : undefined,
+      })
+    )
+  })
 
   const [hotelData, hotelDataError] = await hotelDataPromise
   const [packages, packagesError] = await packagesPromise
-  const [roomsAvailability, roomsAvailabilityError] =
-    await roomsAvailabilityPromise
+  const roomsAvailabilityResults = await Promise.all(roomsAvailabilityPromises)
+
+  const roomsAvailability = combineRoomAvailabilities({
+    availabilityResults: roomsAvailabilityResults,
+  })
 
   if (packagesError) {
     // TODO: Log packages error
     console.error("[RoomsContainer] unable to fetch packages")
   }
 
-  if (roomsAvailabilityError) {
-    // TODO: show proper error component
-    console.error("[RoomsContainer] unable to fetch room availability")
-    return null
-  }
-
   if (!roomsAvailability) {
     // HotelInfoCard has the logic for displaying when there are no rooms available
     return null

components/HotelReservation/SelectRate/Rooms/utils.ts

@@ -1,3 +1,4 @@
+import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
 import type { RoomConfiguration } from "@/types/trpc/routers/hotel/roomAvailability"
 
 /**
@@ -7,12 +8,17 @@ import type { RoomConfiguration } from "@/types/trpc/routers/hotel/roomAvailabil
 export function filterDuplicateRoomTypesByLowestPrice(
   roomConfigurations: RoomConfiguration[]
 ): RoomConfiguration[] {
-  const roomTypeCount = roomConfigurations.reduce(
-    (acc, room) => {
-      acc[room.roomType] = (acc[room.roomType] || 0) + 1
-      return acc
+  const roomTypeCount = roomConfigurations.reduce<Record<string, number>>(
+    (roomTypeTally, currentRoom) => {
+      const currentRoomType = currentRoom.roomType
+      const currentCount = roomTypeTally[currentRoomType] || 0
+
+      return {
+        ...roomTypeTally,
+        [currentRoomType]: currentCount + 1,
+      }
     },
-    {} as Record<string, number>
+    {}
   )
 
   const duplicateRoomTypes = new Set(
@@ -22,83 +28,105 @@ export function filterDuplicateRoomTypesByLowestPrice(
   const roomMap = new Map()
 
   roomConfigurations.forEach((room) => {
-    const { roomType, products } = room
+    const { roomType, products, status } = room
 
     if (!duplicateRoomTypes.has(roomType)) {
       roomMap.set(roomType, room)
       return
     }
 
-    products.forEach((product) => {
-      const { productType } = product
-      const publicProduct = productType.public || {
-        requestedPrice: null,
-        localPrice: null,
-      }
-      const memberProduct = productType.member || {
-        requestedPrice: null,
-        localPrice: null,
-      }
+    const previousRoom = roomMap.get(roomType)
 
-      const {
-        requestedPrice: publicRequestedPrice,
-        localPrice: publicLocalPrice,
-      } = publicProduct
-      const {
-        requestedPrice: memberRequestedPrice,
-        localPrice: memberLocalPrice,
-      } = memberProduct
+    // Prioritize 'Available' status
+    if (
+      status === AvailabilityEnum.Available &&
+      previousRoom?.status === AvailabilityEnum.NotAvailable
+    ) {
+      roomMap.set(roomType, room)
+      return
+    }
 
-      const previousLowest = roomMap.get(roomType)
+    if (
+      status === AvailabilityEnum.NotAvailable &&
+      previousRoom?.status === AvailabilityEnum.Available
+    ) {
+      return
+    }
 
-      const currentRequestedPrice = Math.min(
-        Number(publicRequestedPrice?.pricePerNight) ?? Infinity,
-        Number(memberRequestedPrice?.pricePerNight) ?? Infinity
-      )
-      const currentLocalPrice = Math.min(
-        Number(publicLocalPrice?.pricePerNight) ?? Infinity,
-        Number(memberLocalPrice?.pricePerNight) ?? Infinity
-      )
+    if (previousRoom) {
+      products.forEach((product) => {
+        const { productType } = product
+        const publicProduct = productType.public || {
+          requestedPrice: null,
+          localPrice: null,
+        }
+        const memberProduct = productType.member || {
+          requestedPrice: null,
+          localPrice: null,
+        }
 
-      if (
-        !previousLowest ||
-        currentRequestedPrice <
-          Math.min(
-            Number(
-              previousLowest.products[0].productType.public.requestedPrice
-                ?.pricePerNight
-            ) ?? Infinity,
-            Number(
-              previousLowest.products[0].productType.member?.requestedPrice
-                ?.pricePerNight
-            ) ?? Infinity
-          ) ||
-        (currentRequestedPrice ===
-          Math.min(
-            Number(
-              previousLowest.products[0].productType.public.requestedPrice
-                ?.pricePerNight
-            ) ?? Infinity,
-            Number(
-              previousLowest.products[0].productType.member?.requestedPrice
-                ?.pricePerNight
-            ) ?? Infinity
-          ) &&
-          currentLocalPrice <
+        const {
+          requestedPrice: publicRequestedPrice,
+          localPrice: publicLocalPrice,
+        } = publicProduct
+        const {
+          requestedPrice: memberRequestedPrice,
+          localPrice: memberLocalPrice,
+        } = memberProduct
+
+        const previousLowest = roomMap.get(roomType)
+
+        const currentRequestedPrice = Math.min(
+          Number(publicRequestedPrice?.pricePerNight) ?? Infinity,
+          Number(memberRequestedPrice?.pricePerNight) ?? Infinity
+        )
+        const currentLocalPrice = Math.min(
+          Number(publicLocalPrice?.pricePerNight) ?? Infinity,
+          Number(memberLocalPrice?.pricePerNight) ?? Infinity
+        )
+
+        if (
+          !previousLowest ||
+          currentRequestedPrice <
             Math.min(
               Number(
-                previousLowest.products[0].productType.public.localPrice
+                previousLowest.products[0].productType.public.requestedPrice
                   ?.pricePerNight
               ) ?? Infinity,
               Number(
-                previousLowest.products[0].productType.member?.localPrice
+                previousLowest.products[0].productType.member?.requestedPrice
                   ?.pricePerNight
               ) ?? Infinity
-            ))
-      ) {
-        roomMap.set(roomType, room)
-      }
-    })
+            ) ||
+          (currentRequestedPrice ===
+            Math.min(
+              Number(
+                previousLowest.products[0].productType.public.requestedPrice
+                  ?.pricePerNight
+              ) ?? Infinity,
+              Number(
+                previousLowest.products[0].productType.member?.requestedPrice
+                  ?.pricePerNight
+              ) ?? Infinity
+            ) &&
+            currentLocalPrice <
+              Math.min(
+                Number(
+                  previousLowest.products[0].productType.public.localPrice
+                    ?.pricePerNight
+                ) ?? Infinity,
+                Number(
+                  previousLowest.products[0].productType.member?.localPrice
+                    ?.pricePerNight
+                ) ?? Infinity
+              ))
+        ) {
+          roomMap.set(roomType, room)
+        }
+      })
+    } else {
+      roomMap.set(roomType, room)
+    }
   })
 
   return Array.from(roomMap.values())