Merged in feat/SW-1333-hotel-endpoint (pull request #1206)

Feat(SW-133): Add additionalData endpoint

Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson

server/routers/hotels/query.ts

@@ -16,7 +16,9 @@ import { cache } from "@/utils/cache"
 
 import { getHotelPageUrl } from "../contentstack/hotelPage/utils"
 import { getVerifiedUser, parsedUser } from "../user/query"
+import { additionalDataSchema } from "./schemas/additionalData"
 import {
+  getAdditionalDataInputSchema,
   getBreakfastPackageInputSchema,
   getCityCoordinatesInputSchema,
   getHotelDataInputSchema,
@@ -39,6 +41,9 @@ import {
   getRoomsAvailabilitySchema,
 } from "./output"
 import {
+  additionalDataCounter,
+  additionalDataFailCounter,
+  additionalDataSuccessCounter,
   breakfastPackagesCounter,
   breakfastPackagesFailCounter,
   breakfastPackagesSuccessCounter,
@@ -86,7 +91,7 @@ export const getHotelData = cache(
   async (input: HotelDataInput, serviceToken: string) => {
     const { hotelId, language, isCardOnlyPayment } = input
 
-    const includes = ["RoomCategories", "Restaurants"] // "RoomCategories","NearbyHotels","Restaurants","City",
+    const includes = ["RoomCategories", "Restaurants", "AdditionalData"] //"NearbyHotels","Restaurants","City",
     const params = new URLSearchParams({
       hotelId,
       language,
@@ -182,8 +187,10 @@ export const getHotelData = cache(
       hotelData.data.attributes.merchantInformationData.alternatePaymentOptions =
         []
     }
-    if (hotelData.data.attributes.gallery) {
-      const smallerImages = hotelData.data.attributes.gallery.smallerImages
+
+    const gallery = hotelData.included.additionalData?.gallery
+    if (gallery) {
+      const smallerImages = gallery.smallerImages
       const hotelGalleryImages =
         hotelData.data.attributes.hotelType === HotelTypeEnum.Signature
           ? smallerImages.slice(0, 10)
@@ -604,7 +611,7 @@ export const hotelQueryRouter = router({
 
         const bedTypes = availableRoomsInCategory
           .map((availRoom) => {
-            const matchingRoom = hotelData?.included?.rooms
+            const matchingRoom = hotelData?.included.rooms
               ?.find((room) =>
                 room.roomTypes
                   .map((roomType) => roomType.code)
@@ -1253,4 +1260,82 @@ export const hotelQueryRouter = router({
 
       return validatedMeetingRooms.data.data
     }),
+  additionalData: safeProtectedServiceProcedure
+    .input(getAdditionalDataInputSchema)
+    .query(async function ({ ctx, input }) {
+      const { hotelId, language } = input
+
+      const params: Record<string, string | string[]> = {
+        hotelId,
+        language,
+      }
+      const metricsData = { ...params, hotelId: input.hotelId }
+      additionalDataCounter.add(1, metricsData)
+      console.info(
+        "api.hotels.additionalData start",
+        JSON.stringify({ query: { hotelId, params } })
+      )
+
+      const apiResponse = await api.get(
+        api.endpoints.v1.Hotel.Hotels.additionalData(input.hotelId),
+        {
+          cache: undefined,
+          headers: {
+            Authorization: `Bearer ${ctx.serviceToken}`,
+          },
+          next: {
+            revalidate: env.CACHE_TIME_HOTELS,
+          },
+        },
+        params
+      )
+
+      if (!apiResponse.ok) {
+        const text = await apiResponse.text()
+        additionalDataFailCounter.add(1, {
+          ...metricsData,
+          error_type: "http_error",
+          error: JSON.stringify({
+            status: apiResponse.status,
+            statusText: apiResponse.statusText,
+            text,
+          }),
+        })
+        console.error(
+          "api.hotels.additionalData error",
+          JSON.stringify({
+            query: { params },
+            error: {
+              status: apiResponse.status,
+              statusText: apiResponse.statusText,
+              text,
+            },
+          })
+        )
+        return null
+      }
+
+      const apiJson = await apiResponse.json()
+      const validatedAdditionalData = additionalDataSchema.safeParse(apiJson)
+
+      if (!validatedAdditionalData.success) {
+        console.error(
+          "api.hotels.additionalData validation error",
+          JSON.stringify({
+            query: { params },
+            error: validatedAdditionalData.error,
+          })
+        )
+        throw badRequestError()
+      }
+      additionalDataSuccessCounter.add(1, {
+        hotelId,
+      })
+      console.info(
+        "api.hotels.additionalData success",
+        JSON.stringify({ query: { params } })
+      )
+
+      return validatedAdditionalData.data
+    }),
 })