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

@@ -2,20 +2,11 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
 
 import { router } from "../../.."
 import { notFoundError } from "../../../errors"
-import {
-  GetStartPage,
-  GetStartPageRefs,
-} from "../../../graphql/Query/StartPage/StartPage.graphql"
+import { GetStartPage } from "../../../graphql/Query/StartPage/StartPage.graphql"
 import { request } from "../../../graphql/request"
 import { contentstackExtendedProcedureUID } from "../../../procedures"
-import {
-  generateRefsResponseTag,
-  generateTag,
-  generateTagsFromAssetSystem,
-  generateTagsFromSystem,
-} from "../../../utils/generateTag"
-import { startPageRefsSchema, startPageSchema } from "./output"
-import { getConnections } from "./utils"
+import { generateTag } from "../../../utils/generateTag"
+import { startPageSchema } from "./output"
 
 import type { z } from "zod"
 
@@ -25,66 +16,19 @@ import type { blocksSchema } from "./output"
 export interface GetStartPageData extends z.input<typeof startPageSchema> {}
 export interface StartPage extends z.output<typeof startPageSchema> {}
 
-export interface GetStartPageRefsSchema extends z.input<
-  typeof startPageRefsSchema
-> {}
-
 export type Block = z.output<typeof blocksSchema>
 
 export const startPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const { lang, uid } = ctx
 
-    const getStartPageRefsCounter = createCounter(
-      "trpc.contentstack.startPage.get.refs"
-    )
-    const metricsGetStartPageRefs = getStartPageRefsCounter.init({ lang, uid })
-
-    metricsGetStartPageRefs.start()
-
-    const refsResponse = await request<GetStartPageRefsSchema>(
-      GetStartPageRefs,
-      {
-        locale: lang,
-        uid,
-      },
-      {
-        key: generateRefsResponseTag(lang, uid),
-        ttl: "max",
-      }
-    )
-    if (!refsResponse.data) {
-      metricsGetStartPageRefs.noDataError()
-      throw notFoundError({
-        message: "StartPage refs returned no data",
-        errorDetails: { lang, uid },
-      })
-    }
-
-    const validatedRefsData = startPageRefsSchema.safeParse(refsResponse.data)
-
-    if (!validatedRefsData.success) {
-      metricsGetStartPageRefs.validationError(validatedRefsData.error)
-      return null
-    }
-
-    metricsGetStartPageRefs.success()
+    const cacheKey = generateTag(lang, uid)
 
     const getStartPageCounter = createCounter("trpc.contentstack.startPage.get")
     const metricsGetStartPage = getStartPageCounter.init({ lang, uid })
 
     metricsGetStartPage.start()
 
-    const { connections, assetConnections } = getConnections(
-      validatedRefsData.data
-    )
-
-    const tags = [
-      generateTagsFromSystem(lang, connections),
-      generateTagsFromAssetSystem(assetConnections),
-      generateTag(lang, validatedRefsData.data.start_page.system.uid),
-    ].flat()
-
     const response = await request<GetStartPageData>(
       GetStartPage,
       {
@@ -92,7 +36,7 @@ export const startPageQueryRouter = router({
         uid,
       },
       {
-        key: tags,
+        key: `${cacheKey}`,
         ttl: "max",
       }
     )