feat(SW-66, SW-348): search functionality and ui

server/routers/contentstack/hotelPage/query.ts

@@ -1,13 +1,15 @@
 import { metrics } from "@opentelemetry/api"
 
-import { GetHotelPage } from "@/lib/graphql/Query/HotelPage.graphql"
+import { GetHotelPage } from "@/lib/graphql/Query/HotelPage/HotelPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
 import { generateTag } from "@/utils/generateTag"
 
-import { HotelPage, HotelPageDataRaw, validateHotelPageSchema } from "./output"
+import { hotelPageSchema } from "./output"
+
+import { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
 
 // OpenTelemetry metrics
 const meter = metrics.getMeter("trpc.contentstack.hotelPage")
@@ -31,7 +33,7 @@ export const hotelPageQueryRouter = router({
         query: { lang, uid },
       })
     )
-    const response = await request<HotelPageDataRaw>(
+    const response = await request<GetHotelPageData>(
       GetHotelPage,
       {
         locale: lang,
@@ -62,7 +64,7 @@ export const hotelPageQueryRouter = router({
       throw notFoundError
     }
 
-    const validatedHotelPage = validateHotelPageSchema.safeParse(response.data)
+    const validatedHotelPage = hotelPageSchema.safeParse(response.data)
 
     if (!validatedHotelPage.success) {
       getHotelPageFailCounter.add(1, {
@@ -81,9 +83,6 @@ export const hotelPageQueryRouter = router({
       return null
     }
 
-    const hotelPage = {
-      ...validatedHotelPage.data.hotel_page,
-    } as HotelPage
     getHotelPageSuccessCounter.add(1, { lang, uid: `${uid}` })
     console.info(
       "contentstack.hotelPage success",
@@ -91,6 +90,6 @@ export const hotelPageQueryRouter = router({
         query: { lang, uid },
       })
     )
-    return hotelPage
+    return validatedHotelPage.data.hotel_page
   }),
 })