Merge branch 'master' into feature/tracking

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/getValidDates.test.ts

@@ -0,0 +1,55 @@
+import { beforeAll, describe, expect, it } from "@jest/globals"
+
+import { getValidFromDate, getValidToDate } from "./getValidDates"
+
+const NOW = new Date("2020-10-01T00:00:00Z")
+let originalTz: string | undefined
+
+describe("getValidFromDate", () => {
+  beforeAll(() => {
+    jest.useFakeTimers({ now: NOW })
+  })
+
+  afterAll(() => {
+    jest.useRealTimers()
+  })
+
+  describe("getValidFromDate", () => {
+    it("returns today when empty string is provided", () => {
+      const actual = getValidFromDate("")
+      expect(actual.toISOString()).toBe("2020-10-01T00:00:00.000Z")
+    })
+
+    it("returns today when undefined is provided", () => {
+      const actual = getValidFromDate(undefined)
+      expect(actual.toISOString()).toBe("2020-10-01T00:00:00.000Z")
+    })
+
+    it("returns given date in utc", () => {
+      const actual = getValidFromDate("2024-01-01")
+      expect(actual.toISOString()).toBe("2024-01-01T00:00:00.000Z")
+    })
+  })
+
+  describe("getValidToDate", () => {
+    it("returns day after fromDate when empty string is provided", () => {
+      const actual = getValidToDate("", NOW)
+      expect(actual.toISOString()).toBe("2020-10-02T00:00:00.000Z")
+    })
+
+    it("returns day after fromDate when undefined is provided", () => {
+      const actual = getValidToDate(undefined, NOW)
+      expect(actual.toISOString()).toBe("2020-10-02T00:00:00.000Z")
+    })
+
+    it("returns given date in utc", () => {
+      const actual = getValidToDate("2024-01-01", NOW)
+      expect(actual.toISOString()).toBe("2024-01-01T00:00:00.000Z")
+    })
+
+    it("fallsback to day after fromDate when given date is before fromDate", () => {
+      const actual = getValidToDate("2020-09-30", NOW)
+      expect(actual.toISOString()).toBe("2020-10-02T00:00:00.000Z")
+    })
+  })
+})

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/getValidDates.ts

@@ -0,0 +1,55 @@
+import { Dayjs } from "dayjs"
+
+import { dt } from "@/lib/dt"
+
+/**
+ * Get valid dates from stringFromDate and stringToDate making sure that they are not in the past and chronologically correct
+ * @example const { fromDate, toDate} = getValidDates("2021-01-01", "2021-01-02")
+ */
+export function getValidDates(
+  stringFromDate: string | undefined,
+  stringToDate: string | undefined
+): { fromDate: Dayjs; toDate: Dayjs } {
+  const fromDate = getValidFromDate(stringFromDate)
+  const toDate = getValidToDate(stringToDate, fromDate)
+
+  return { fromDate, toDate }
+}
+
+/**
+ * Get valid fromDate from stringFromDate making sure that it is not in the past
+ */
+export function getValidFromDate(stringFromDate: string | undefined): Dayjs {
+  const now = dt().utc()
+  if (!stringFromDate) {
+    return now
+  }
+  const toDate = dt(stringFromDate)
+
+  const yesterday = now.subtract(1, "day")
+  if (!toDate.isAfter(yesterday)) {
+    return now
+  }
+
+  return toDate
+}
+
+/**
+ * Get valid toDate from stringToDate making sure that it is after fromDate
+ */
+export function getValidToDate(
+  stringToDate: string | undefined,
+  fromDate: Dayjs | Date
+): Dayjs {
+  const tomorrow = dt().utc().add(1, "day")
+  if (!stringToDate) {
+    return tomorrow
+  }
+
+  const toDate = dt(stringToDate)
+  if (toDate.isAfter(fromDate)) {
+    return toDate
+  }
+
+  return tomorrow
+}

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx

@@ -1,25 +1,20 @@
 import { differenceInCalendarDays, format, isWeekend } from "date-fns"
 import { notFound } from "next/navigation"
+import { Suspense } from "react"
 
 import { Lang } from "@/constants/languages"
-import { dt } from "@/lib/dt"
-import {
-  getHotelData,
-  getLocations,
-  getProfileSafely,
-} from "@/lib/trpc/memoizedRequests"
-import { serverClient } from "@/lib/trpc/server"
+import { getHotelData, getLocations } from "@/lib/trpc/memoizedRequests"
 
 import HotelInfoCard from "@/components/HotelReservation/SelectRate/HotelInfoCard"
-import Rooms from "@/components/HotelReservation/SelectRate/Rooms"
-import {
-  generateChildrenString,
-  getHotelReservationQueryParams,
-} from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
+import { RoomsContainer } from "@/components/HotelReservation/SelectRate/Rooms/RoomsContainer"
+import { RoomsContainerSkeleton } from "@/components/HotelReservation/SelectRate/Rooms/RoomsContainerSkeleton"
+import { getHotelReservationQueryParams } from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
 import TrackingSDK from "@/components/TrackingSDK"
 import { setLang } from "@/i18n/serverContext"
