Revert "chore(SW-303): fetch activity card from CS"

This reverts commit dde9ca190a.
This commit is contained in:
Matilda Landström
2024-09-09 08:46:31 +02:00
parent dde9ca190a
commit 72c8246384
9 changed files with 20 additions and 169 deletions

View File

@@ -1,50 +1,6 @@
import { z } from "zod"
import { HotelBlocksTypenameEnum } from "@/types/components/hotelPage/enums"
export const activityCardSchema = z.object({
background_image: z.any(),
cta_text: z.string(),
heading: z.string(),
open_in_new_tab: z.boolean(),
scripted_title: z.string().optional(),
body_text: z.string(),
hotel_page_activities_content_pageConnection: z.object({
edges: z.array(
z.object({
node: z.object({
url: z.string(),
web: z.object({
original_url: z.string().optional(),
}),
system: z.object({
locale: z.string(),
}),
}),
})
),
}),
})
export const validateHotelPageSchema = z.object({
hotel_page: z.object({
hotel_page_id: z.string(),
title: z.string(),
url: z.string(),
content: z
.array(
z.object({
__typename: z.literal(
HotelBlocksTypenameEnum.HotelPageContentUpcomingActivitiesCard
),
upcoming_activities_card: activityCardSchema.optional(),
})
)
.optional(),
}),
})
export const hotelPageSchema = z.object({
hotel_page: z.object({
hotel_page_id: z.string(),
title: z.string(),
@@ -56,6 +12,5 @@ export const hotelPageSchema = z.object({
export type HotelPageDataRaw = z.infer<typeof validateHotelPageSchema>
type HotelPageRaw = HotelPageDataRaw["hotel_page"]
export type HotelPage = HotelPageRaw
export type ActivityCard = z.infer<typeof activityCardSchema>
export type HotelPage = HotelPageRaw

View File

@@ -17,9 +17,6 @@ import {
} from "@/server/trpc"
import { toApiLang } from "@/server/utils"
import { makeImageVaultImage } from "@/utils/imageVault"
import { removeMultipleSlashes } from "@/utils/url"
import {
HotelPageDataRaw,
validateHotelPageSchema,
@@ -40,7 +37,6 @@ import {
import tempFilterData from "./tempFilterData.json"
import tempRatesData from "./tempRatesData.json"
import { HotelBlocksTypenameEnum } from "@/types/components/hotelPage/enums"
import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
const meter = metrics.getMeter("trpc.hotels")
@@ -56,10 +52,7 @@ const availabilityFailCounter = meter.createCounter(
"trpc.hotel.availability-fail"
)
async function getContenstackData(
locale: string,
uid: string | null | undefined
) {
async function getHotelId(locale: string, uid: string | null | undefined) {
const rawContentStackData = await request<HotelPageDataRaw>(GetHotelPage, {
locale,
uid,
@@ -81,7 +74,7 @@ async function getContenstackData(
return null
}
return hotelPageData.data.hotel_page
return hotelPageData.data.hotel_page.hotel_page_id
}
export const hotelQueryRouter = router({
@@ -90,8 +83,7 @@ export const hotelQueryRouter = router({
.query(async ({ ctx, input }) => {
const { lang, uid } = ctx
const { include } = input
const contentstackData = await getContenstackData(lang, uid)
const hotelId = contentstackData?.hotel_page_id
const hotelId = await getHotelId(lang, uid)
if (!hotelId) {
throw notFound(`Hotel not found for uid: ${uid}`)
@@ -211,32 +203,6 @@ export const hotelQueryRouter = router({
})
: []
const activities = contentstackData?.content
? contentstackData.content.map((block: any) => {
switch (block.__typename) {
case HotelBlocksTypenameEnum.HotelPageContentUpcomingActivitiesCard:
return {
...block.upcoming_activities_card,
background_image: makeImageVaultImage(
block.upcoming_activities_card.background_image
),
contentPage:
block.upcoming_activities_card?.hotel_page_activities_content_pageConnection?.edges.map(
({ node: contentPage }: { node: any }) => {
return {
href:
contentPage.web?.original_url ||
removeMultipleSlashes(
`/${contentPage.system.locale}/${contentPage.url}`
),
}
}
),
}
}
})[0]
: null
getHotelSuccessCounter.add(1, { hotelId, lang, include })
console.info(
"api.hotels.hotel success",
@@ -253,7 +219,6 @@ export const hotelQueryRouter = router({
hotelDetailedFacilities: hotelAttributes.detailedFacilities,
hotelImages: images,
roomCategories,
activitiesCard: activities,
}
}),
availability: router({