From 798d19d3c81b5135dde0f4e9042addaab2211e45 Mon Sep 17 00:00:00 2001
From: Fredrik Thorsson <fredrik.thorsson@forefront.se>
Date: Tue, 6 Aug 2024 10:16:46 +0200
Subject: [PATCH] feat: filter route changes

---
 .../hotelreservation/select-hotel/page.tsx    |  2 +-
 .../SelectHotel/HotelFilter/index.tsx         | 20 ++++----
 server/routers/hotels/output.ts               |  4 +-
 server/routers/hotels/tempFilterData.json     | 48 +++++++++----------
 .../selectHotel/hotelFilterProps.ts           |  2 +-
 5 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx
index 609c9037e..e34e008cf 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx
@@ -22,7 +22,7 @@ export default async function SelectHotelPage({
 
   return (
     <main className={styles.main}>
-      <HotelFilter filter={hotelFilters} />
+      <HotelFilter filters={hotelFilters} />
       <section className={styles.section}>
         {hotels.map((hotel) => (
           <HotelCard key={hotel.name} hotel={hotel} />
diff --git a/components/HotelReservation/SelectHotel/HotelFilter/index.tsx b/components/HotelReservation/SelectHotel/HotelFilter/index.tsx
index 6c84497ef..8b85cd28b 100644
--- a/components/HotelReservation/SelectHotel/HotelFilter/index.tsx
+++ b/components/HotelReservation/SelectHotel/HotelFilter/index.tsx
@@ -4,35 +4,35 @@ import styles from "./hotelFilter.module.css"
 
 import { HotelFilterProps } from "@/types/components/hotelReservation/selectHotel/hotelFilterProps"
 
-export default async function HotelFilter({ filter }: HotelFilterProps) {
+export default async function HotelFilter({ filters }: HotelFilterProps) {
   const { formatMessage } = await getIntl()
 
   return (
     <aside className={styles.container}>
       <div className={styles.facilities}>
         {formatMessage({ id: "Room facilities" })}
-        {filter[0].filter.roomFacilities.map((filter, index) => (
+        {filters.filterType.roomFacilities.map((roomFilter, index) => (
           <div key={index} className={styles.filter}>
-            <input id={filter} name={filter} type="checkbox" />
-            <label htmlFor={filter}>{filter}</label>
+            <input id={roomFilter} name={roomFilter} type="checkbox" />
+            <label htmlFor={roomFilter}>{roomFilter}</label>
           </div>
         ))}
       </div>
       <div className={styles.facilities}>
         {formatMessage({ id: "Hotel facilities" })}
-        {filter[0].filter.hotelFacilities.map((filter, index) => (
+        {filters.filterType.hotelFacilities.map((hotelFilter, index) => (
           <div key={index} className={styles.filter}>
-            <input id={filter} name={filter} type="checkbox" />
-            <label htmlFor={filter}>{filter}</label>
+            <input id={hotelFilter} name={hotelFilter} type="checkbox" />
+            <label htmlFor={hotelFilter}>{hotelFilter}</label>
           </div>
         ))}
       </div>
       <div className={styles.facilities}>
         {formatMessage({ id: "Hotel surroundings" })}
-        {filter[0].filter.hotelSurroundings.map((filter, index) => (
+        {filters.filterType.hotelSurroundings.map((sorroundings, index) => (
           <div key={index} className={styles.filter}>
-            <input id={filter} name={filter} type="checkbox" />
-            <label htmlFor={filter}>{filter}</label>
+            <input id={sorroundings} name={sorroundings} type="checkbox" />
+            <label htmlFor={sorroundings}>{sorroundings}</label>
           </div>
         ))}
       </div>
diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts
index 51cb12fa2..2d121819a 100644
--- a/server/routers/hotels/output.ts
+++ b/server/routers/hotels/output.ts
@@ -483,12 +483,12 @@ export const getRatesSchema = z.array(rate)
 export type Rate = z.infer<typeof rate>
 
 const hotelFilter = z.object({
-  filter: z.object({
+  filterType: z.object({
     roomFacilities: z.array(z.string()),
     hotelFacilities: z.array(z.string()),
     hotelSurroundings: z.array(z.string()),
   }),
 })
 
-export const getFiltersSchema = z.array(hotelFilter)
+export const getFiltersSchema = hotelFilter
 export type HotelFilter = z.infer<typeof hotelFilter>
diff --git a/server/routers/hotels/tempFilterData.json b/server/routers/hotels/tempFilterData.json
index ae274124b..dc40ee0e9 100644
--- a/server/routers/hotels/tempFilterData.json
+++ b/server/routers/hotels/tempFilterData.json
@@ -1,26 +1,24 @@
-[
-  {
-    "filter": {
-      "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"
-      ]
-    }
+{
+  "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"
+    ]
   }
-]
+}
diff --git a/types/components/hotelReservation/selectHotel/hotelFilterProps.ts b/types/components/hotelReservation/selectHotel/hotelFilterProps.ts
index b2b39d3e2..e100131ba 100644
--- a/types/components/hotelReservation/selectHotel/hotelFilterProps.ts
+++ b/types/components/hotelReservation/selectHotel/hotelFilterProps.ts
@@ -1,3 +1,3 @@
 import { HotelFilter } from "@/server/routers/hotels/output"
 
-export type HotelFilterProps = { filter: HotelFilter[] }
+export type HotelFilterProps = { filters: HotelFilter }