From b21c2640c2b0e961fde7e2e5e3a1d416d44474d0 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Fri, 19 Apr 2024 14:10:04 +0200
Subject: [PATCH] refactor: create page specific tRPC requests

---
 .../(protected)/my-pages/benefits/page.tsx    |  9 +++---
 .../(protected)/my-pages/overview/page.tsx    |  9 +++---
 .../routers/contentstack/accountPage/query.ts | 29 ++++++++++++++++---
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx b/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx
index 85cfe427b..05abd5962 100644
--- a/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx
@@ -8,10 +8,11 @@ import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function BenefitsPage({ params }: PageArgs<LangParams>) {
   const user = await serverClient().user.get()
-  const accountPage = await serverClient().contentstack.accountPage.get({
-    lang: params.lang,
-    uri: "/my-pages/benefits",
-  })
+  const accountPage = await serverClient().contentstack.accountPage.getBenefits(
+    {
+      lang: params.lang,
+    }
+  )
 
   return (
     <main className={styles.container}>
diff --git a/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx b/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx
index 22348e4e9..c396d9b20 100644
--- a/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx
@@ -10,10 +10,11 @@ import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function MyPageOverview({ params }: PageArgs<LangParams>) {
   const user = await serverClient().user.get()
-  const accountPage = await serverClient().contentstack.accountPage.get({
-    uri: "/my-pages/overview",
-    lang: params.lang,
-  })
+  const accountPage = await serverClient().contentstack.accountPage.getOverview(
+    {
+      lang: params.lang,
+    }
+  )
 
   return (
     <MaxWidth className={styles.blocks} tag="main">
diff --git a/server/routers/contentstack/accountPage/query.ts b/server/routers/contentstack/accountPage/query.ts
index 1f1419c69..6d3035c38 100644
--- a/server/routers/contentstack/accountPage/query.ts
+++ b/server/routers/contentstack/accountPage/query.ts
@@ -6,17 +6,38 @@ import { Lang } from "@/constants/languages"
 import GetAccountPage from "@/lib/graphql/Query/AccountPage.graphql"
 import type { GetAccountPageData } from "@/types/requests/myPages/accountpage"
 export const accountPageQueryRouter = router({
-  get: publicProcedure
-    .input(z.object({ uri: z.string(), lang: z.nativeEnum(Lang) }))
+  getOverview: publicProcedure
+    .input(z.object({ lang: z.nativeEnum(Lang) }))
     .query(async ({ input }) => {
+      const url = "/my-pages/overview"
       const accountPage = await request<GetAccountPageData>(
         GetAccountPage,
         {
           locale: input.lang,
-          url: input.uri,
+          url,
         },
         {
-          tags: [`${input.uri}-${input.lang}`],
+          tags: [`${url}-${input.lang}`],
+        }
+      )
+      if (accountPage.data && accountPage.data.all_account_page.total) {
+        return accountPage.data.all_account_page.items[0]
+      }
+
+      throw badRequestError()
+    }),
+  getBenefits: publicProcedure
+    .input(z.object({ lang: z.nativeEnum(Lang) }))
+    .query(async ({ input }) => {
+      const url = "/my-pages/overview"
+      const accountPage = await request<GetAccountPageData>(
+        GetAccountPage,
+        {
+          locale: input.lang,
+          url,
+        },
+        {
+          tags: [`${url}-${input.lang}`],
         }
       )
       if (accountPage.data && accountPage.data.all_account_page.total) {