+import { safeTry } from "@/utils/safeTry"
+
+import { getValidDates } from "./getValidDates"
 
-import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
 import type { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
 import {
   TrackingChannelEnum,
@@ -53,58 +48,27 @@ export default async function SelectRatePage({
     return notFound()
   }
 
-  const validFromDate =
-    searchParams.fromDate &&
-    dt(searchParams.fromDate).isAfter(dt().subtract(1, "day"))
-      ? searchParams.fromDate
-      : dt().utc().format("YYYY-MM-DD")
-  const validToDate =
-    searchParams.toDate && dt(searchParams.toDate).isAfter(validFromDate)
-      ? searchParams.toDate
-      : dt().utc().add(1, "day").format("YYYY-MM-DD")
+  const { fromDate, toDate } = getValidDates(
+    searchParams.fromDate,
+    searchParams.toDate
+  )
+
   const adults = selectRoomParamsObject.room[0].adults || 1 // TODO: Handle multiple rooms
-  const childrenCount = selectRoomParamsObject.room[0].child?.length
-  const children = selectRoomParamsObject.room[0].child
-    ? generateChildrenString(selectRoomParamsObject.room[0].child)
-    : undefined // TODO: Handle multiple rooms
+  const children = selectRoomParamsObject.room[0].child // TODO: Handle multiple rooms
 
-  const [hotelData, roomsAvailability, packages, user] = await Promise.all([
-    getHotelData({ hotelId: searchParams.hotel, language: params.lang }),
-    serverClient().hotel.availability.rooms({
-      hotelId: parseInt(searchParams.hotel, 10),
-      roomStayStartDate: validFromDate,
-      roomStayEndDate: validToDate,
-      adults,
-      children,
-    }),
-    serverClient().hotel.packages.get({
-      hotelId: searchParams.hotel,
-      startDate: searchParams.fromDate,
-      endDate: searchParams.toDate,
-      adults,
-      children: childrenCount,
-      packageCodes: [
-        RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
-        RoomPackageCodeEnum.PET_ROOM,
-        RoomPackageCodeEnum.ALLERGY_ROOM,
-      ],
-    }),
-    getProfileSafely(),
-  ])
+  const [hotelData, hotelDataError] = await safeTry(
+    getHotelData({ hotelId: searchParams.hotel, language: params.lang })
+  )
 
+  if (!hotelData && !hotelDataError) {
+    return notFound()
+  }
   const arrivalDate = new Date(searchParams.fromDate)
   const departureDate = new Date(searchParams.toDate)
   const hotelAttributes = hotelData?.data.attributes
 
   const roomCategories = hotelData?.included
 
-  const noRoomsAvailable = roomsAvailability?.roomConfigurations.reduce(
-    (acc, room) => {
-      return acc && room.status === "NotAvailable"
-    },
-    true
-  )
-
   const pageTrackingData: TrackingSDKPageData = {
     pageId: "select-rate",
     domainLanguage: params.lang as Lang,
@@ -119,7 +83,7 @@ export default async function SelectRatePage({
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     departureDate: format(departureDate, "yyyy-MM-dd"),
     noOfAdults: adults,
-    noOfChildren: childrenCount,
+    noOfChildren: children?.length,
     //childBedPreference // "adults|adults|extra|adults"
     noOfRooms: 1, // // TODO: Handle multiple rooms
     duration: differenceInCalendarDays(departureDate, arrivalDate),
@@ -132,26 +96,28 @@ export default async function SelectRatePage({
     //lowestRoomPrice:
   }
 
-  if (!roomsAvailability) {
-    return "No rooms found" // TODO: Add a proper error message
-  }
-
-  if (!hotelData) {
-    return "No hotel data found" // TODO: Add a proper error message
-  }
-
+  const hotelId = +searchParams.hotel
   return (
     <>
       <HotelInfoCard
-        hotelData={hotelData}
-        noAvailability={!!noRoomsAvailable}
-      />
-      <Rooms
-        roomsAvailability={roomsAvailability}
-        roomCategories={roomCategories ?? []}
-        user={user}
-        availablePackages={packages ?? []}
+        hotelId={hotelId}
+        lang={params.lang}
+        fromDate={fromDate.toDate()}
+        toDate={toDate.toDate()}
+        adultCount={adults}
+        childArray={children ?? []}
       />
+
+      <Suspense key={hotelId} fallback={<RoomsContainerSkeleton />}>
+        <RoomsContainer
+          hotelId={hotelId}
+          lang={params.lang}
+          fromDate={fromDate.toDate()}
+          toDate={toDate.toDate()}
+          adultCount={adults}
+          childArray={children ?? []}
+        />
+      </Suspense>
       <TrackingSDK pageData={pageTrackingData} hotelInfo={hotelsTrackingData} />
     </>
   )