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/collectionPage/query.ts

@@ -4,12 +4,8 @@ import { router } from "../../.."
 import { GetCollectionPage } from "../../../graphql/Query/CollectionPage/CollectionPage.graphql"
 import { request } from "../../../graphql/request"
 import { contentstackExtendedProcedureUID } from "../../../procedures"
+import { generateTag } from "../../../utils/generateTag"
 import { collectionPageSchema } from "./output"
-import {
-  fetchCollectionPageRefs,
-  generatePageTags,
-  validateCollectionPageRefs,
-} from "./utils"
 
 import type { GetCollectionPageSchema } from "../../../types/collectionPage"
 import type { TrackingPageData } from "../../types"
@@ -18,17 +14,7 @@ export const collectionPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const { lang, uid } = ctx
 
-    const collectionPageRefsData = await fetchCollectionPageRefs(lang, uid)
-
-    const collectionPageRefs = validateCollectionPageRefs(
-      collectionPageRefsData,
-      lang,
-      uid
-    )
-    if (!collectionPageRefs) {
-      return null
-    }
-    const tags = generatePageTags(collectionPageRefs, lang)
+    const cacheKey = generateTag(lang, uid)
 
     const getCollectionPageCounter = createCounter(
       "trpc.contentstack.collectionPage.get"
@@ -44,7 +30,7 @@ export const collectionPageQueryRouter = router({
       GetCollectionPage,
       { locale: lang, uid },
       {
-        key: tags,
+        key: `${cacheKey}:collectionPage`,
         ttl: "max",
       }
     )