fix: handle caching of card grids on content page blocks

server/routers/contentstack/contentPage/utils.ts

@@ -1,11 +1,11 @@
 import { metrics } from "@opentelemetry/api"
 
 import { Lang } from "@/constants/languages"
+import { batchRequest } from "@/lib/graphql/batchRequest"
 import {
   GetContentPageBlocksRefs,
   GetContentPageRefs,
 } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
-import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 
 import { generateTag, generateTagsFromSystem } from "@/utils/generateTag"
@@ -44,30 +44,30 @@ export async function fetchContentPageRefs(lang: Lang, uid: string) {
       query: { lang, uid },
     })
   )
-  const [mainRefsResponse, blockRefsResponse] = await Promise.all([
-    request<GetContentPageRefsSchema>(
-      GetContentPageRefs,
-      { locale: lang, uid },
-      {
+  const res = await batchRequest<GetContentPageRefsSchema>([
+    {
+      document: GetContentPageRefs,
+      variables: { locale: lang, uid },
+      options: {
         cache: "force-cache",
         next: {
           tags: [generateTag(lang, uid)],
         },
-      }
-    ),
-    request<GetContentPageRefsSchema>(
-      GetContentPageBlocksRefs,
-      { locale: lang, uid },
-      {
+      },
+    },
+    {
+      document: GetContentPageBlocksRefs,
+      variables: { locale: lang, uid },
+      options: {
         cache: "force-cache",
         next: {
-          tags: [generateTag(lang, uid)],
+          tags: [generateTag(lang, uid + 1)],
         },
-      }
-    ),
+      },
+    },
   ])
-  if (!mainRefsResponse.data) {
-    const notFoundError = notFound(mainRefsResponse)
+  if (!res.data) {
+    const notFoundError = notFound(res)
     getContentPageRefsFailCounter.add(1, {
       lang,
       uid,
@@ -88,22 +88,7 @@ export async function fetchContentPageRefs(lang: Lang, uid: string) {
     )
     throw notFoundError
   }
-  const responseData = {
-    ...mainRefsResponse.data,
-    content_page: {
-      ...mainRefsResponse.data.content_page,
-      blocks: blockRefsResponse.data.content_page.blocks,
-    },
-  }
-  return responseData
-}
-
-export function validateContentPageRefs(
-  data: GetContentPageRefsSchema,
-  lang: Lang,
-  uid: string
-) {
-  const validatedData = contentPageRefsSchema.safeParse(data)
+  const validatedData = contentPageRefsSchema.safeParse(res.data)
   if (!validatedData.success) {
     getContentPageRefsFailCounter.add(1, {
       lang,
@@ -192,6 +177,14 @@ export function getConnections({ content_page }: ContentPageRefs) {
           }
           break
         }
+        case ContentPageEnum.ContentStack.blocks.CardsGrid: {
+          if (block.cards_grid.length) {
+            block.cards_grid.forEach((card) => {
+              connections.push(card)
+            })
+          }
+          break
+        }
       }
     })
   }