From 8b54818e3cc7f4e5c82efb7efa6d103a3934f529 Mon Sep 17 00:00:00 2001 From: Pontus Dreij Date: Fri, 29 Nov 2024 15:44:55 +0100 Subject: [PATCH 1/3] fix(SW-980): headingText should be optional --- server/routers/hotels/output.ts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts index 14bea40c1..b49bded08 100644 --- a/server/routers/hotels/output.ts +++ b/server/routers/hotels/output.ts @@ -128,15 +128,20 @@ const detailedFacilitySchema = z.object({ icon: z.string().optional(), }) -export const facilitySchema = z.object({ - headingText: z.string(), - heroImages: z.array( - z.object({ - metaData: imageMetaDataSchema, - imageSizes: imageSizesSchema, - }) - ), -}) +export const facilitySchema = z + .object({ + headingText: z.string().optional(), + heroImages: z.array( + z.object({ + metaData: imageMetaDataSchema, + imageSizes: imageSizesSchema, + }) + ), + }) + .transform((facility) => ({ + ...facility, + headingText: facility.headingText ?? "", + })) export const imageSchema = z.object({ metaData: imageMetaDataSchema, From 55edbbd7f86c7cd1c55eeffb94c57737593e7dfb Mon Sep 17 00:00:00 2001 From: Pontus Dreij Date: Fri, 29 Nov 2024 16:06:47 +0100 Subject: [PATCH 2/3] fix(SW-890) Added default --- server/routers/hotels/output.ts | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts index b49bded08..853a25c2c 100644 --- a/server/routers/hotels/output.ts +++ b/server/routers/hotels/output.ts @@ -128,20 +128,15 @@ const detailedFacilitySchema = z.object({ icon: z.string().optional(), }) -export const facilitySchema = z - .object({ - headingText: z.string().optional(), - heroImages: z.array( - z.object({ - metaData: imageMetaDataSchema, - imageSizes: imageSizesSchema, - }) - ), - }) - .transform((facility) => ({ - ...facility, - headingText: facility.headingText ?? "", - })) +export const facilitySchema = z.object({ + headingText: z.string().optional().default(""), + heroImages: z.array( + z.object({ + metaData: imageMetaDataSchema, + imageSizes: imageSizesSchema, + }) + ), +}) export const imageSchema = z.object({ metaData: imageMetaDataSchema, From e2aa4cdd9869aaedf7d57cd4bcd1fb308cbda4cb Mon Sep 17 00:00:00 2001 From: Pontus Dreij Date: Fri, 29 Nov 2024 17:06:41 +0100 Subject: [PATCH 3/3] fix(SW-890) removed optional since i have default --- server/routers/hotels/output.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts index 853a25c2c..c6d96c0da 100644 --- a/server/routers/hotels/output.ts +++ b/server/routers/hotels/output.ts @@ -129,7 +129,7 @@ const detailedFacilitySchema = z.object({ }) export const facilitySchema = z.object({ - headingText: z.string().optional().default(""), + headingText: z.string().default(""), heroImages: z.array( z.object({ metaData: imageMetaDataSchema,