Merge branch 'master' into feature/tracking

server/routers/hotels/output.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-import { BedTypeEnum } from "@/constants/booking"
+import { ChildBedTypeEnum } from "@/constants/booking"
 import { dt } from "@/lib/dt"
 import { toLang } from "@/server/utils"
 
@@ -312,34 +312,35 @@ const socialMediaSchema = z.object({
   facebook: z.string().optional(),
 })
 
-const metaSpecialAlertSchema = z.object({
+const specialAlertSchema = z.object({
   type: z.string(),
   title: z.string().optional(),
   description: z.string().optional(),
   displayInBookingFlow: z.boolean(),
-  startDate: z.string(),
-  endDate: z.string(),
+  startDate: z.string().optional(),
+  endDate: z.string().optional(),
 })
 
-const metaSchema = z.object({
-  specialAlerts: z
-    .array(metaSpecialAlertSchema)
-    .transform((data) => {
-      const now = dt().utc().format("YYYY-MM-DD")
-      const filteredAlerts = data.filter((alert) => {
-        const shouldShowNow = alert.startDate <= now && alert.endDate >= now
-        const hasText = alert.description || alert.title
-        return shouldShowNow && hasText
-      })
-      return filteredAlerts.map((alert, idx) => ({
-        id: `alert-${alert.type}-${idx}`,
-        type: AlertTypeEnum.Info,
-        heading: alert.title || null,
-        text: alert.description || null,
-      }))
+const specialAlertsSchema = z
+  .array(specialAlertSchema)
+  .transform((data) => {
+    const now = dt().utc().format("YYYY-MM-DD")
+    const filteredAlerts = data.filter((alert) => {
+      const shouldShowNow =
+        alert.startDate && alert.endDate
+          ? alert.startDate <= now && alert.endDate >= now
+          : true
+      const hasText = alert.description || alert.title
+      return shouldShowNow && hasText
     })
-    .default([]),
-})
+    return filteredAlerts.map((alert, idx) => ({
+      id: `alert-${alert.type}-${idx}`,
+      type: AlertTypeEnum.Info,
+      heading: alert.title || null,
+      text: alert.description || null,
+    }))
+  })
+  .default([])
 
 const relationshipsSchema = z.object({
   restaurants: z.object({
@@ -380,11 +381,54 @@ const merchantInformationSchema = z.object({
     }),
 })
 
+const hotelFacilityDetailSchema = z
+  .object({
+    description: z.string(),
+    heading: z.string(),
+  })
+  .optional()
+
+/** Possibly more values */
+const hotelFacilityDetailsSchema = z.object({
+  breakfast: hotelFacilityDetailSchema,
+  checkout: hotelFacilityDetailSchema,
+  gym: hotelFacilityDetailSchema,
+  internet: hotelFacilityDetailSchema,
+  laundry: hotelFacilityDetailSchema,
+  luggage: hotelFacilityDetailSchema,
+  shop: hotelFacilityDetailSchema,
+  telephone: hotelFacilityDetailSchema,
+})
+
+const hotelInformationSchema = z
+  .object({
+    description: z.string(),
+    heading: z.string(),
+    link: z.string().optional(),
+  })
+  .optional()
+
+const hotelInformationsSchema = z.object({
+  accessibility: hotelInformationSchema,
+  safety: hotelInformationSchema,
+  sustainability: hotelInformationSchema,
+})
+
+const hotelFactsSchema = z.object({
+  checkin: checkinSchema,
+  ecoLabels: ecoLabelsSchema,
+  hotelFacilityDetail: hotelFacilityDetailsSchema.default({}),
+  hotelInformation: hotelInformationsSchema.default({}),
+  interior: interiorSchema,
+  receptionHours: receptionHoursSchema,
+  yearBuilt: z.string(),
+})
+
 // NOTE: Find schema at: https://aks-test.scandichotels.com/hotel/swagger/v1/index.html
 export const getHotelDataSchema = z.object({
   data: z.object({
     id: z.string(),
-    type: z.string(), // No enum here but the standard return appears to be "hotels".
+    type: z.literal("hotels"), // No enum here but the standard return appears to be "hotels".
     language: z.string().transform((val) => {
       const lang = toLang(val)
       if (!lang) {
@@ -393,44 +437,41 @@ export const getHotelDataSchema = z.object({
       return lang
     }),
     attributes: z.object({
-      name: z.string(),
-      operaId: z.string(),
-      keywords: z.array(z.string()),
-      isPublished: z.boolean(),
+      accessibilityElevatorPitchText: z.string().optional(),
+      address: addressSchema,
       cityId: z.string(),
       cityName: z.string(),
-      ratings: ratingsSchema,
-      address: addressSchema,
+      conferencesAndMeetings: facilitySchema.optional(),
       contactInformation: contactInformationSchema,
-      hotelFacts: z.object({
-        checkin: checkinSchema,
-        ecoLabels: ecoLabelsSchema,
-        interior: interiorSchema,
-        receptionHours: receptionHoursSchema,
-        yearBuilt: z.string(),
-      }),
-      location: locationSchema,
-      hotelContent: hotelContentSchema,
       detailedFacilities: z
         .array(detailedFacilitySchema)
         .transform((facilities) =>
           facilities.sort((a, b) => b.sortOrder - a.sortOrder)
         ),
+      gallery: gallerySchema.optional(),
+      healthAndWellness: facilitySchema.optional(),
       healthFacilities: z.array(healthFacilitySchema),
+      hotelContent: hotelContentSchema,
+      hotelFacts: hotelFactsSchema,
+      hotelRoomElevatorPitchText: z.string().optional(),
+      hotelType: z.string().optional(),
+      isActive: z.boolean(),
+      isPublished: z.boolean(),
+      keywords: z.array(z.string()),
+      location: locationSchema,
       merchantInformationData: merchantInformationSchema,
-      rewardNight: rewardNightSchema,
+      name: z.string(),
+      operaId: z.string(),
+      parking: z.array(parkingSchema),
       pointsOfInterest: z
         .array(pointOfInterestSchema)
         .transform((pois) => pois.sort((a, b) => a.distance - b.distance)),
-      parking: z.array(parkingSchema),
-      specialNeedGroups: z.array(specialNeedGroupSchema),
-      socialMedia: socialMediaSchema,
-      meta: metaSchema.optional(),
-      isActive: z.boolean(),
-      conferencesAndMeetings: facilitySchema.optional(),
-      healthAndWellness: facilitySchema.optional(),
+      ratings: ratingsSchema,
+      rewardNight: rewardNightSchema,
       restaurantImages: facilitySchema.optional(),
-      gallery: gallerySchema.optional(),
+      socialMedia: socialMediaSchema,
+      specialAlerts: specialAlertsSchema,
+      specialNeedGroups: z.array(specialNeedGroupSchema),
     }),
     relationships: relationshipsSchema,
   }),
@@ -441,7 +482,7 @@ export const getHotelDataSchema = z.object({
 
 export const childrenSchema = z.object({
   age: z.number(),
-  bedType: z.nativeEnum(BedTypeEnum),
+  bedType: z.nativeEnum(ChildBedTypeEnum),
 })
 
 const occupancySchema = z.object({
@@ -801,10 +842,7 @@ export const breakfastPackageSchema = z.object({
   description: z.string(),
   localPrice: breakfastPackagePriceSchema,
   requestedPrice: breakfastPackagePriceSchema,
-  packageType: z.enum([
-    PackageTypeEnum.BreakfastAdult,
-    PackageTypeEnum.BreakfastChildren,
-  ]),
+  packageType: z.literal(PackageTypeEnum.BreakfastAdult),
 })
 
 export const breakfastPackagesSchema = z