Merged in feat/rework-contentstack (pull request #3493)

Feat(SW-3708): refactor contentstack fetching (removing all refs) and cache invalidation

* Remove all REFS

* Revalidate correct language

* PR fixes

* PR fixes

* Throw when errors from contentstack api


Approved-by: Joakim Jäderberg

packages/trpc/lib/routers/contentstack/campaignOverviewPage/query.ts

@@ -2,72 +2,20 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
 
 import { router } from "../../.."
 import { notFoundError } from "../../../errors"
-import {
-  GetCampaignOverviewPage,
-  GetCampaignOverviewPageRefs,
-} from "../../../graphql/Query/CampaignOverviewPage/CampaignOverviewPage.graphql"
+import { GetCampaignOverviewPage } from "../../../graphql/Query/CampaignOverviewPage/CampaignOverviewPage.graphql"
 import { request } from "../../../graphql/request"
 import { contentStackUidWithServiceProcedure } from "../../../procedures"
-import { generateRefsResponseTag } from "../../../utils/generateTag"
-import {
-  campaignOverviewPageRefsSchema,
-  campaignOverviewPageSchema,
-} from "./output"
-import { generatePageTags } from "./utils"
+import { generateTag } from "../../../utils/generateTag"
+import { campaignOverviewPageSchema } from "./output"
 
-import type {
-  GetCampaignOverviewPageData,
-  GetCampaignOverviewPageRefsData,
-} from "../../../types/campaignOverviewPage"
+import type { GetCampaignOverviewPageData } from "../../../types/campaignOverviewPage"
 import type { TrackingPageData } from "../../types"
 
 export const campaignOverviewPageQueryRouter = router({
   get: contentStackUidWithServiceProcedure.query(async ({ ctx }) => {
     const { lang, uid } = ctx
 
-    const getCampaignOverviewPageRefsCounter = createCounter(
-      "trpc.contentstack.campaignOverviewPage.get.refs"
-    )
-    const metricsGetCampaignOverviewPageRefs =
-      getCampaignOverviewPageRefsCounter.init({
-        lang,
-        uid,
-      })
-
-    metricsGetCampaignOverviewPageRefs.start()
-
-    const refVariables = { locale: lang, uid }
-    const refsResponse = await request<GetCampaignOverviewPageRefsData>(
-      GetCampaignOverviewPageRefs,
-      refVariables,
-      {
-        key: generateRefsResponseTag(lang, uid),
-        ttl: "max",
-      }
-    )
-
-    if (!refsResponse.data) {
-      metricsGetCampaignOverviewPageRefs.noDataError()
-
-      throw notFoundError({
-        message: "GetCampaignOverviewPageRefs returned no data",
-        errorDetails: refVariables,
-      })
-    }
-
-    const validatedRefsData = campaignOverviewPageRefsSchema.safeParse(
-      refsResponse.data
-    )
-    if (!validatedRefsData.success) {
-      metricsGetCampaignOverviewPageRefs.validationError(
-        validatedRefsData.error
-      )
-      return null
-    }
-
-    metricsGetCampaignOverviewPageRefs.success()
-
-    const tags = generatePageTags(validatedRefsData.data, lang)
+    const cacheKey = generateTag(lang, uid)
 
     const getCampaignOverviewPageCounter = createCounter(
       "trpc.contentstack.campaignOverviewPage.get"
@@ -84,7 +32,7 @@ export const campaignOverviewPageQueryRouter = router({
       GetCampaignOverviewPage,
       variables,
       {
-        key: tags,
+        key: `${cacheKey}:campaignOverviewPage`,
         ttl: "max",
       }
     )