Merged in feat/SW-1454-hotel-listing-city-page (pull request #1250)

feat(SW-1454): added hotel listing

* feat(SW-1454): added hotel listing


Approved-by: Fredrik Thorsson

server/routers/contentstack/destinationCityPage/query.ts

@@ -4,7 +4,7 @@ import {
 } from "@/lib/graphql/Query/DestinationCityPage/DestinationCityPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
-import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
+import { contentStackUidWithServiceProcedure, router } from "@/server/trpc"
 
 import { generateTag } from "@/utils/generateTag"
 
@@ -20,7 +20,7 @@ import {
   getDestinationCityPageRefsSuccessCounter,
   getDestinationCityPageSuccessCounter,
 } from "./telemetry"
-import { generatePageTags } from "./utils"
+import { generatePageTags, getHotelListData } from "./utils"
 
 import type {
   GetDestinationCityPageData,
@@ -28,8 +28,8 @@ import type {
 } from "@/types/trpc/routers/contentstack/destinationCityPage"
 
 export const destinationCityPageQueryRouter = router({
-  get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
-    const { lang, uid } = ctx
+  get: contentStackUidWithServiceProcedure.query(async ({ ctx }) => {
+    const { lang, uid, serviceToken } = ctx
 
     getDestinationCityPageRefsCounter.add(1, { lang, uid })
     console.info(
@@ -128,27 +128,31 @@ export const destinationCityPageQueryRouter = router({
       throw notFoundError
     }
 
-    const validatedDestinationCityPage = destinationCityPageSchema.safeParse(
-      response.data
-    )
+    const validatedResponse = destinationCityPageSchema.safeParse(response.data)
 
-    if (!validatedDestinationCityPage.success) {
+    if (!validatedResponse.success) {
       getDestinationCityPageFailCounter.add(1, {
         lang,
         uid: `${uid}`,
         error_type: "validation_error",
-        error: JSON.stringify(validatedDestinationCityPage.error),
+        error: JSON.stringify(validatedResponse.error),
       })
       console.error(
         "contentstack.destinationCityPage validation error",
         JSON.stringify({
           query: { lang, uid },
-          error: validatedDestinationCityPage.error,
+          error: validatedResponse.error,
         })
       )
       return null
     }
 
+    const hotels = await getHotelListData(
+      lang,
+      serviceToken,
+      validatedResponse.data.destinationCityPage.destination_settings.city
+    )
+
     getDestinationCityPageSuccessCounter.add(1, { lang, uid: `${uid}` })
     console.info(
       "contentstack.destinationCityPage success",
@@ -157,6 +161,9 @@ export const destinationCityPageQueryRouter = router({
       })
     )
 
-    return validatedDestinationCityPage.data
+    return {
+      ...validatedResponse.data,
+      hotels,
+    }
   }),
 })

server/routers/contentstack/destinationCityPage/utils.ts

@@ -1,5 +1,10 @@
 import { generateTag, generateTagsFromSystem } from "@/utils/generateTag"
 
+import { getHotel } from "../../hotels/query"
+import { getHotelIdsByCityIdentifier } from "../../hotels/utils"
+import { getHotelPageUrl } from "../hotelPage/utils"
+
+import type { HotelData } from "@/types/hotel"
 import type { System } from "@/types/requests/system"
 import type { GetDestinationCityPageRefsSchema } from "@/types/trpc/routers/contentstack/destinationCityPage"
 import type { Lang } from "@/constants/languages"
@@ -29,3 +34,29 @@ export function getConnections({
 
   return connections
 }
+
+export async function getHotelListData(
+  lang: Lang,
+  serviceToken: string,
+  cityIdentifier: string
+) {
+  const hotelIds = await getHotelIdsByCityIdentifier(
+    cityIdentifier,
+    serviceToken
+  )
+
+  const hotels = await Promise.all(
+    hotelIds.map(async (hotelId) => {
+      const [hotelData, url] = await Promise.all([
+        getHotel({ hotelId, language: lang }, serviceToken),
+        getHotelPageUrl(lang, hotelId),
+      ])
+
+      return hotelData ? { ...hotelData, url } : null
+    })
+  )
+
+  return hotels.filter(
+    (hotel): hotel is HotelData & { url: string | null } => !!hotel
+  )
+}