scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat/SW-3028 hotel page campaigns

Browse Source 
* feat(SW-3028): Added query and typings to fetch campaigns by hotelUid
* feat(SW-3028): Added components for campaigns to the hotel page
* feat(SW-3028): Implemented prioritized campaigns list
* chore(SW-3028): Refactor how campaigns are fetched on hotel pages
* feat(SW-3028): Added offers/campaigns to tab navigation

Approved-by: Matilda Landström
This commit is contained in:
Erik Tiekstra
2025-08-21 13:00:34 +00:00
parent 456e10c674
commit 2064732e56
22 changed files with 566 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/trpc/lib/graphql/Query/CampaignPage/CampaignPagesByHotelUid.graphql Normal file
View File

@@ -0,0 +1,45 @@
#import "../../Fragments/System.graphql"
#import "../../Fragments/CampaignPage/Hero.graphql"
query GetCampaignPagesByHotelUid($locale: String!, $hotelPageUid: String!) {
all_campaign_page(
where: {
OR: [
{ included_hotels: { list_1: { hotel_page: { uid: $hotelPageUid } } } }
{ included_hotels: { list_2: { hotel_page: { uid: $hotelPageUid } } } }
]
}
locale: $locale
) {
items {
heading
url
card_content {
heading
image
text
}
...Hero_CampaignPage
system {
...System
}
}
}
}
query GetCampaignPagesByHotelUidRefs($locale: String!, $hotelPageUid: String!) {
all_campaign_page(
where: {
OR: [
{ included_hotels: { list_1: { hotel_page: { uid: $hotelPageUid } } } }
{ included_hotels: { list_2: { hotel_page: { uid: $hotelPageUid } } } }
]
}
locale: $locale
) {
items {
...CampaignPageRef
}
}
}

15
packages/trpc/lib/graphql/Query/HotelPage/HotelPage.graphql
View File

