Merged in feat/book-228-campaign (pull request #2818)

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

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<GetCampaignPagesByHotelUidRefsData>(
     GetCampaignPagesByHotelUidRefs,
     {
@@ -126,12 +130,8 @@ export async function getCampaignPagesByHotelPageUid(
       today,
     },
     {
-      key: generateRefsResponseTag(
+      key: refsTag,
-        lang,
+      ttl: "1d",
-        `${hotelPageUid}-${today}`,
-        "hotel_page_campaigns"
-      ),
-      ttl: "max",
     }
   )
 
@@ -176,8 +176,8 @@ export async function getCampaignPagesByHotelPageUid(
       today,
     },
     {
-      key: tags,
+      key: [...tags, refsTag],
-      ttl: "max",
+      ttl: "1d",
     }
   )
 

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