refactor: cleanup

This commit is contained in:
Matilda Landström
2024-05-23 16:29:40 +02:00
parent 4cfd908024
commit c8db459b9b
2 changed files with 18 additions and 44 deletions

View File

@@ -29,7 +29,7 @@ export const validateBreadcrumbsRefsConstenstackSchema = z.object({
}),
})
export const validateBreadcrumbsConstenstackSchema = z.object({
export const validateBreadcrumbsContenstackSchema = z.object({
all_account_page: z.object({
items: z.array(
z.object({
@@ -68,7 +68,7 @@ export const getBreadcrumbsSchema = z.array(
})
)
export const validateBreadcrumbsRefsConstenstackSchemaLoyalty = z.object({
export const validateBreadcrumbsRefsContenstackSchemaLoyalty = z.object({
all_loyalty_page: z.object({
items: z.array(
z.object({
@@ -97,7 +97,7 @@ export const validateBreadcrumbsRefsConstenstackSchemaLoyalty = z.object({
}),
})
export const validateBreadcrumbsConstenstackSchemaLoyalty = z.object({
export const validateBreadcrumbsContenstackSchemaLoyalty = z.object({
all_loyalty_page: z.object({
items: z.array(
z.object({

View File

@@ -19,10 +19,10 @@ import { removeMultipleSlashes } from "@/utils/url"
import {
getBreadcrumbsSchema,
validateBreadcrumbsConstenstackSchema,
validateBreadcrumbsConstenstackSchemaLoyalty,
validateBreadcrumbsContenstackSchema,
validateBreadcrumbsContenstackSchemaLoyalty,
validateBreadcrumbsRefsConstenstackSchema,
validateBreadcrumbsRefsConstenstackSchemaLoyalty,
validateBreadcrumbsRefsContenstackSchemaLoyalty,
} from "./output"
import {
affix,
@@ -49,8 +49,7 @@ export const breadcrumbsQueryRouter = router({
},
}
)
console.log(ctx.pathname)
console.log(refsResponse.data.all_account_page)
if (!refsResponse.data) {
throw notFound(refsResponse)
}
@@ -60,29 +59,23 @@ export const breadcrumbsQueryRouter = router({
if (!validatedRefsData.success) {
throw internalServerError(validatedRefsData.error)
}
console.log(validatedRefsData.data)
const connections = getConnections(validatedRefsData.data)
console.log(connections)
const tags = generateTags(ctx.lang, connections)
console.log(tags)
const page = validatedRefsData.data.all_account_page.items[0]
console.log(page)
const connections = getConnections(validatedRefsData.data)
const tags = generateTags(ctx.lang, connections)
const page = validatedRefsData.data.all_account_page.items[0]
tags.push(generateTag(ctx.lang, page.system.uid, affix))
console.log(tags)
const response = await request<GetAccountPageBreadcrumbsData>(
GetAccountPageBreadcrumbs,
{ locale: ctx.lang, url: ctx.pathname },
{ next: { tags } }
)
console.log(response.data)
if (!response.data) {
throw notFound(response)
}
const validatedBreadcrumbsData =
validateBreadcrumbsConstenstackSchema.safeParse(response.data)
validateBreadcrumbsContenstackSchema.safeParse(response.data)
if (!validatedBreadcrumbsData.success) {
throw internalServerError(validatedBreadcrumbsData.error)
@@ -114,7 +107,6 @@ export const breadcrumbsQueryRouter = router({
parentBreadcrumbs,
pageBreadcrumb,
].flat()
console.log(breadcrumbs)
const validatedBreadcrumbs = getBreadcrumbsSchema.safeParse(breadcrumbs)
if (!validatedBreadcrumbs.success) {
@@ -124,7 +116,6 @@ export const breadcrumbsQueryRouter = router({
return validatedBreadcrumbs.data
}),
loyalty: contentstackProcedure.query(async ({ ctx }) => {
console.log("HEJ", ctx)
const refsResponse = await request<GetLoyaltyPageBreadcrumbsRefsData>(
GetLoyaltyPageBreadcrumbsRefs,
{ locale: ctx.lang, url: ctx.pathname },
@@ -139,50 +130,34 @@ export const breadcrumbsQueryRouter = router({
if (!refsResponse.data) {
throw notFound(refsResponse)
}
/*if (refsResponse.data.all_loyalty_page.items) {
Object.assign(
refsResponse.data.all_loyalty_page.items,
refsResponse.data.all_loyalty_page.items[0].web
)
delete refsResponse.data.all_loyalty_page.items[0].web
}*/
console.log(
refsResponse.data.all_loyalty_page.items[0].web.breadcrumbss
.parentsConnection
)
const validatedRefsData =
validateBreadcrumbsRefsConstenstackSchemaLoyalty.safeParse(
validateBreadcrumbsRefsContenstackSchemaLoyalty.safeParse(
refsResponse.data
)
console.log("VALI", validatedRefsData)
if (!validatedRefsData.success) {
throw internalServerError(validatedRefsData.error)
}
console.log(
validatedRefsData.data.all_loyalty_page.items[0].web.breadcrumbss
)
const connections = getConnectionsLoyalty(validatedRefsData.data)
console.log(connections)
const tags = generateTags(ctx.lang, connections)
console.log(tags)
const page = validatedRefsData.data.all_loyalty_page.items[0]
console.log(page)
tags.push(generateTag(ctx.lang, page.system.uid, affix))
console.log(tags)
const response = await request<GetLoyaltyPageBreadcrumbsData>(
GetLoyaltyPageBreadcrumbs,
{ locale: ctx.lang, url: ctx.pathname },
{ next: { tags } }
)
console.log(response.data)
if (!response.data) {
throw notFound(response)
}
const validatedBreadcrumbsData =
validateBreadcrumbsConstenstackSchemaLoyalty.safeParse(response.data)
console.log(validatedBreadcrumbsData)
validateBreadcrumbsContenstackSchemaLoyalty.safeParse(response.data)
if (!validatedBreadcrumbsData.success) {
throw internalServerError(validatedBreadcrumbsData.error)
}
@@ -213,7 +188,6 @@ export const breadcrumbsQueryRouter = router({
parentBreadcrumbs,
pageBreadcrumb,
].flat()
console.log(breadcrumbs)
const validatedBreadcrumbs = getBreadcrumbsSchema.safeParse(breadcrumbs)
if (!validatedBreadcrumbs.success) {