@@ -23,6 +23,21 @@ query GetHotelPage($locale: String!, $uid: String!) {
offers
faq
}
campaigns {
heading
preamble
prioritized_campaignsConnection {
edges {
node {
... on CampaignPage {
system {
uid
}
}
}
}
}
}
faq {
__typename
title

5
packages/trpc/lib/routers/contentstack/campaignPage/input.ts Normal file
View File

@@ -0,0 +1,5 @@
import { z } from "zod"
export const getCampaignPagesByHotelUidInput = z.object({
hotelPageUid: z.string(),
})

66
packages/trpc/lib/routers/contentstack/campaignPage/output.ts
View File

@@ -1,5 +1,7 @@
import { z } from "zod"
import { removeMultipleSlashes } from "@scandic-hotels/common/utils/url"
import { CampaignPageEnum } from "../../../types/campaignPage"
import { discriminatedUnionArray } from "../../../utils/discriminatedUnion"
import {
@@ -20,6 +22,8 @@ import {
import { systemSchema } from "../schemas/system"
import { getCarouselCardsBlockWithBookingCodeLinks } from "./utils"
import type { ImageVaultAsset } from "../../../types/imageVault"
const campaignPageEssentials = z
.object({
__typename: z.literal(CampaignPageEnum.ContentStack.blocks.Essentials),
@@ -173,6 +177,56 @@ export const campaignPageSchema = z
}
})
export const campaignPagesByHotelUidSchema = z
.object({
all_campaign_page: z.object({
items: z
.array(
z.object({
heading: z.string(),
url: z.string(),
card_content: z
.object({
image: tempImageVaultAssetSchema,
heading: z.string().nullish(),
text: z.string().nullish(),
})
.nullish(),
hero: heroSchema,
system: systemSchema,
})
)
.transform((data) => {
const mappedCampaigns = data.map((campaign) => {
const { card_content, hero, system, heading, url } = campaign
const hasImage = !!(card_content?.image || hero.image)
const cardContentImage = card_content?.image || hero.image
const heroImage = hero.image || card_content?.image
if (hasImage) {
return {
id: system.uid,
url: removeMultipleSlashes(`/${system.locale}/${url}`),
card_content: {
...card_content,
heading: card_content?.heading || heading,
image: (cardContentImage || heroImage) as ImageVaultAsset,
},
hero: {
...hero,
image: (heroImage || cardContentImage) as ImageVaultAsset,
heading,
},
}
}
return null
})
return mappedCampaigns.filter((item) => !!item)
}),
}),
})
.transform((data) => data.all_campaign_page.items)
/** REFS */
const campaignPageCarouselCardsRef = z
.object({
@@ -203,3 +257,15 @@ export const campaignPageRefsSchema = z.object({
system: systemSchema,
}),
})
export const campaignPagesByHotelUidRefsSchema = z
.object({
all_campaign_page: z.object({
items: z.array(
z.object({
system: systemSchema,
})
),
}),
})
.transform((data) => data.all_campaign_page.items.map((item) => item.system))

115
packages/trpc/lib/routers/contentstack/campaignPage/utils.ts
View File

@@ -1,12 +1,32 @@
import { createCounter } from "@scandic-hotels/common/telemetry"
import { notFound } from "../../../errors"
import {
GetCampaignPagesByHotelUid,
GetCampaignPagesByHotelUidRefs,
} from "../../../graphql/Query/CampaignPage/CampaignPagesByHotelUid.graphql"
import { request } from "../../../graphql/request"
import {
CampaignPageEnum,
type CampaignPageRefs,
} from "../../../types/campaignPage"
import { generateTag, generateTagsFromSystem } from "../../../utils/generateTag"
import {
generateRefsResponseTag,
generateTag,
generateTagsFromSystem,
} from "../../../utils/generateTag"
import {
campaignPagesByHotelUidRefsSchema,
campaignPagesByHotelUidSchema,
} from "./output"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { CarouselCardsBlock } from "../../../types/campaignPage"
import type {
CarouselCardsBlock,
GetCampaignPagesByHotelUidData,
GetCampaignPagesByHotelUidRefsData,
} from "../../../types/campaignPage"
import type { System } from "../schemas/system"
export function generatePageTags(
@@ -78,3 +98,94 @@ export function getCarouselCardsBlockWithBookingCodeLinks(
},
}
}
export async function getCampaignPagesByHotelPageUid(
hotelPageUid: string,
lang: Lang
) {
const getCampaignPagesByHotelUidRefsCounter = createCounter(
"trpc.contentstack",
"campaignPage.byHotelUid.get.refs"
)
const metricsGetCampaignPagesByHotelUidRefs =
getCampaignPagesByHotelUidRefsCounter.init({
lang,
hotelPageUid,
})
metricsGetCampaignPagesByHotelUidRefs.start()
const refsResponse = await request<GetCampaignPagesByHotelUidRefsData>(
GetCampaignPagesByHotelUidRefs,
{
locale: lang,
hotelPageUid,
},
{
key: generateRefsResponseTag(lang, hotelPageUid, "hotel_page_campaigns"),
ttl: "max",
}
)
if (!refsResponse.data) {
const notFoundError = notFound(refsResponse)
metricsGetCampaignPagesByHotelUidRefs.noDataError()
throw notFoundError
}
const validatedRefsData = campaignPagesByHotelUidRefsSchema.safeParse(
refsResponse.data
)
if (!validatedRefsData.success) {
metricsGetCampaignPagesByHotelUidRefs.validationError(
validatedRefsData.error
)
return null
}
metricsGetCampaignPagesByHotelUidRefs.success()
const tags = generateTagsFromSystem(lang, validatedRefsData.data)
const getCampaignPagesByHotelUidCounter = createCounter(
"trpc.contentstack",
"campaignPage.byHotelUid.get"
)
const metricsGetCampaignPagesByHotelUid =
getCampaignPagesByHotelUidCounter.init({
lang,
hotelPageUid,
})
metricsGetCampaignPagesByHotelUid.start()
const response = await request<GetCampaignPagesByHotelUidData>(
GetCampaignPagesByHotelUid,
{
locale: lang,
hotelPageUid,
},
{
key: tags,
ttl: "max",
}
)
if (!response.data) {
metricsGetCampaignPagesByHotelUid.noDataError()
return null
}
const validatedResponse = campaignPagesByHotelUidSchema.safeParse(
response.data
)
if (!validatedResponse.success) {
metricsGetCampaignPagesByHotelUid.validationError(validatedResponse.error)
return null
}
metricsGetCampaignPagesByHotelUid.success()
return validatedResponse.data
}

28
packages/trpc/lib/routers/contentstack/hotelPage/output.ts
View File

@@ -70,6 +70,34 @@ export const hotelPageSchema = z.object({
hotel_page_id: z.string(),
title: z.string(),
url: z.string(),
campaigns: z
.object({
heading: z.string(),
preamble: z.string(),
prioritized_campaignsConnection: z.object({
edges: z.array(
z.object({
node: z.object({
system: z.object({
uid: z.string(),
}),
}),
})
),
}),
})
.nullish()
.transform((data) => {
const prioritizedCampaigns =
data?.prioritized_campaignsConnection.edges.map(
(edge) => edge.node.system.uid
) || []
return {
heading: data?.heading,
preamble: data?.preamble,
prioritizedCampaigns,
}
}),
system: systemSchema.merge(
z.object({
created_at: z.string(),

26
packages/trpc/lib/routers/contentstack/hotelPage/query.ts
View File

@@ -6,7 +6,9 @@ import { GetHotelPage } from "../../../graphql/Query/HotelPage/HotelPage.graphql
import { request } from "../../../graphql/request"
import { contentstackExtendedProcedureUID } from "../../../procedures"
import { generateTag } from "../../../utils/generateTag"
import { getCampaignPagesByHotelPageUid } from "../campaignPage/utils"
import { hotelPageSchema } from "./output"
import { getSortedCampaigns } from "./utils"
import type { GetHotelPageData } from "../../../types/hotelPage"
@@ -22,7 +24,7 @@ export const hotelPageQueryRouter = router({
metricsGetHotelPage.start()
const response = await request<GetHotelPageData>(
const hotelPageResponse = await request<GetHotelPageData>(
GetHotelPage,
{
locale: lang,
@@ -33,13 +35,14 @@ export const hotelPageQueryRouter = router({
ttl: "max",
}
)
if (!response.data) {
const notFoundError = notFound(response)
if (!hotelPageResponse.data) {
const notFoundError = notFound(hotelPageResponse)
metricsGetHotelPage.noDataError()
throw notFoundError
}
const validatedHotelPage = hotelPageSchema.safeParse(response.data)
const validatedHotelPage = hotelPageSchema.safeParse(hotelPageResponse.data)
if (!validatedHotelPage.success) {
metricsGetHotelPage.validationError(validatedHotelPage.error)
@@ -48,6 +51,19 @@ export const hotelPageQueryRouter = router({
metricsGetHotelPage.success()
return validatedHotelPage.data.hotel_page
const hotelCampaigns = await getCampaignPagesByHotelPageUid(uid, lang)
const hotelPage = validatedHotelPage.data.hotel_page
const { prioritizedCampaigns, ...campaignsBlockContent } =
hotelPage.campaigns
return {
...hotelPage,
campaignsBlock: hotelCampaigns?.length
? {
...campaignsBlockContent,
campaigns: getSortedCampaigns(prioritizedCampaigns, hotelCampaigns),
}
: null,
}
}),
})

14
packages/trpc/lib/routers/contentstack/hotelPage/utils.ts
View File

@@ -7,6 +7,7 @@ import { batchedHotelPageUrlsSchema, hotelPageCountSchema } from "./output"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { Campaigns } from "../../../types/campaignPage"
import type {
GetHotelPageCountData,
GetHotelPageUrlsData,
@@ -97,3 +98,16 @@ export async function getHotelPageUrls(lang: Lang) {
return validatedResponse.data
}
export function getSortedCampaigns(
prioritizedCampaignUids: string[],
campaigns: Campaigns
) {
const prioritizedSet = new Set(prioritizedCampaignUids)
const prioritized = prioritizedCampaignUids.flatMap((id) => {
const found = campaigns.find((c) => c.id === id)
return found ? [found] : []
})
const others = campaigns.filter((c) => !prioritizedSet.has(c.id))
return [...prioritized, ...others]
}

10
packages/trpc/lib/types/campaignPage.ts
View File

@@ -2,6 +2,8 @@ import type { z } from "zod"
import type {
campaignPageRefsSchema,
campaignPagesByHotelUidRefsSchema,
campaignPagesByHotelUidSchema,
campaignPageSchema,
heroSchema,
} from "../routers/contentstack/campaignPage/output"
@@ -37,3 +39,11 @@ export interface CarouselCardsBlock
export type EssentialsBlock = z.output<typeof essentialsSchema>["essentials"]
export type Hero = z.output<typeof heroSchema>
export interface GetCampaignPagesByHotelUidData
extends z.input<typeof campaignPagesByHotelUidSchema> {}
export interface GetCampaignPagesByHotelUidRefsData
extends z.input<typeof campaignPagesByHotelUidRefsSchema> {}
export interface Campaigns
extends z.output<typeof campaignPagesByHotelUidSchema> {}