fix: clean up hotel and its typings

components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx

@@ -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 ?? []}
     />
   )
 }

components/HotelReservation/SelectRate/Rooms/index.tsx

@@ -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()

components/HotelReservation/SelectRate/Rooms/utils.ts

@@ -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)
       }