From 34020dad7861c249e92787421cbf24f860658a3d Mon Sep 17 00:00:00 2001 From: Bianca Widstam Date: Mon, 22 Sep 2025 12:17:12 +0000 Subject: [PATCH] Merged in fix/BOOK-136-ancillary-image-without-metadata (pull request #2841) fix(BOOK-136): ancillary image validation without metadata * fix(BOOK-136): ancillary image validation without metadata * fix(BOOK-136): ancillary image Approved-by: Erik Tiekstra --- packages/trpc/lib/routers/hotels/output.ts | 2 +- packages/trpc/lib/routers/hotels/schemas/image.ts | 8 ++++++++ packages/trpc/lib/routers/hotels/schemas/packages.ts | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/trpc/lib/routers/hotels/output.ts b/packages/trpc/lib/routers/hotels/output.ts index 38e98c9be..75c965a61 100644 --- a/packages/trpc/lib/routers/hotels/output.ts +++ b/packages/trpc/lib/routers/hotels/output.ts @@ -525,7 +525,7 @@ export const ancillaryPackagesSchema = z id: item.id, title: item.title, description: item.descriptions.html, - imageUrl: item.images[0]?.src || undefined, + imageUrl: item.images[0]?.imageSizes.original || undefined, price: { total: item.variants.ancillary.price.totalPrice, currency: item.variants.ancillary.price.currency, diff --git a/packages/trpc/lib/routers/hotels/schemas/image.ts b/packages/trpc/lib/routers/hotels/schemas/image.ts index 98390882c..a044831bd 100644 --- a/packages/trpc/lib/routers/hotels/schemas/image.ts +++ b/packages/trpc/lib/routers/hotels/schemas/image.ts @@ -10,6 +10,14 @@ const DEFAULT_IMAGE_OBJ = { src: "https://placehold.co/1280x720", } +export const imageWithoutMetaDataSchema = z + .object({ + imageSizes: z.object({ + original: nullableStringValidator, + }), + }) + .nullish() + export const imageSchema = z .object({ imageSizes: z.object({ diff --git a/packages/trpc/lib/routers/hotels/schemas/packages.ts b/packages/trpc/lib/routers/hotels/schemas/packages.ts index dff1f8e22..d7253ff20 100644 --- a/packages/trpc/lib/routers/hotels/schemas/packages.ts +++ b/packages/trpc/lib/routers/hotels/schemas/packages.ts @@ -5,7 +5,7 @@ import { CurrencyEnum } from "@scandic-hotels/common/constants/currency" import { BreakfastPackageEnum } from "../../../enums/breakfast" import { PackageTypeEnum } from "../../../enums/packages" import { RoomPackageCodeEnum } from "../../../enums/roomFilter" -import { imageSchema } from "./image" +import { imageWithoutMetaDataSchema } from "./image" // TODO: Remove optional and default when the API change has been deployed export const packagePriceSchema = z @@ -38,7 +38,7 @@ export const ancillaryContentSchema = z.object({ }), title: z.string(), descriptions: z.object({ html: z.string() }), - images: z.array(imageSchema), + images: z.array(imageWithoutMetaDataSchema), requiresDeliveryTime: z.boolean(), })