Merged in fix/facilities-zod-validation (pull request #1365)

Fix: Facilities zod validation

* fix: zod validation


Approved-by: Pontus Dreij
Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson

components/ContentType/HotelPage/data.ts

@@ -203,6 +203,8 @@ const facilityToIconMap: Record<FacilityEnum, IconName> = {
   [FacilityEnum.LaptopSafe]: IconName.StarFilled,
   [FacilityEnum.Leisure]: IconName.StarFilled,
   [FacilityEnum.LuggageLockers]: IconName.StarFilled,
+  [FacilityEnum.LuggageStorageAdditionalCost]: IconName.StarFilled,
+  [FacilityEnum.LuggageStorageNoCost]: IconName.StarFilled,
   [FacilityEnum.Massage]: IconName.StarFilled,
   [FacilityEnum.MinibarInRoom]: IconName.StarFilled,
   [FacilityEnum.MobileLift]: IconName.StarFilled,

server/routers/hotels/schemas/hotel/detailedFacility.ts

@@ -1,11 +1,9 @@
 import { z } from "zod"
 
-import { FacilityEnum } from "@/types/enums/facilities"
-
 const detailedFacilitySchema = z.object({
   filter: z.string().optional(),
   icon: z.string().optional(),
-  id: z.nativeEnum(FacilityEnum),
+  id: z.number(),
   name: z.string(),
   public: z.boolean(),
   sortOrder: z.number(),

server/routers/hotels/schemas/hotel/merchantInformation.ts

@@ -17,5 +17,5 @@ export const merchantInformationSchema = z.object({
       .map(([key]) => key)
       .filter((key): key is PaymentMethodEnum => !!key)
   }),
-  webMerchantId: z.string(),
+  webMerchantId: z.string().optional(),
 })

types/enums/facilities.ts

@@ -155,6 +155,8 @@ export enum FacilityEnum {
   Leisure = 83716,
   LifestyleConcierge = 162584,
   LuggageLockers = 324098,
+  LuggageStorageAdditionalCost = 375884,
+  LuggageStorageNoCost = 375885,
   Massage = 348859,
   MeetingArea = 1692,
   MeetingConferenceFacilities = 5806,