refactor: DRY up trpc query

app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx

@@ -7,11 +7,10 @@ import styles from "./page.module.css"
 import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function BenefitsPage({ params }: PageArgs<LangParams>) {
-  const accountPage = await serverClient().contentstack.accountPage.getBenefits(
+  const accountPage = await serverClient().contentstack.accountPage.get({
-    {
+    url: "/my-pages/benefits",
-      lang: params.lang,
+    lang: params.lang,
-    }
+  })
-  )
 
   return (
     <main className={styles.container}>

app/[lang]/(live)/(protected)/my-pages/overview/page.tsx

@@ -9,11 +9,10 @@ import styles from "./page.module.css"
 import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function MyPageOverview({ params }: PageArgs<LangParams>) {
-  const accountPage = await serverClient().contentstack.accountPage.getOverview(
+  const accountPage = await serverClient().contentstack.accountPage.get({
-    {
+    url: "/my-pages/overview",
-      lang: params.lang,
+    lang: params.lang,
-    }
+  })
-  )
 
   return (
     <MaxWidth className={styles.blocks} tag="main">

server/routers/contentstack/accountPage/input.ts

@@ -2,4 +2,7 @@ import { z } from "zod"
 
 import { Lang } from "@/constants/languages"
 
-export const getAccountPageInput = z.object({ lang: z.nativeEnum(Lang) })
+export const getAccountPageInput = z.object({
+  url: z.string(),
+  lang: z.nativeEnum(Lang),
+})

server/routers/contentstack/accountPage/query.ts

@@ -15,118 +15,58 @@ import { Edges } from "@/types/requests/utils/edges"
 import { RTEDocument } from "@/types/rte/node"
 
 export const accountPageQueryRouter = router({
-  getOverview: publicProcedure
+  get: publicProcedure.input(getAccountPageInput).query(async ({ input }) => {
-    .input(getAccountPageInput)
+    try {
-    .query(async ({ input }) => {
+      const response = await request<GetAccountPageData>(GetAccountPage, {
-      try {
+        locale: input.lang,
-        const url = "/my-pages/overview"
+        url: input.url,
-        const response = await request<GetAccountPageData>(GetAccountPage, {
+      })
-          locale: input.lang,
-          url,
-        })
 
-        if (!response.data) {
+      if (!response.data) {
-          throw badRequestError()
+        throw badRequestError()
-        }
+      }
 
-        const validatedAccountPage = validateAccountPageSchema.safeParse(
+      const validatedAccountPage = validateAccountPageSchema.safeParse(
-          response.data
+        response.data
+      )
+
+      if (!validatedAccountPage.success) {
+        throw badRequestError()
+      }
+      // TODO: Make returned data nicer
+      const content =
+        validatedAccountPage.data.all_account_page.items[0].content.map(
+          (block) => {
+            switch (block.__typename) {
+              case ContentEntries.AccountPageContentDynamicContent:
+              case ContentEntries.AccountPageContentShortcuts:
+                return block
+              case ContentEntries.AccountPageContentTextContent:
+                return {
+                  ...block,
+                  text_content: {
+                    content: {
+                      json: block.text_content.content.json as RTEDocument,
+                      embedded_itemsConnection: block.text_content.content
+                        .embedded_itemsConnection as Edges<Embeds>,
+                    },
+                  },
+                }
+              default:
+                return null
+            }
+          }
         )
 
-        if (!validatedAccountPage.success) {
+      const accountPage = {
-          throw badRequestError()
+        ...validatedAccountPage.data.all_account_page.items[0],
-        }
+        content,
-        // TODO: Make returned data nicer
+      } as AccountPage
-        const content =
+      return accountPage
-          validatedAccountPage.data.all_account_page.items[0].content.map(
+    } catch (error) {
-            (block) => {
+      console.info(`Get Account Page Overview Error`)
-              switch (block.__typename) {
+      console.error(error)
-                case ContentEntries.AccountPageContentDynamicContent:
+      throw internalServerError()
-                case ContentEntries.AccountPageContentShortcuts:
+    }
-                  return block
+  }),
-                case ContentEntries.AccountPageContentTextContent:
-                  return {
-                    ...block,
-                    text_content: {
-                      content: {
-                        json: block.text_content.content.json as RTEDocument,
-                        embedded_itemsConnection: block.text_content.content
-                          .embedded_itemsConnection as Edges<Embeds>,
-                      },
-                    },
-                  }
-                default:
-                  return null
-              }
-            }
-          )
-
-        const accountPage = {
-          ...validatedAccountPage.data.all_account_page.items[0],
-          content,
-        } as AccountPage
-        return accountPage
-      } catch (error) {
-        console.info(`Get Account Page Overview Error`)
-        console.error(error)
-        throw internalServerError()
-      }
-    }),
-  getBenefits: publicProcedure
-    .input(getAccountPageInput)
-    .query(async ({ input }) => {
-      try {
-        const url = "/my-pages/benefits"
-        const response = await request<GetAccountPageData>(GetAccountPage, {
-          locale: input.lang,
-          url,
-        })
-
-        if (!response.data) {
-          throw badRequestError()
-        }
-
-        const validatedAccountPage = validateAccountPageSchema.safeParse(
-          response.data
-        )
-
-        if (!validatedAccountPage.success) {
-          throw badRequestError()
-        }
-
-        const content =
-          validatedAccountPage.data.all_account_page.items[0].content.map(
-            (block) => {
-              switch (block.__typename) {
-                case ContentEntries.AccountPageContentDynamicContent:
-                case ContentEntries.AccountPageContentShortcuts:
-                  return block
-                case ContentEntries.AccountPageContentTextContent:
-                  return {
-                    ...block,
-                    text_content: {
-                      content: {
-                        json: block.text_content.content.json as RTEDocument,
-                        embedded_itemsConnection: block.text_content.content
-                          .embedded_itemsConnection as Edges<Embeds>,
-                      },
-                    },
-                  }
-                default:
-                  return null
-              }
-            }
-          )
-
-        const accountPage = {
-          ...validatedAccountPage.data.all_account_page.items[0],
-          content,
-        } as AccountPage
-        return accountPage
-      } catch (error) {
-        console.info(`Get Account Page Benefits Error`)
-        console.error(error)
-        throw internalServerError()
-      }
-    }),
 })