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
2 changes: 1 addition & 1 deletion apps/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createServer } from "@repo/backend/server";
import envValidate from "@repo/backend/config";
import { dbPush, dbReset, dbSeed, dbWaitForConnection } from "@repo/database";

await envValidate();
envValidate();
await dbWaitForConnection();

if (process.env.NODE_ENV === "development" && process.env.RESET_DB === true) {
Expand Down
50 changes: 28 additions & 22 deletions apps/backend/src/jest.setup.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { jest, afterEach, beforeAll } from "@jest/globals";
import { NextFunction } from "express";
import { drizzle } from "drizzle-orm/pglite";
import { pushSchema } from "drizzle-kit/api";
import { jest, afterEach, beforeAll, afterAll } from "@jest/globals";
import * as schema from "@repo/database/schema";
import { db } from "@repo/database";
import { db, dbPush, dbReset } from "@repo/database";
import redis from "@repo/backend/redis";

jest.mock("@repo/database", () => {
const originalModule =
Expand All @@ -17,27 +18,32 @@ jest.mock("@repo/database", () => {
};
});

jest.mock("@repo/backend/middlewares/rate-limit", () => {
const originalModule = jest.requireActual<
typeof import("@repo/backend/middlewares/rate-limit")
>("@repo/backend/middlewares/rate-limit");

const rateLimitHandler = jest
.fn()
.mockReturnValue((_: Request, __: Response, next: NextFunction) => {
next();
});

return {
...originalModule,
__esModule: true,
rateLimitHandler,
};
});

beforeAll(async () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const { apply } = await pushSchema(schema, db as any);
await apply();
await dbPush(db);
});

afterEach(async () => {
console.log("🗑️ Emptying the entire database");

const tableSchema = db._.schema;
if (!tableSchema) throw new Error("No table schema found");

const queries = Object.values(tableSchema).map((table) => {
// console.log(`🧨 Preparing delete query for table: ${table.dbName}`);
return table.tsName;
});
// console.log(queries);

queries.forEach(async (query) => {
const schemaToDelete = schema[query];
if (!schemaToDelete) throw new Error(`No schema found for ${query}`);
await db.delete(schemaToDelete);
});
await dbReset(db);
});

afterAll(async () => {
redis.quit();
});
3 changes: 1 addition & 2 deletions apps/backend/src/middlewares/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const validateHandler = (schema: z.ZodSchema) => {
if (error instanceof ZodError) {
const errorMessages = error.errors
.map(
(issue: z.ZodIssue) =>
`${issue.path.join(".")} is ${issue.message}`,
(issue: z.ZodIssue) => `${issue.path.join(".")} is ${issue.message}`
)
.join(", ");
throw new BadRequestError(errorMessages);
Expand Down
11 changes: 8 additions & 3 deletions apps/backend/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,21 @@ export const createServer = (): Express => {
const app = express();
app
.disable("x-powered-by")
.use(morgan("dev"))
.use(
morgan(
`:remote-addr - :remote-user [:date[clf]] ":method :url HTTP/:http-version" :status :res[content-length]`,
{ immediate: true },
),
)
.use(express.urlencoded({ extended: true }))
.use(express.json())
.use(cookieParser())
.use(cors())
.use(cors({ origin: "http://localhost:3002", credentials: true }))
.use(
rateLimitHandler({
timeSpan: process.env.WINDOW_SIZE_IN_MINUTES,
limit: process.env.MAX_NUMBER_OF_REQUESTS_PER_WINDOW_SIZE,
})
}),
)
.get("/healthcheck", (_req, res) => {
res.json({
Expand Down
Loading
Loading