From 80ef8f189e02a87a250a891cef86a0815acde09b Mon Sep 17 00:00:00 2001 From: miloschwartz Date: Mon, 31 Mar 2025 22:37:39 -0400 Subject: [PATCH] replace old error formatting with zod format error --- server/routers/accessToken/listAccessTokens.ts | 5 +++-- server/routers/org/getOrg.ts | 3 ++- server/routers/org/getOrgOverview.ts | 3 ++- server/routers/org/listOrgs.ts | 3 ++- server/routers/resource/listResources.ts | 5 +++-- server/routers/user/adminListUsers.ts | 3 ++- server/routers/user/listUsers.ts | 5 +++-- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/server/routers/accessToken/listAccessTokens.ts b/server/routers/accessToken/listAccessTokens.ts index bfe33d92..a6dcff6c 100644 --- a/server/routers/accessToken/listAccessTokens.ts +++ b/server/routers/accessToken/listAccessTokens.ts @@ -14,6 +14,7 @@ import createHttpError from "http-errors"; import { sql, eq, or, inArray, and, count, isNull, lt, gt } from "drizzle-orm"; import logger from "@server/logger"; import stoi from "@server/lib/stoi"; +import { fromZodError } from "zod-validation-error"; const listAccessTokensParamsSchema = z .object({ @@ -133,7 +134,7 @@ export async function listAccessTokens( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedQuery.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedQuery.error) ) ); } @@ -144,7 +145,7 @@ export async function listAccessTokens( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedParams.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedParams.error) ) ); } diff --git a/server/routers/org/getOrg.ts b/server/routers/org/getOrg.ts index 4d0712e3..21a6fa2a 100644 --- a/server/routers/org/getOrg.ts +++ b/server/routers/org/getOrg.ts @@ -7,6 +7,7 @@ import response from "@server/lib/response"; import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors"; import logger from "@server/logger"; +import { fromZodError } from "zod-validation-error"; const getOrgSchema = z .object({ @@ -29,7 +30,7 @@ export async function getOrg( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedParams.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedParams.error) ) ); } diff --git a/server/routers/org/getOrgOverview.ts b/server/routers/org/getOrgOverview.ts index cbed9247..dcde292d 100644 --- a/server/routers/org/getOrgOverview.ts +++ b/server/routers/org/getOrgOverview.ts @@ -16,6 +16,7 @@ import response from "@server/lib/response"; import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors"; import logger from "@server/logger"; +import { fromZodError } from "zod-validation-error"; const getOrgParamsSchema = z .object({ @@ -45,7 +46,7 @@ export async function getOrgOverview( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedParams.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedParams.error) ) ); } diff --git a/server/routers/org/listOrgs.ts b/server/routers/org/listOrgs.ts index 91025773..106c58e4 100644 --- a/server/routers/org/listOrgs.ts +++ b/server/routers/org/listOrgs.ts @@ -7,6 +7,7 @@ import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors"; import { sql, inArray } from "drizzle-orm"; import logger from "@server/logger"; +import { fromZodError } from "zod-validation-error"; const listOrgsSchema = z.object({ limit: z @@ -39,7 +40,7 @@ export async function listOrgs( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedQuery.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedQuery.error) ) ); } diff --git a/server/routers/resource/listResources.ts b/server/routers/resource/listResources.ts index 82e884db..1dba4119 100644 --- a/server/routers/resource/listResources.ts +++ b/server/routers/resource/listResources.ts @@ -15,6 +15,7 @@ import createHttpError from "http-errors"; import { sql, eq, or, inArray, and, count } from "drizzle-orm"; import logger from "@server/logger"; import stoi from "@server/lib/stoi"; +import { fromZodError } from "zod-validation-error"; const listResourcesParamsSchema = z .object({ @@ -138,7 +139,7 @@ export async function listResources( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedQuery.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedQuery.error) ) ); } @@ -149,7 +150,7 @@ export async function listResources( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedParams.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedParams.error) ) ); } diff --git a/server/routers/user/adminListUsers.ts b/server/routers/user/adminListUsers.ts index 17cbb63f..2d95756d 100644 --- a/server/routers/user/adminListUsers.ts +++ b/server/routers/user/adminListUsers.ts @@ -7,6 +7,7 @@ import createHttpError from "http-errors"; import { sql, eq } from "drizzle-orm"; import logger from "@server/logger"; import { users } from "@server/db/schemas"; +import { fromZodError } from "zod-validation-error"; const listUsersSchema = z .object({ @@ -55,7 +56,7 @@ export async function adminListUsers( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedQuery.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedQuery.error) ) ); } diff --git a/server/routers/user/listUsers.ts b/server/routers/user/listUsers.ts index befc7ba4..e4429597 100644 --- a/server/routers/user/listUsers.ts +++ b/server/routers/user/listUsers.ts @@ -7,6 +7,7 @@ import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors"; import { sql } from "drizzle-orm"; import logger from "@server/logger"; +import { fromZodError } from "zod-validation-error"; const listUsersParamsSchema = z .object({ @@ -67,7 +68,7 @@ export async function listUsers( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedQuery.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedQuery.error) ) ); } @@ -78,7 +79,7 @@ export async function listUsers( return next( createHttpError( HttpCode.BAD_REQUEST, - parsedParams.error.errors.map((e) => e.message).join(", ") + fromZodError(parsedParams.error) ) ); }