From eea2a63835de084e921cc71c149bfdd96b3c9cb1 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Wed, 17 Sep 2025 07:57:51 +0000 Subject: [PATCH] Merged in feat/book-228-campaign (pull request #2818) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(book-228): campaign cache fixes * feat(book-228): campaign cache fixes Approved-by: Erik Tiekstra Approved-by: Joakim Jäderberg Approved-by: Matilda Landström --- .../routers/contentstack/campaignPage/utils.ts | 18 +++++++++--------- packages/trpc/lib/utils/generateTag.ts | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/trpc/lib/routers/contentstack/campaignPage/utils.ts b/packages/trpc/lib/routers/contentstack/campaignPage/utils.ts index 9b61675ba..485dac58f 100644 --- a/packages/trpc/lib/routers/contentstack/campaignPage/utils.ts +++ b/packages/trpc/lib/routers/contentstack/campaignPage/utils.ts @@ -117,7 +117,11 @@ export async function getCampaignPagesByHotelPageUid( }) metricsGetCampaignPagesByHotelUidRefs.start() - + const refsTag = generateRefsResponseTag( + lang, + `${hotelPageUid}-${today}`, + "hotel_page_campaigns" + ) const refsResponse = await request( GetCampaignPagesByHotelUidRefs, { @@ -126,12 +130,8 @@ export async function getCampaignPagesByHotelPageUid( today, }, { - key: generateRefsResponseTag( - lang, - `${hotelPageUid}-${today}`, - "hotel_page_campaigns" - ), - ttl: "max", + key: refsTag, + ttl: "1d", } ) @@ -176,8 +176,8 @@ export async function getCampaignPagesByHotelPageUid( today, }, { - key: tags, - ttl: "max", + key: [...tags, refsTag], + ttl: "1d", } ) diff --git a/packages/trpc/lib/utils/generateTag.ts b/packages/trpc/lib/utils/generateTag.ts index 173c43c2c..057cd7e04 100644 --- a/packages/trpc/lib/utils/generateTag.ts +++ b/packages/trpc/lib/utils/generateTag.ts @@ -77,7 +77,7 @@ export function generateTagsFromSystem( connections: System["system"][] ) { return connections.map((system) => { - return generateRefTag( + return generateTag( system.locale ?? lang, system.content_type_uid, system.uid