scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: DRY up trpc query

Browse Source
This commit is contained in:
Arvid Norlin
2024-04-29 16:48:47 +02:00
parent f01bd44c44
commit a43dc8a16f
4 changed files with 62 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(
{
lang: params.lang,
}
)
const accountPage = await serverClient().contentstack.accountPage.get({
url: "/my-pages/benefits",
lang: params.lang,
})
return (
<main className={styles.container}>

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

@@ -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(
{
lang: params.lang,
}
)
const accountPage = await serverClient().contentstack.accountPage.get({
url: "/my-pages/overview",
lang: params.lang,
})
return (
<MaxWidth className={styles.blocks} tag="main">

5
server/routers/contentstack/accountPage/input.ts
View File

@@ -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),
})

160
server/routers/contentstack/accountPage/query.ts
View File

@@ -15,118 +15,58 @@ import { Edges } from "@/types/requests/utils/edges"
import { RTEDocument } from "@/types/rte/node"
export const accountPageQueryRouter = router({
getOverview: publicProcedure
.input(getAccountPageInput)
.query(async ({ input }) => {
try {
const url = "/my-pages/overview"
const response = await request<GetAccountPageData>(GetAccountPage, {
locale: input.lang,
url,
})
get: publicProcedure.input(getAccountPageInput).query(async ({ input }) => {
try {
const response = await request<GetAccountPageData>(GetAccountPage, {
locale: input.lang,
url: input.url,
})
if (!response.data) {
throw badRequestError()
}
if (!response.data) {
throw badRequestError()
}
const validatedAccountPage = validateAccountPageSchema.safeParse(
response.data
const validatedAccountPage = validateAccountPageSchema.safeParse(
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) {
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
}
}
)
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()
}
}),
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()
}
}),
})