feat(697): Made new fields optional

components/HotelReservation/EnterDetails/Breakfast/index.tsx

@@ -78,8 +78,8 @@ export default function Breakfast({ packages }: BreakfastProps) {
                 ? intl.formatMessage<React.ReactNode>(
                     { id: "breakfast.price.free" },
                     {
-                      amount: pkg.localPrice.price,
-                      currency: pkg.localPrice.currency,
+                      amount: pkg.localPrice?.price,
+                      currency: pkg.localPrice?.currency,
                       free: (str) => <Highlight>{str}</Highlight>,
                       strikethrough: (str) => <s>{str}</s>,
                     }
@@ -87,8 +87,8 @@ export default function Breakfast({ packages }: BreakfastProps) {
                 : intl.formatMessage(
                     { id: "breakfast.price" },
                     {
-                      amount: pkg.localPrice.price,
-                      currency: pkg.localPrice.currency,
+                      amount: pkg.localPrice?.price,
+                      currency: pkg.localPrice?.currency,
                     }
                   )
             }

components/HotelReservation/EnterDetails/Summary/index.tsx

@@ -150,8 +150,8 @@ export default function Summary({
                 {intl.formatMessage(
                   { id: "{amount} {currency}" },
                   {
-                    amount: chosenBreakfast.localPrice.price,
-                    currency: chosenBreakfast.localPrice.currency,
+                    amount: chosenBreakfast.localPrice?.price,
+                    currency: chosenBreakfast.localPrice?.currency,
                   }
                 )}
               </Caption>

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/index.tsx

@@ -1,4 +1,5 @@
 import { differenceInCalendarDays } from "date-fns"
+import { useSearchParams } from "next/navigation"
 import { useIntl } from "react-intl"
 
 import Body from "@/components/TempDesignSystem/Text/Body"
@@ -27,8 +28,7 @@ export default function PriceList({
   const petRoomRequestedPrice = petRoomPackage?.requestedPrice
 
   const showRequestedPrice = publicRequestedPrice && memberRequestedPrice
-
-  const searchParams = new URLSearchParams(window.location.search)
+  const searchParams = useSearchParams()
   const fromDate = searchParams.get("fromDate")
   const toDate = searchParams.get("toDate")
 

components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx

@@ -36,8 +36,8 @@ export default function RateSummary({
     (pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM
   )
 
-  const petRoomPrice = petRoomPackage?.localPrice.totalPrice ?? null
-  const petRoomCurrency = petRoomPackage?.localPrice.currency ?? null
+  const petRoomPrice = petRoomPackage?.localPrice?.totalPrice ?? null
+  const petRoomCurrency = petRoomPackage?.localPrice?.currency ?? null
 
   const checkInDate = new Date(roomsAvailability.checkInDate)
   const checkOutDate = new Date(roomsAvailability.checkOutDate)

server/routers/hotels/output.ts

@@ -774,11 +774,13 @@ export const apiLocationsSchema = z.object({
     ),
 })
 
-const breakfastPackagePriceSchema = z.object({
-  currency: z.nativeEnum(CurrencyEnum),
-  price: z.string(),
-  totalPrice: z.string(),
-})
+const breakfastPackagePriceSchema = z
+  .object({
+    currency: z.nativeEnum(CurrencyEnum),
+    price: z.string(),
+    totalPrice: z.string(),
+  })
+  .optional() // TODO: Remove optional when the API change has been deployed
 
 export const breakfastPackageSchema = z.object({
   code: z.string(),

server/routers/hotels/query.ts

@@ -1095,8 +1095,11 @@ export const hotelQueryRouter = router({
               const freeBreakfastPackage = breakfastPackages.data.find(
                 (pkg) => pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
               )
-              if (freeBreakfastPackage) {
-                if (originalBreakfastPackage) {
+              if (freeBreakfastPackage && freeBreakfastPackage.localPrice) {
+                if (
+                  originalBreakfastPackage &&
+                  originalBreakfastPackage.localPrice
+                ) {
                   freeBreakfastPackage.localPrice.price =
                     originalBreakfastPackage.localPrice.price
                 }

server/routers/hotels/schemas/packages.ts

@@ -11,11 +11,13 @@ export const getRoomPackagesInputSchema = z.object({
   packageCodes: z.array(z.string()).optional().default([]),
 })
 
-export const packagePriceSchema = z.object({
-  currency: z.string(),
-  price: z.string(),
-  totalPrice: z.string(),
-})
+export const packagePriceSchema = z
+  .object({
+    currency: z.string(),
+    price: z.string(),
+    totalPrice: z.string(),
+  })
+  .optional() // TODO: Remove optional when the API change has been deployed
 
 export const packagesSchema = z.object({
   code: z.nativeEnum(RoomPackageCodeEnum),