Merged in fix/SW-2839-prevent-fetching-hotel-availability-with-invalid-input (pull request #2166)

Prevent calling availability for cities if input model is invalid

* fix: make sure that input data is valid


Approved-by: Linus Flood

apps/scandic-web/server/routers/hotels/input.ts

@@ -8,24 +8,104 @@ import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectR
 import { BreakfastPackageEnum } from "@/types/enums/breakfast"
 import { Country } from "@/types/enums/country"
 
-export const hotelsAvailabilityInputSchema = z.object({
+export const hotelsAvailabilityInputSchema = z
-  cityId: z.string(),
+  .object({
-  roomStayStartDate: z.string(),
+    cityId: z.string(),
-  roomStayEndDate: z.string(),
+    roomStayStartDate: z.string().refine(
-  adults: z.number(),
+      (val) => {
-  children: z.string().optional(),
+        const fromDate = dayjs(val)
-  bookingCode: z.string().optional().default(""),
-  redemption: z.boolean().optional().default(false),
-})
 
-export const getHotelsByHotelIdsAvailabilityInputSchema = z.object({
+        return fromDate.isValid()
-  hotelIds: z.array(z.number()),
+      },
-  roomStayStartDate: z.string(),
+      {
-  roomStayEndDate: z.string(),
+        message: "FROMDATE_INVALID",
-  adults: z.number(),
+      }
-  children: z.string().optional(),
+    ),
-  bookingCode: z.string().optional().default(""),
+    roomStayEndDate: z.string().refine(
-})
+      (val) => {
+        const fromDate = dayjs(val)
+        return fromDate.isValid()
+      },
+      {
+        message: "TODATE_INVALID",
+      }
+    ),
+    adults: z.number(),
+    children: z.string().optional(),
+    bookingCode: z.string().optional().default(""),
+    redemption: z.boolean().optional().default(false),
+  })
+  .refine(
+    (data) => {
+      const fromDate = dayjs(data.roomStayStartDate).startOf("day")
+      const toDate = dayjs(data.roomStayEndDate).startOf("day")
+
+      return fromDate.isBefore(toDate)
+    },
+    {
+      message: "FROMDATE_BEFORE_TODATE",
+    }
+  )
+  .refine(
+    (data) => {
+      const fromDate = dayjs(data.roomStayStartDate)
+      const today = dayjs().startOf("day")
+
+      return fromDate.isSameOrAfter(today)
+    },
+    {
+      message: "FROMDATE_CANNOT_BE_IN_THE_PAST",
+    }
+  )
+
+export const getHotelsByHotelIdsAvailabilityInputSchema = z
+  .object({
+    hotelIds: z.array(z.number()),
+    roomStayStartDate: z.string().refine(
+      (val) => {
+        const fromDate = dayjs(val)
+        return fromDate.isValid()
+      },
+      {
+        message: "FROMDATE_INVALID",
+      }
+    ),
+    roomStayEndDate: z.string().refine(
+      (val) => {
+        const toDate = dayjs(val)
+
+        return toDate.isValid()
+      },
+      {
+        message: "TODATE_INVALID",
+      }
+    ),
+    adults: z.number(),
+    children: z.string().optional(),
+    bookingCode: z.string().optional().default(""),
+  })
+  .refine(
+    (data) => {
+      const fromDate = dayjs(data.roomStayStartDate).startOf("day")
+      const toDate = dayjs(data.roomStayEndDate).startOf("day")
+
+      return fromDate.isBefore(toDate)
+    },
+    {
+      message: "FROMDATE_BEFORE_TODATE",
+    }
+  )
+  .refine(
+    (data) => {
+      const fromDate = dayjs(data.roomStayStartDate)
+      const today = dayjs().startOf("day")
+
+      return fromDate.isSameOrAfter(today)
+    },
+    {
+      message: "FROMDATE_CANNOT_BE_IN_THE_PAST",
+    }
+  )
 
 const childrenInRoomSchema = z
   .array(