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

feat(SW-186): Added refs and some extra querys

Browse Source
This commit is contained in:
Erik Tiekstra
2024-09-05 09:25:21 +02:00
parent 52fdc1daac
commit 55fdbc527b
11 changed files with 388 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

257
server/routers/contentstack/base/query.ts
View File

@@ -14,7 +14,11 @@ import { request } from "@/lib/graphql/request"
import { notFound } from "@/server/errors/trpc"
import { contentstackBaseProcedure, router } from "@/server/trpc"
import { generateRefsResponseTag, generateTag } from "@/utils/generateTag"
import {
generateRefsResponseTag,
generateTag,
generateTags,
} from "@/utils/generateTag"
import { langInput } from "./input"
import {
@@ -24,11 +28,13 @@ import {
CurrentHeaderRefDataRaw,
FooterDataRaw,
FooterRefDataRaw,
getHeaderRefSchema,
getHeaderSchema,
validateContactConfigSchema,
validateCurrentHeaderConfigSchema,
validateFooterConfigSchema,
} from "./output"
import { getConnections } from "./utils"
import { HeaderRefResponse, HeaderResponse } from "@/types/header"
@@ -64,13 +70,13 @@ const getCurrentHeaderFailCounter = meter.createCounter(
)
// OpenTelemetry metrics: Header
const getHeaderRefCounter = meter.createCounter(
const getHeaderRefsCounter = meter.createCounter(
"trpc.contentstack.header.ref.get"
)
const getHeaderRefSuccessCounter = meter.createCounter(
const getHeaderRefsSuccessCounter = meter.createCounter(
"trpc.contentstack.header.ref.get-success"
)
const getHeaderRefFailCounter = meter.createCounter(
const getHeaderRefsFailCounter = meter.createCounter(
"trpc.contentstack.header.ref.get-fail"
)
const getHeaderCounter = meter.createCounter("trpc.contentstack.header.get")
@@ -164,31 +170,90 @@ export const baseQueryRouter = router({
}),
header: contentstackBaseProcedure.query(async ({ ctx }) => {
const { lang } = ctx
getHeaderRefCounter.add(1, { lang })
getHeaderRefsCounter.add(1, { lang })
console.info(
"contentstack.header.ref start",
"contentstack.header.refs start",
JSON.stringify({ query: { lang } })
)
// TODO: Add better ref types and error handling for responseRef
const responseRef = await request<HeaderRefResponse>(GetHeaderRef, {
locale: lang,
})
const responseRef = await request<HeaderRefResponse>(
GetHeaderRef,
{
locale: lang,
},
{
cache: "force-cache",
next: {
tags: [generateRefsResponseTag(lang, "header")],
},
}
)
getCurrentHeaderCounter.add(1, { lang })
if (!responseRef.data) {
const notFoundError = notFound(responseRef)
getHeaderRefsFailCounter.add(1, {
lang,
error_type: "not_found",
error: JSON.stringify({ code: notFoundError.code }),
})
console.error(
"contentstack.header.refs not found error",
JSON.stringify({
query: {
lang,
},
error: { code: notFoundError.code },
})
)
throw notFoundError
}
const validatedHeaderRefs = getHeaderRefSchema.safeParse(responseRef.data)
if (!validatedHeaderRefs.success) {
getHeaderRefsFailCounter.add(1, {
lang,
error_type: "validation_error",
error: JSON.stringify(validatedHeaderRefs.error),
})
console.error(
"contentstack.header.refs validation error",
JSON.stringify({
query: {
lang,
},
error: validatedHeaderRefs.error,
})
)
return null
}
getHeaderRefsSuccessCounter.add(1, { lang })
console.info(
"contentstack.header.refs success",
JSON.stringify({ query: { lang } })
)
const connections = getConnections(validatedHeaderRefs.data)
getHeaderCounter.add(1, { lang })
console.info(
"contentstack.header start",
JSON.stringify({ query: { lang } })
)
const tags = [
generateTags(lang, connections),
generateTag(
lang,
validatedHeaderRefs.data.all_header.items[0].system.uid
),
].flat()
const response = await request<HeaderResponse>(
GetHeader,
{ locale: lang }
// {
// tags: [
// generateTag(lang, responseRef.data.all_header.items[0].system.uid),
// ],
// }
{ locale: lang },
{ cache: "force-cache", next: { tags } }
)
if (!response.data) {
@@ -422,161 +487,3 @@ export const baseQueryRouter = router({
return validatedFooterConfig.data.all_current_footer.items[0]
}),
})
const json = {
query: { lang: "en" },
error: {
issues: [
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: ["all_header", "items", 0, "top_link", "link"],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: ["all_header", "items", 0, "menu_items", 0, "link"],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
0,
"submenu",
0,
"links",
0,
"link",
],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
0,
"submenu",
0,
"links",
1,
"link",
],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
0,
"submenu",
1,
"links",
0,
"link",
],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
0,
"see_all_link",
"link",
],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: ["all_header", "items", 0, "menu_items", 1, "link"],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
1,
"see_all_link",
"link",
],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: ["all_header", "items", 0, "menu_items", 2, "link"],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
2,
"see_all_link",
"link",
],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: ["all_header", "items", 0, "menu_items", 3, "link"],
message: "Required",
},
{
code: "invalid_type",
expected: "object",
received: "undefined",
path: [
"all_header",
"items",
0,
"menu_items",
3,
"see_all_link",
"link",
],
message: "Required",
},
],
name: "ZodError",
},
}