Merge master

server/routers/contentstack/base/query.ts

@@ -422,6 +422,7 @@ export const baseQueryRouter = router({
           locale: input.lang,
         },
         {
+          cache: "force-cache",
           next: {
             tags: [generateTag(input.lang, currentFooterUID)],
           },

server/routers/contentstack/bookingwidget/query.ts

@@ -70,6 +70,7 @@ export const bookingwidgetQueryRouter = router({
           locale: lang,
         },
         {
+          cache: "force-cache",
           next: {
             tags: [generateTag(lang, uid, bookingwidgetAffix)],
           },

server/routers/contentstack/metadata/output.ts

@@ -1,7 +1,8 @@
 import { z } from "zod"
 
+import { hotelAttributesSchema } from "../../hotels/output"
 import { tempImageVaultAssetSchema } from "../schemas/imageVault"
-import { getDescription, getImages, getTitle } from "./utils"
+import { getDescription, getImage, getTitle } from "./utils"
 
 import type { Metadata } from "next"
 
@@ -71,16 +72,21 @@ export const rawMetadataSchema = z.object({
     .nullable(),
   hero_image: tempImageVaultAssetSchema.nullable(),
   blocks: metaDataBlocksSchema,
+  hotel_page_id: z.string().optional().nullable(),
+  hotelData: hotelAttributesSchema
+    .pick({ name: true, address: true, hotelContent: true, gallery: true })
+    .optional()
+    .nullable(),
 })
 
-export const metadataSchema = rawMetadataSchema.transform((data) => {
+export const metadataSchema = rawMetadataSchema.transform(async (data) => {
   const noIndex = !!data.web?.seo_metadata?.noindex
 
   const metadata: Metadata = {
-    title: getTitle(data),
+    title: await getTitle(data),
     description: getDescription(data),
     openGraph: {
-      images: getImages(data),
+      images: getImage(data),
     },
   }
 

server/routers/contentstack/metadata/query.ts

@@ -4,13 +4,15 @@ import { cache } from "react"
 import { GetAccountPageMetadata } from "@/lib/graphql/Query/AccountPage/Metadata.graphql"
 import { GetCollectionPageMetadata } from "@/lib/graphql/Query/CollectionPage/Metadata.graphql"
 import { GetContentPageMetadata } from "@/lib/graphql/Query/ContentPage/Metadata.graphql"
+import { GetHotelPageMetadata } from "@/lib/graphql/Query/HotelPage/Metadata.graphql"
 import { GetLoyaltyPageMetadata } from "@/lib/graphql/Query/LoyaltyPage/Metadata.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"
 
+import { getHotelData } from "../../hotels/query"
 import { metadataSchema } from "./output"
 import { affix } from "./utils"
 
@@ -86,10 +88,10 @@ const fetchMetadata = cache(async function fetchMemoizedMetadata<T>(
   return response.data
 })
 
-function getTransformedMetadata(data: unknown) {
+async function getTransformedMetadata(data: unknown) {
   transformMetadataCounter.add(1)
   console.info("contentstack.metadata transform start")
-  const validatedMetadata = metadataSchema.safeParse(data)
+  const validatedMetadata = await metadataSchema.safeParseAsync(data)
 
   if (!validatedMetadata.success) {
     transformMetadataFailCounter.add(1, {
@@ -112,7 +114,7 @@ function getTransformedMetadata(data: unknown) {
 }
 
 export const metadataQueryRouter = router({
-  get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
+  get: contentStackUidWithServiceProcedure.query(async ({ ctx }) => {
     const variables = {
       lang: ctx.lang,
       uid: ctx.uid,
@@ -139,6 +141,22 @@ export const metadataQueryRouter = router({
           loyalty_page: RawMetadataSchema
         }>(GetLoyaltyPageMetadata, variables)
         return getTransformedMetadata(loyaltyPageResponse.loyalty_page)
+      case PageTypeEnum.hotelPage:
+        const hotelPageResponse = await fetchMetadata<{
+          hotel_page: RawMetadataSchema
+        }>(GetHotelPageMetadata, variables)
+        const hotelPageData = hotelPageResponse.hotel_page
+        const hotelData = hotelPageData.hotel_page_id
+          ? await getHotelData(
+              { hotelId: hotelPageData.hotel_page_id, language: ctx.lang },
+              ctx.serviceToken
+            )
+          : null
+
+        return getTransformedMetadata({
+          ...hotelPageData,
+          hotelData: hotelData?.data.attributes,
+        })
       default:
         return null
     }

server/routers/contentstack/metadata/utils.ts

@@ -1,3 +1,5 @@
+import { getIntl } from "@/i18n"
+
 import { RTETypeEnum } from "@/types/rte/enums"
 import type { RawMetadataSchema } from "@/types/trpc/routers/contentstack/metadata"
 
@@ -58,11 +60,21 @@ function truncateTextAfterLastPeriod(
   return `${maxLengthText}...`
 }
 
-export function getTitle(data: RawMetadataSchema) {
+export async function getTitle(data: RawMetadataSchema) {
+  const intl = await getIntl()
   const metadata = data.web?.seo_metadata
   if (metadata?.title) {
     return metadata.title
   }
+  if (data.hotelData) {
+    return intl.formatMessage(
+      { id: "Stay at HOTEL_NAME | Hotel in DESTINATION" },
+      {
+        hotelName: data.hotelData.name,
+        destination: data.hotelData.address.city,
+      }
+    )
+  }
   if (data.web?.breadcrumbs?.title) {
     return data.web.breadcrumbs.title
   }
@@ -80,6 +92,9 @@ export function getDescription(data: RawMetadataSchema) {
   if (metadata?.description) {
     return metadata.description
   }
+  if (data.hotelData) {
+    return data.hotelData.hotelContent.texts.descriptions.short
+  }
   if (data.preamble) {
     return truncateTextAfterLastPeriod(data.preamble)
   }
@@ -102,28 +117,35 @@ export function getDescription(data: RawMetadataSchema) {
   return ""
 }
 
-export function getImages(data: RawMetadataSchema) {
+export function getImage(data: RawMetadataSchema) {
   const metadataImage = data.web?.seo_metadata?.seo_image
   const heroImage = data.hero_image
+  const hotelImage =
+    data.hotelData?.gallery?.heroImages?.[0] ||
+    data.hotelData?.gallery?.smallerImages?.[0]
 
   // Currently we don't have the possibility to get smaller images from ImageVault (2024-11-15)
   if (metadataImage) {
-    return [
-      {
-        url: metadataImage.url,
-        width: metadataImage.dimensions.width,
-        height: metadataImage.dimensions.height,
-      },
-    ]
+    return {
+      url: metadataImage.url,
+      alt: metadataImage.meta.alt || undefined,
+      width: metadataImage.dimensions.width,
+      height: metadataImage.dimensions.height,
+    }
+  }
+  if (hotelImage) {
+    return {
+      url: hotelImage.imageSizes.small,
+      alt: hotelImage.metaData.altText || undefined,
+    }
   }
   if (heroImage) {
-    return [
-      {
-        url: heroImage.url,
-        width: heroImage.dimensions.width,
-        height: heroImage.dimensions.height,
-      },
-    ]
+    return {
+      url: heroImage.url,
+      alt: heroImage.meta.alt || undefined,
+      width: heroImage.dimensions.width,
+      height: heroImage.dimensions.height,
+    }
   }
-  return []
+  return undefined
 }

server/routers/contentstack/reward/query.ts

@@ -131,13 +131,15 @@ export const rewardQueryRouter = router({
         .map((reward) => reward?.rewardId)
         .filter((id): id is string => Boolean(id))
 
-      const contentStackRewards = await getCmsRewards(ctx.lang, rewardIds)
+      const [contentStackRewards, loyaltyLevelsConfig] = await Promise.all([
+        getCmsRewards(ctx.lang, rewardIds),
+        getLoyaltyLevel(ctx, input.level_id),
+      ])
+
       if (!contentStackRewards) {
         return null
       }
 
-      const loyaltyLevelsConfig = await getLoyaltyLevel(ctx, input.level_id)
-
       const levelsWithRewards = apiRewards
         .map((reward) => {
           const contentStackReward = contentStackRewards.find((r) => {

server/routers/contentstack/schemas/blocks/table.ts

@@ -25,7 +25,7 @@ export const tableSchema = z.object({
           data: z.array(z.object({}).catchall(z.string())),
           skipReset: z.boolean(),
           tableActionEnabled: z.boolean(),
-          headerRowAdded: z.boolean(),
+          headerRowAdded: z.boolean().optional().default(false),
         }),
       }),
     })