merge

server/routers/booking/output.ts

@@ -17,13 +17,14 @@ export const createBookingSchema = z
         paymentUrl: z.string().nullable(),
         metadata: z
           .object({
-            errorCode: z.number().optional(),
-            errorMessage: z.string().optional(),
+            errorCode: z.number().nullable().optional(),
+            errorMessage: z.string().nullable().optional(),
             priceChangedMetadata: z
               .object({
-                roomPrice: z.number().optional(),
-                totalPrice: z.number().optional(),
+                roomPrice: z.number().nullable().optional(),
+                totalPrice: z.number().nullable().optional(),
               })
+              .nullable()
               .optional(),
           })
           .nullable(),

server/routers/hotels/output.ts

@@ -112,10 +112,10 @@ const hotelContentSchema = z.object({
     }),
   }),
   restaurantsOverviewPage: z.object({
-    restaurantsOverviewPageLinkText: z.string(),
-    restaurantsOverviewPageLink: z.string(),
-    restaurantsContentDescriptionShort: z.string(),
-    restaurantsContentDescriptionMedium: z.string(),
+    restaurantsOverviewPageLinkText: z.string().optional(),
+    restaurantsOverviewPageLink: z.string().optional(),
+    restaurantsContentDescriptionShort: z.string().optional(),
+    restaurantsContentDescriptionMedium: z.string().optional(),
   }),
 })
 
@@ -864,22 +864,24 @@ export const packagesSchema = z.object({
 
 export const getRoomPackagesSchema = z
   .object({
-    data: z.object({
-      attributes: z.object({
-        hotelId: z.number(),
-        packages: z.array(packagesSchema).optional().default([]),
-      }),
-      relationships: z
-        .object({
-          links: z.array(
-            z.object({
-              url: z.string(),
-              type: z.string(),
-            })
-          ),
-        })
-        .optional(),
-      type: z.string(),
-    }),
+    data: z
+      .object({
+        attributes: z.object({
+          hotelId: z.number(),
+          packages: z.array(packagesSchema).optional().default([]),
+        }),
+        relationships: z
+          .object({
+            links: z.array(
+              z.object({
+                url: z.string(),
+                type: z.string(),
+              })
+            ),
+          })
+          .optional(),
+        type: z.string(),
+      })
+      .optional(),
   })
-  .transform((data) => data.data.attributes.packages)
+  .transform((data) => data.data?.attributes?.packages ?? [])

server/routers/hotels/query.ts

@@ -939,12 +939,10 @@ export const hotelQueryRouter = router({
             "api.hotels.packages error",
             JSON.stringify({ query: { hotelId, params } })
           )
-          throw serverErrorByStatus(apiResponse.status, apiResponse)
         }
 
         const apiJson = await apiResponse.json()
         const validatedPackagesData = getRoomPackagesSchema.safeParse(apiJson)
-
         if (!validatedPackagesData.success) {
           getHotelFailCounter.add(1, {
             hotelId,