From 2813dc6f84da18042d0e4d4213e03041bb83849d Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 27 Feb 2025 09:10:13 +0000
Subject: [PATCH] Merged in fix/linkedReservation-typings (pull request #1431)

fix: linkedReservation typings

* fix: correct rinkedReservation typings


Approved-by: Christian Andolf
Approved-by: Simon.Emanuelsson
---
 .../HotelReservation/BookingConfirmation/Rooms/index.tsx  | 4 ++--
 apps/scandic-web/server/routers/booking/output.ts         | 8 ++++----
 .../hotelReservation/bookingConfirmation/rooms.ts         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
index 1464641ea..ce0fe5afc 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
@@ -20,7 +20,7 @@ export default async function Rooms({
   return (
     <section className={styles.rooms}>
       <div className={styles.room}>
-        {(linkedReservations?.length ?? 0 > 0) ? (
+        {linkedReservations.length ? (
           <Subtitle color="mainGrey60" type="two">
             {intl.formatMessage({ id: "Room {roomIndex}" }, { roomIndex: 1 })}
           </Subtitle>
@@ -32,7 +32,7 @@ export default async function Rooms({
         />
       </div>
 
-      {linkedReservations?.map((reservation, idx) => (
+      {linkedReservations.map((reservation, idx) => (
         <div className={styles.room} key={reservation.confirmationNumber}>
           <Subtitle color="mainGrey60" type="two">
             {intl.formatMessage(
diff --git a/apps/scandic-web/server/routers/booking/output.ts b/apps/scandic-web/server/routers/booking/output.ts
index bc5545dde..0b534f814 100644
--- a/apps/scandic-web/server/routers/booking/output.ts
+++ b/apps/scandic-web/server/routers/booking/output.ts
@@ -2,6 +2,7 @@ import { z } from "zod"
 
 import { ChildBedTypeEnum } from "@/constants/booking"
 
+import { nullableArrayObjectValidator } from "@/utils/zod/arrayValidator"
 import { phoneValidator } from "@/utils/zod/phoneValidator"
 import { nullableStringValidator } from "@/utils/zod/stringValidator"
 
@@ -198,10 +199,9 @@ export const bookingConfirmationSchema = z
         currencyCode: z.string(),
         guest: guestSchema,
         isGuaranteedForLateArrival: z.boolean().optional(),
-        linkedReservations: z
-          .array(linkedReservationSchema)
-          .nullish()
-          .transform((v) => v ?? []),
+        linkedReservations: nullableArrayObjectValidator(
+          linkedReservationSchema
+        ),
         hotelId: z.string(),
         packages: z.array(packageSchema).default([]),
         rateDefinition: rateDefinitionSchema,
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts
index c954a3ac4..67d33273b 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts
@@ -12,5 +12,5 @@ export interface BookingConfirmationRoomsProps
   mainRoom: Room & {
     bedType: Room["roomTypes"][number]
   }
-  linkedReservations?: LinkedReservationSchema[] | null
+  linkedReservations: LinkedReservationSchema[]
 }