fix: clean up hotel and its typings

2024-12-17 16:17:25 +01:00
parent ec74af8814
commit 13a164242f
110 changed files with 1931 additions and 1559 deletions
@@ -1,6 +1,6 @@
 import { Suspense } from "react"

-import { getHotelData } from "@/lib/trpc/memoizedRequests"
+import { getHotel } from "@/lib/trpc/memoizedRequests"

 import { mapFacilityToIcon } from "@/components/ContentType/HotelPage/data"
 import ImageGallery from "@/components/ImageGallery"
@@ -18,55 +18,44 @@ import { NoRoomsAlert } from "./NoRoomsAlert"

 import styles from "./hotelInfoCard.module.css"

-import type { Child } from "@/types/components/hotelReservation/selectRate/selectRate"
-import type { Lang } from "@/constants/languages"
-
-type Props = {
-  hotelId: number
-  lang: Lang
-  fromDate: Date
-  toDate: Date
-  adultCount: number
-  childArray?: Child[]
-}
+import type { HotelInfoCardProps } from "@/types/components/hotelReservation/selectRate/hotelInfoCard"

 export default async function HotelInfoCard({
  hotelId,
  lang,
  ...props
-}: Props) {
-  const hotelData = await getHotelData({
+}: HotelInfoCardProps) {
+  const hotelData = await getHotel({
    hotelId: hotelId.toString(),
+    isCardOnlyPayment: false,
    language: lang,
  })

-  const hotelAttributes = hotelData?.data.attributes
+  const hotel = hotelData?.hotel
  const intl = await getIntl()

-  const sortedFacilities = hotelAttributes?.detailedFacilities
+  const sortedFacilities = hotel?.detailedFacilities
    .sort((a, b) => b.sortOrder - a.sortOrder)
    .slice(0, 5)

  return (
    <article className={styles.container}>
-      {hotelAttributes && (
+      {hotel && (
        <section className={styles.wrapper}>
          <div className={styles.imageWrapper}>
            <ImageGallery
-              title={hotelAttributes.name}
-              images={hotelAttributes.galleryImages}
+              title={hotel.name}
+              images={hotel.galleryImages}
              fill
            />
-            {hotelAttributes.ratings?.tripAdvisor && (
-              <TripAdvisorChip
-                rating={hotelAttributes.ratings.tripAdvisor.rating}
-              />
+            {hotel.ratings?.tripAdvisor && (
+              <TripAdvisorChip rating={hotel.ratings.tripAdvisor.rating} />
            )}
          </div>
          <div className={styles.hotelContent}>
            <div className={styles.hotelInformation}>
              <Title as="h2" textTransform="uppercase">
-                {hotelAttributes.name}
+                {hotel.name}
              </Title>
              <div className={styles.hotelAddressDescription}>
                <Caption color="uiTextMediumContrast">
@@ -75,16 +64,16 @@ export default async function HotelInfoCard({
                      id: "{address}, {city} ∙ {distanceToCityCenterInKm} km to city center",
                    },
                    {
-                      address: hotelAttributes.address.streetAddress,
-                      city: hotelAttributes.address.city,
-                      distanceToCityCenterInKm: getSingleDecimal(
-                        hotelAttributes.location.distanceToCentre / 1000
+                      address: hotel.address.streetAddress,
+                      city: hotel.address.city,
+                      distanceToCityCentreInKm: getSingleDecimal(
+                        hotel.location.distanceToCentre / 1000
                      ),
                    }
                  )}
                </Caption>
                <Body color="uiTextHighContrast">
-                  {hotelAttributes.hotelContent.texts.descriptions.medium}
+                  {hotel.hotelContent.texts.descriptions.medium}
                </Body>
              </div>
            </div>
@@ -111,15 +100,15 @@ export default async function HotelInfoCard({
              </div>
              <ReadMore
                label={intl.formatMessage({ id: "Show all amenities" })}
-                hotelId={hotelAttributes.operaId}
-                hotel={hotelAttributes}
+                hotelId={hotel.operaId}
+                hotel={hotel}
                showCTA={false}
              />
            </div>
          </div>
        </section>
      )}
-      {hotelAttributes?.specialAlerts.map((alert) => {
+      {hotel?.specialAlerts.map((alert) => {
        return (
          <div className={styles.hotelAlert} key={`wrapper_${alert.id}`}>
            <Alert
@@ -22,7 +22,7 @@ import styles from "./roomCard.module.css"
 import type { RoomCardProps } from "@/types/components/hotelReservation/selectRate/roomCard"
 import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
 import { HotelTypeEnum } from "@/types/enums/hotelType"
-import type { RateDefinition } from "@/server/routers/hotels/output"
+import type { RateDefinition } from "@/types/trpc/routers/hotel/roomAvailability"

 export default function RoomCard({
  hotelId,
@@ -1,6 +1,6 @@
 import { dt } from "@/lib/dt"
 import {
-  getHotelData,
+  getHotel,
  getPackages,
  getRoomsAvailability,
 } from "@/lib/trpc/memoizedRequests"
@@ -13,33 +13,28 @@ import { generateChildrenString } from "../../utils"
 import Rooms from "."

 import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
-import type { Child } from "@/types/components/hotelReservation/selectRate/selectRate"
-import type { Lang } from "@/constants/languages"
-
-export type Props = {
-  hotelId: number
-  fromDate: Date
-  toDate: Date
-  adultCount: number
-  childArray?: Child[]
-  lang: Lang
-}
+import type { RoomsContainerProps } from "@/types/components/hotelReservation/selectRate/roomsContainer"

 export async function RoomsContainer({
-  hotelId,
-  fromDate,
-  toDate,
  adultCount,
  childArray,
+  fromDate,
+  hotelId,
  lang,
-}: Props) {
+  toDate,
+}: RoomsContainerProps) {
  const session = await auth()
  const isUserLoggedIn = isValidSession(session)
+
  const fromDateString = dt(fromDate).format("YYYY-MM-DD")
  const toDateString = dt(toDate).format("YYYY-MM-DD")

  const hotelDataPromise = safeTry(
-    getHotelData({ hotelId: hotelId.toString(), language: lang })
+    getHotel({
+      hotelId: hotelId.toString(),
+      isCardOnlyPayment: false,
+      language: lang,
+    })
  )

  const packagesPromise = safeTry(
@@ -94,10 +89,10 @@ export async function RoomsContainer({
  return (
    <Rooms
      availablePackages={packages ?? []}
-      roomsAvailability={roomsAvailability}
-      roomCategories={hotelData?.included.rooms ?? []}
-      hotelType={hotelData?.data.attributes?.hotelType}
+      hotelType={hotelData?.hotel.hotelType}
      isUserLoggedIn={isUserLoggedIn}
+      roomsAvailability={roomsAvailability}
+      roomCategories={hotelData?.roomCategories ?? []}
    />
  )
 }
@@ -25,14 +25,14 @@ import {
 } from "@/types/components/hotelReservation/selectRate/roomFilter"
 import type { SelectRateProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
 import type { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
-import type { RoomConfiguration } from "@/server/routers/hotels/output"
+import type { RoomConfiguration } from "@/types/trpc/routers/hotel/roomAvailability"

 export default function Rooms({
-  roomsAvailability,
-  roomCategories = [],
  availablePackages,
  hotelType,
  isUserLoggedIn,
+  roomsAvailability,
+  roomCategories = [],
 }: SelectRateProps) {
  const router = useRouter()
  const pathname = usePathname()
@@ -1,5 +1,4 @@
-import type { RoomParam } from "@/types/components/hotelReservation/selectRate/section"
-import type { RoomConfiguration } from "@/server/routers/hotels/output"
+import type { RoomConfiguration } from "@/types/trpc/routers/hotel/roomAvailability"

 /**
 * Get the lowest priced room for each room type that appears more than once.
@@ -64,16 +63,16 @@ export function filterDuplicateRoomTypesByLowestPrice(
      if (
        !previousLowest ||
        currentRequestedPrice <
-          Math.min(
-            Number(
-              previousLowest.products[0].productType.public.requestedPrice
-                ?.pricePerNight
-            ) ?? Infinity,
-            Number(
-              previousLowest.products[0].productType.member?.requestedPrice
-                ?.pricePerNight
-            ) ?? Infinity
-          ) ||
+        Math.min(
+          Number(
+            previousLowest.products[0].productType.public.requestedPrice
+              ?.pricePerNight
+          ) ?? Infinity,
+          Number(
+            previousLowest.products[0].productType.member?.requestedPrice
+              ?.pricePerNight
+          ) ?? Infinity
+        ) ||
        (currentRequestedPrice ===
          Math.min(
            Number(
@@ -86,16 +85,16 @@ export function filterDuplicateRoomTypesByLowestPrice(
            ) ?? Infinity
          ) &&
          currentLocalPrice <
-            Math.min(
-              Number(
-                previousLowest.products[0].productType.public.localPrice
-                  ?.pricePerNight
-              ) ?? Infinity,
-              Number(
-                previousLowest.products[0].productType.member?.localPrice
-                  ?.pricePerNight
-              ) ?? Infinity
-            ))
+          Math.min(
+            Number(
+              previousLowest.products[0].productType.public.localPrice
+                ?.pricePerNight
+            ) ?? Infinity,
+            Number(
+              previousLowest.products[0].productType.member?.localPrice
+                ?.pricePerNight
+            ) ?? Infinity
+          ))
      ) {
        roomMap.set(roomType, room)
      }