From bb8f09ed8887dbd631928ef90de5a4df1b601a7c Mon Sep 17 00:00:00 2001 From: Hrishikesh Vaipurkar Date: Wed, 30 Oct 2024 10:46:33 +0100 Subject: [PATCH] feat: SW-633 Validation for URL data --- .../(standard)/select-rate/page.tsx | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx index 502a5833c..23e68164d 100644 --- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx +++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx @@ -1,6 +1,7 @@ import { notFound } from "next/navigation" -import { getProfileSafely } from "@/lib/trpc/memoizedRequests" +import { dt } from "@/lib/dt" +import { getLocations, getProfileSafely } from "@/lib/trpc/memoizedRequests" import { serverClient } from "@/lib/trpc/server" import { HotelIncludeEnum } from "@/server/routers/hotels/input" @@ -21,6 +22,18 @@ export default async function SelectRatePage({ }: PageArgs) { setLang(params.lang) + const locations = await getLocations() + if (!locations || "error" in locations) { + return null + } + const hotel = locations.data.find( + (location) => + //@ts-ignore + location.operaId == searchParams.hotel + ) + if (!hotel) { + return notFound() + } const selectRoomParams = new URLSearchParams(searchParams) const selectRoomParamsObject = getHotelReservationQueryParams(selectRoomParams) @@ -29,7 +42,16 @@ export default async function SelectRatePage({ return notFound() } - const adults = selectRoomParamsObject.room[0].adults // TODO: Handle multiple rooms + 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 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) @@ -43,8 +65,8 @@ export default async function SelectRatePage({ }), serverClient().hotel.availability.rooms({ hotelId: parseInt(searchParams.hotel, 10), - roomStayStartDate: searchParams.fromDate, - roomStayEndDate: searchParams.toDate, + roomStayStartDate: validFromDate, + roomStayEndDate: validToDate, adults, children, }),