Merged in feat/SW-1557-implement-booking-code-select (pull request #1304)

feat: SW-1577 Implemented booking code city search

* feat: SW-1577 Implemented booking code city search

* feat: SW-1557 Strict comparison

* feat: SW-1557 Review comments fix


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij

components/HotelReservation/HotelCardListing/index.tsx

@@ -4,6 +4,7 @@ import { useSession } from "next-auth/react"
 import { useEffect, useMemo } from "react"
 import { useIntl } from "react-intl"
 
+import { useBookingCodeFilterStore } from "@/stores/bookingCode-filter"
 import { useHotelFilterStore } from "@/stores/hotel-filters"
 import { useHotelsMapStore } from "@/stores/hotels-map"
 
@@ -36,27 +37,40 @@ export default function HotelCardListing({
   const { activeHotelCard } = useHotelsMapStore()
   const { showBackToTop, scrollToTop } = useScrollToTop({ threshold: 490 })
 
-  const sortBy = useMemo(
-    () => searchParams.get("sort") ?? DEFAULT_SORT,
-    [searchParams]
+  const sortBy = searchParams.get("sort") ?? DEFAULT_SORT
+
+  const bookingCode = searchParams.get("bookingCode")
+  const activeCodeFilter = useBookingCodeFilterStore(
+    (state) => state.activeCodeFilter
   )
 
   const sortedHotels = useMemo(() => {
     if (!hotelData) return []
-    return getSortedHotels({ hotels: hotelData, sortBy })
-  }, [hotelData, sortBy])
+    return getSortedHotels({ hotels: hotelData, sortBy, bookingCode })
+  }, [hotelData, sortBy, bookingCode])
 
   const hotels = useMemo(() => {
-    if (activeFilters.length === 0) return sortedHotels
+    const updatedHotelsList = bookingCode
+      ? sortedHotels.filter(
+          (hotel) =>
+            !hotel.price ||
+            activeCodeFilter === "all" ||
+            (activeCodeFilter === "discounted" &&
+              hotel.price?.public?.rateType?.toLowerCase() !== "regular") ||
+            activeCodeFilter === hotel.price?.public?.rateType?.toLowerCase()
+        )
+      : sortedHotels
 
-    return sortedHotels.filter((hotel) =>
+    if (activeFilters.length === 0) return updatedHotelsList
+
+    return updatedHotelsList.filter((hotel) =>
       activeFilters.every((appliedFilterId) =>
         hotel.hotelData.detailedFacilities.some(
           (facility) => facility.id.toString() === appliedFilterId
         )
       )
     )
-  }, [activeFilters, sortedHotels])
+  }, [activeFilters, sortedHotels, bookingCode, activeCodeFilter])
 
   useEffect(() => {
     setResultCount(hotels?.length ?? 0)
@@ -79,6 +93,7 @@ export default function HotelCardListing({
                 hotel.hotelData.name === activeHotelCard ? "active" : "default"
               }
               type={type}
+              bookingCode={bookingCode}
             />
           </div>
         ))

components/HotelReservation/HotelCardListing/utils.ts

@@ -4,14 +4,18 @@ import { SortOrder } from "@/types/components/hotelReservation/selectHotel/hotel
 export function getSortedHotels({
   hotels,
   sortBy,
+  bookingCode,
 }: {
   hotels: HotelData[]
   sortBy: string
+  bookingCode: string | null
 }) {
   const getPricePerNight = (hotel: HotelData): number =>
     hotel.price?.member?.localPrice?.pricePerNight ??
     hotel.price?.public?.localPrice?.pricePerNight ??
     Infinity
+  const availableHotels = hotels.filter((hotel) => !!hotel?.price)
+  const unAvailableHotels = hotels.filter((hotel) => !hotel?.price)
 
   const sortingStrategies: Record<
     string,
@@ -29,7 +33,27 @@ export function getSortedHotels({
       b.hotelData.location.distanceToCentre,
   }
 
-  return [...hotels].sort(
+  const sortStrategy =
     sortingStrategies[sortBy] ?? sortingStrategies[SortOrder.Distance]
-  )
+
+  if (bookingCode) {
+    const bookingCodeHotels = hotels.filter(
+      (hotel) =>
+        (hotel?.price?.public?.rateType?.toLowerCase() !== "regular" ||
+          hotel?.price?.member?.rateType?.toLowerCase() !== "regular") &&
+        !!hotel?.price
+    )
+    const regularHotels = hotels.filter(
+      (hotel) => hotel?.price?.public?.rateType?.toLowerCase() === "regular"
+    )
+
+    return [...bookingCodeHotels]
+      .sort(sortStrategy)
+      .concat([...regularHotels].sort(sortStrategy))
+      .concat([...unAvailableHotels].sort(sortStrategy))
+  }
+
+  return [...availableHotels]
+    .sort(sortStrategy)
+    .concat([...unAvailableHotels].sort(sortStrategy))
 }