Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
"vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
"files": { "ignoreUnknown": false, "ignore": ["dist"] },
"files": { "ignoreUnknown": false, "includes": ["**", "!**/dist"] },
"formatter": {
"enabled": true,
"lineWidth": 120,
"bracketSpacing": true
},
"organizeImports": { "enabled": true },
"assist": { "actions": { "source": { "organizeImports": "on" } } },
"linter": {
"enabled": true,
"rules": {
Expand Down
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
"build": "tsc && tsup",
"start:dev": "node --import=tsx --watch src/index.ts",
"start:prod": "node dist/index.js",
"lint": "biome lint --fix",
"format": "biome format --write",
"check": "biome check --write",
"test": "vitest run",
"test:cov": "vitest run --coverage",
"check": "pnpm lint && pnpm format && pnpm build && pnpm test"
"test:cov": "vitest run --coverage"
},
"dependencies": {
"@asteasolutions/zod-to-openapi": "7.3.4",
Expand All @@ -31,7 +29,7 @@
"zod": "3.25.67"
},
"devDependencies": {
"@biomejs/biome": "1.9.4",
"@biomejs/biome": "2.0.6",
"@types/cors": "2.8.19",
"@types/express": "5.0.3",
"@types/supertest": "6.0.3",
Expand All @@ -46,9 +44,14 @@
"vitest": "3.2.3"
},
"tsup": {
"entry": ["src/index.ts"],
"entry": [
"src/index.ts"
],
"outDir": "dist",
"format": ["esm", "cjs"],
"format": [
"esm",
"cjs"
],
"target": "es2020",
"sourcemap": true,
"clean": true,
Expand Down
76 changes: 38 additions & 38 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/api/user/userRouter.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
import express, { type Router } from "express";
import { z } from "zod";

import { createApiResponse } from "@/api-docs/openAPIResponseBuilders";
import { GetUserSchema, UserSchema } from "@/api/user/userModel";
import { createApiResponse } from "@/api-docs/openAPIResponseBuilders";
import { validateRequest } from "@/common/utils/httpHandlers";
import { userController } from "./userController";

Expand Down
2 changes: 1 addition & 1 deletion src/common/__tests__/requestLogger.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe("Request Logger Middleware", () => {
app.get("/success", (_req, res) => {
res.status(StatusCodes.OK).send("Success");
});
app.get("/redirect", (req, res) => res.redirect("/success"));
app.get("/redirect", (_req, res) => res.redirect("/success"));
app.get("/error", () => {
throw new Error("Test error");
});
Expand Down
2 changes: 1 addition & 1 deletion src/common/middleware/requestLogger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const httpLogger = pinoHttp({
},
});

const captureResponseBody = (req: Request, res: Response, next: NextFunction) => {
const captureResponseBody = (_req: Request, res: Response, next: NextFunction) => {
if (!env.isProduction) {
const originalSend = res.send;
res.send = function (body) {
Expand Down
26 changes: 13 additions & 13 deletions src/common/utils/httpHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ export const validateRequest = (schema: ZodSchema) => async (req: Request, res:
await schema.parseAsync({ body: req.body, query: req.query, params: req.params });
next();
} catch (err) {
const errors = (err as ZodError).errors.map((e) => {
const fieldPath = e.path.length > 0 ? e.path.join('.') : 'root';
return `${fieldPath}: ${e.message}`;
});
const errorMessage =
errors.length === 1
? `Invalid input: ${errors[0]}`
: `Invalid input (${errors.length} errors): ${errors.join('; ')}`;
const statusCode = HTTP_STATUS_CODES.BAD_REQUEST;
const serviceResponse = ServiceResponse.failure(errorMessage, null, statusCode);
res.status(serviceResponse.statusCode).send(serviceResponse);
const errors = (err as ZodError).errors.map((e) => {
const fieldPath = e.path.length > 0 ? e.path.join(".") : "root";
return `${fieldPath}: ${e.message}`;
});

const errorMessage =
errors.length === 1
? `Invalid input: ${errors[0]}`
: `Invalid input (${errors.length} errors): ${errors.join("; ")}`;

const statusCode = StatusCodes.BAD_REQUEST;
const serviceResponse = ServiceResponse.failure(errorMessage, null, statusCode);
res.status(serviceResponse.statusCode).send(serviceResponse);
}
};
3 changes: 1 addition & 2 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import cors from "cors";
import express, { type Express } from "express";
import helmet from "helmet";
import { pino } from "pino";

import { openAPIRouter } from "@/api-docs/openAPIRouter";
import { healthCheckRouter } from "@/api/healthCheck/healthCheckRouter";
import { userRouter } from "@/api/user/userRouter";
import { openAPIRouter } from "@/api-docs/openAPIRouter";
import errorHandler from "@/common/middleware/errorHandler";
import rateLimiter from "@/common/middleware/rateLimiter";
import requestLogger from "@/common/middleware/requestLogger";
Expand Down