From 75011dffe54c56fadeec8870b55d23591c04b159 Mon Sep 17 00:00:00 2001
From: Fredrik Thorsson <fredrik.thorsson@forefront.se>
Date: Tue, 6 Aug 2024 12:49:50 +0200
Subject: [PATCH] feat: schema change

---
 .../HotelReservation/HotelCard/index.tsx      |  8 +++-
 .../SelectHotel/HotelFilter/index.tsx         | 16 +++----
 server/routers/hotels/output.ts               |  8 ++--
 server/routers/hotels/tempFilterData.json     | 42 +++++++++----------
 4 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/components/HotelReservation/HotelCard/index.tsx b/components/HotelReservation/HotelCard/index.tsx
index 6d7070257..f700f57f1 100644
--- a/components/HotelReservation/HotelCard/index.tsx
+++ b/components/HotelReservation/HotelCard/index.tsx
@@ -13,7 +13,13 @@ export default async function HotelCard({ hotel }: HotelCardProps) {
   const { formatMessage } = await getIntl()
   return (
     <article className={styles.card}>
-      <Image src="" alt="hotel image" className={styles.image} />
+      <Image
+        src={hotel.hotelContent.images.imageSizes.large}
+        alt={hotel.hotelContent.images.metaData.altText}
+        width={300}
+        height={200}
+        className={styles.image}
+      />
       <div className={styles.information}>
         <header className={styles.title}>
           <ScandicLogoIcon color="red" />
diff --git a/components/HotelReservation/SelectHotel/HotelFilter/index.tsx b/components/HotelReservation/SelectHotel/HotelFilter/index.tsx
index 8b85cd28b..49da69bb5 100644
--- a/components/HotelReservation/SelectHotel/HotelFilter/index.tsx
+++ b/components/HotelReservation/SelectHotel/HotelFilter/index.tsx
@@ -11,8 +11,8 @@ export default async function HotelFilter({ filters }: HotelFilterProps) {
     <aside className={styles.container}>
       <div className={styles.facilities}>
         {formatMessage({ id: "Room facilities" })}
-        {filters.filterType.roomFacilities.map((roomFilter, index) => (
-          <div key={index} className={styles.filter}>
+        {filters.roomFacilities.map((roomFilter, index) => (
+          <div key={`room filter-${index}`} className={styles.filter}>
             <input id={roomFilter} name={roomFilter} type="checkbox" />
             <label htmlFor={roomFilter}>{roomFilter}</label>
           </div>
@@ -20,8 +20,8 @@ export default async function HotelFilter({ filters }: HotelFilterProps) {
       </div>
       <div className={styles.facilities}>
         {formatMessage({ id: "Hotel facilities" })}
-        {filters.filterType.hotelFacilities.map((hotelFilter, index) => (
-          <div key={index} className={styles.filter}>
+        {filters.hotelFacilities.map((hotelFilter, index) => (
+          <div key={`hotel filter-${index}`} className={styles.filter}>
             <input id={hotelFilter} name={hotelFilter} type="checkbox" />
             <label htmlFor={hotelFilter}>{hotelFilter}</label>
           </div>
@@ -29,10 +29,10 @@ export default async function HotelFilter({ filters }: HotelFilterProps) {
       </div>
       <div className={styles.facilities}>
         {formatMessage({ id: "Hotel surroundings" })}
-        {filters.filterType.hotelSurroundings.map((sorroundings, index) => (
-          <div key={index} className={styles.filter}>
-            <input id={sorroundings} name={sorroundings} type="checkbox" />
-            <label htmlFor={sorroundings}>{sorroundings}</label>
+        {filters.hotelSurroundings.map((surroundings, index) => (
+          <div key={`surroundings filter-${index}`} className={styles.filter}>
+            <input id={surroundings} name={surroundings} type="checkbox" />
+            <label htmlFor={surroundings}>{surroundings}</label>
           </div>
         ))}
       </div>
diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts
index 2d121819a..b580c341d 100644
--- a/server/routers/hotels/output.ts
+++ b/server/routers/hotels/output.ts
@@ -483,11 +483,9 @@ export const getRatesSchema = z.array(rate)
 export type Rate = z.infer<typeof rate>
 
 const hotelFilter = z.object({
-  filterType: z.object({
-    roomFacilities: z.array(z.string()),
-    hotelFacilities: z.array(z.string()),
-    hotelSurroundings: z.array(z.string()),
-  }),
+  roomFacilities: z.array(z.string()),
+  hotelFacilities: z.array(z.string()),
+  hotelSurroundings: z.array(z.string()),
 })
 
 export const getFiltersSchema = hotelFilter
diff --git a/server/routers/hotels/tempFilterData.json b/server/routers/hotels/tempFilterData.json
index dc40ee0e9..e58bdf50b 100644
--- a/server/routers/hotels/tempFilterData.json
+++ b/server/routers/hotels/tempFilterData.json
@@ -1,24 +1,22 @@
 {
-  "filterType": {
-    "roomFacilities": ["Balcony", "Bathub", "View", "Conntecting doors"],
-    "hotelFacilities": [
-      "Parking inside",
-      "Parking outside",
-      "Parking electric",
-      "Sauna",
-      "Pool",
-      "Restaurant",
-      "Bar",
-      "Sky/rooftop bar",
-      "Gym",
-      "Coworking"
-    ],
-    "hotelSurroundings": [
-      "Beach",
-      "Lake or sea",
-      "Hiking",
-      "Mountains",
-      "Golf course"
-    ]
-  }
+  "roomFacilities": ["Balcony", "Bathub", "View", "Conntecting doors"],
+  "hotelFacilities": [
+    "Parking inside",
+    "Parking outside",
+    "Parking electric",
+    "Sauna",
+    "Pool",
+    "Restaurant",
+    "Bar",
+    "Sky/rooftop bar",
+    "Gym",
+    "Coworking"
+  ],
+  "hotelSurroundings": [
+    "Beach",
+    "Lake or sea",
+    "Hiking",
+    "Mountains",
+    "Golf course"
+  ]
 }