From 789818eefdcd644193d40115bca49fd45441e2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?=
 <matilda.landstrom@scandichotels.com>
Date: Wed, 20 Aug 2025 08:46:16 +0000
Subject: [PATCH] Merged in feat/SW-3127-meeting-room-sort-order (pull request
 #2634)

feat(SW-3127): use new sort order attribute

* feat(SW-3127): use new sort order attribute


Approved-by: Erik Tiekstra
---
 packages/trpc/lib/routers/hotels/query.ts               | 4 +++-
 packages/trpc/lib/routers/hotels/schemas/meetingRoom.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/trpc/lib/routers/hotels/query.ts b/packages/trpc/lib/routers/hotels/query.ts
index e6133c093..133fc8613 100644
--- a/packages/trpc/lib/routers/hotels/query.ts
+++ b/packages/trpc/lib/routers/hotels/query.ts
@@ -992,7 +992,9 @@ export const hotelQueryRouter = router({
 
           metricsMeetingRooms.success()
 
-          return validatedMeetingRooms.data.data
+          return validatedMeetingRooms.data.data.sort(
+            (a, b) => a.attributes.sortOrder - b.attributes.sortOrder
+          )
         },
         env.CACHE_TIME_HOTELS
       )
diff --git a/packages/trpc/lib/routers/hotels/schemas/meetingRoom.ts b/packages/trpc/lib/routers/hotels/schemas/meetingRoom.ts
index 8e6933fc8..d3f68de3c 100644
--- a/packages/trpc/lib/routers/hotels/schemas/meetingRoom.ts
+++ b/packages/trpc/lib/routers/hotels/schemas/meetingRoom.ts
@@ -40,7 +40,7 @@ export const meetingRoomsSchema = z.object({
           })
         ),
         lighting: z.string(),
-        sortOrder: z.number().optional(),
+        sortOrder: z.number(),
       }),
       id: z.string(),
       type: z.string(),