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
2025-02-13 09:24:47 +00:00
parent d46a85a529
commit eabe45b73c
35 changed files with 627 additions and 276 deletions
@@ -8,6 +8,7 @@ import { getCityCoordinates } from "@/lib/trpc/memoizedRequests"
 import {
  fetchAlternativeHotels,
  fetchAvailableHotels,
+  fetchBookingCodeAvailableHotels,
  getFiltersFromHotels,
 } from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
 import { getHotelSearchDetails } from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/utils"
@@ -19,10 +20,7 @@ import { getHotelPins } from "../../HotelCardDialogListing/utils"
 import SelectHotelMap from "."

 import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
-import type {
-  HotelData,
-  NullableHotelData,
-} from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
 import type { SelectHotelMapContainerProps } from "@/types/components/hotelReservation/selectHotel/map"
 import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
 import {
@@ -60,6 +58,7 @@ export async function SelectHotelMapContainer({
    childrenInRoom,
    childrenInRoomString,
    hotel: isAlternativeFor,
+    bookingCode,
  } = searchDetails

  if (!city) return notFound()
@@ -71,17 +70,29 @@ export async function SelectHotelMapContainer({
          roomStayEndDate: selectHotelParams.toDate,
          adults: adultsInRoom[0],
          children: childrenInRoomString,
+          bookingCode,
        })
      )
-    : safeTry(
-        fetchAvailableHotels({
-          cityId: city.id,
-          roomStayStartDate: selectHotelParams.fromDate,
-          roomStayEndDate: selectHotelParams.toDate,
-          adults: adultsInRoom[0],
-          children: childrenInRoomString,
-        })
-      )
+    : bookingCode
+      ? safeTry(
+          fetchBookingCodeAvailableHotels({
+            cityId: city.id,
+            roomStayStartDate: selectHotelParams.fromDate,
+            roomStayEndDate: selectHotelParams.toDate,
+            adults: adultsInRoom[0],
+            children: childrenInRoomString,
+            bookingCode,
+          })
+        )
+      : safeTry(
+          fetchAvailableHotels({
+            cityId: city.id,
+            roomStayStartDate: selectHotelParams.fromDate,
+            roomStayEndDate: selectHotelParams.toDate,
+            adults: adultsInRoom[0],
+            children: childrenInRoomString,
+          })
+        )

  const [hotels] = await fetchAvailableHotelsPromise

@@ -142,6 +153,7 @@ export async function SelectHotelMapContainer({
        hotels={validHotels}
        filterList={filterList}
        cityCoordinates={cityCoordinates}
+        bookingCode={bookingCode ?? ""}
      />
      <Suspense fallback={null}>
        <TrackingSDK
@@ -5,6 +5,7 @@ import { useIntl } from "react-intl"
 import { useMediaQuery } from "usehooks-ts"

 import { selectHotel } from "@/constants/routes/hotelReservation"
+import { useBookingCodeFilterStore } from "@/stores/bookingCode-filter"
 import { useHotelFilterStore } from "@/stores/hotel-filters"
 import { useHotelsMapStore } from "@/stores/hotels-map"

@@ -18,6 +19,7 @@ import useLang from "@/hooks/useLang"
 import { useScrollToTop } from "@/hooks/useScrollToTop"
 import { debounce } from "@/utils/debounce"

+import BookingCodeFilter from "../../BookingCodeFilter"
 import FilterAndSortModal from "../../FilterAndSortModal"
 import HotelListing from "../HotelListing"
 import { getVisibleHotels } from "./utils"
@@ -35,6 +37,7 @@ export default function SelectHotelContent({
  mapId,
  hotels,
  filterList,
+  bookingCode,
 }: Omit<SelectHotelMapProps, "apiKey">) {
  const lang = useLang()
  const intl = useIntl()
@@ -53,6 +56,9 @@ export default function SelectHotelContent({
    elementRef: listingContainerRef,
    refScrollable: true,
  })
+  const activeCodeFilter = useBookingCodeFilterStore(
+    (state) => state.activeCodeFilter
+  )

  const coordinates = useMemo(
    () =>
@@ -72,15 +78,23 @@ export default function SelectHotelContent({
    }
  }, [activeHotelCard, activeHotelPin])

-  const filteredHotelPins = useMemo(
-    () =>
-      hotelPins.filter((hotel) =>
-        activeFilters.every((filterId) =>
-          hotel.facilityIds.includes(Number(filterId))
+  const filteredHotelPins = useMemo(() => {
+    const updatedHotelsList = bookingCode
+      ? hotelPins.filter(
+          (hotel) =>
+            !hotel.publicPrice ||
+            activeCodeFilter === "all" ||
+            (activeCodeFilter === "discounted" &&
+              hotel.rateType?.toLowerCase() !== "regular") ||
+            activeCodeFilter === hotel.rateType?.toLowerCase()
        )
-      ),
-    [activeFilters, hotelPins]
-  )
+      : hotelPins
+    return updatedHotelsList.filter((hotel) =>
+      activeFilters.every((filterId) =>
+        hotel.facilityIds.includes(Number(filterId))
+      )
+    )
+  }, [activeFilters, hotelPins, bookingCode, activeCodeFilter])

  const getHotelCards = useCallback(() => {
    const visibleHotels = getVisibleHotels(hotels, filteredHotelPins, map)
@@ -143,6 +157,7 @@ export default function SelectHotelContent({
            filters={filterList}
            setShowSkeleton={setShowSkeleton}
          />
+          {bookingCode ? <BookingCodeFilter /> : null}
        </div>

        {showSkeleton ? (
@@ -13,6 +13,7 @@ export default function SelectHotelMap({
  hotels,
  filterList,
  cityCoordinates,
+  bookingCode,
 }: SelectHotelMapProps) {
  return (
    <APIProvider apiKey={apiKey}>
@@ -22,6 +23,7 @@ export default function SelectHotelMap({
        mapId={mapId}
        hotels={hotels}
        filterList={filterList}
+        bookingCode={bookingCode}
      />
    </APIProvider>
  )