From 5a3b08e6212d9a2a5ad758d4b7bc35fbac4da0ef Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Wed, 4 Jun 2025 21:58:16 -0700 Subject: [PATCH] Fix tests Summary: Test Plan: --- packages/skin-database/api/app.ts | 9 +++++++-- packages/skin-database/knexfile.ts | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/skin-database/api/app.ts b/packages/skin-database/api/app.ts index 299873a3..ee74971b 100644 --- a/packages/skin-database/api/app.ts +++ b/packages/skin-database/api/app.ts @@ -3,7 +3,7 @@ import cors, { CorsOptions } from "cors"; import Sentry from "@sentry/node"; import expressSitemapXml from "express-sitemap-xml"; import * as Skins from "../data/skins"; -import express, { RequestHandler, ErrorRequestHandler } from "express"; +import express, { RequestHandler, ErrorRequestHandler, Handler } from "express"; import UserContext from "../data/UserContext"; import cookieSession from "cookie-session"; import { SECRET } from "../config"; @@ -59,10 +59,11 @@ declare global { type Options = { eventHandler?: EventHandler; + extraMiddleware?: Handler; logger?: Logger; }; -export function createApp({ eventHandler, logger }: Options) { +export function createApp({ eventHandler, logger, extraMiddleware }: Options) { const app = express(); if (Sentry) { app.use(Sentry.Handlers.requestHandler() as RequestHandler); @@ -90,6 +91,10 @@ export function createApp({ eventHandler, logger }: Options) { app.use(cookieHandler); + if (extraMiddleware != null) { + app.use(extraMiddleware); + } + // Add UserContext to request app.use((req, res, next) => { req.ctx = new UserContext(req.session.username); diff --git a/packages/skin-database/knexfile.ts b/packages/skin-database/knexfile.ts index e148a46b..b62ce4f5 100644 --- a/packages/skin-database/knexfile.ts +++ b/packages/skin-database/knexfile.ts @@ -11,7 +11,7 @@ const production = { migrations: { tableName: "knex_migrations", // Use process.cwd() and not __dir since Next runs from a build directory - directory: path.join(process.cwd(), "./migrations"), + directory: path.join(__dirname, "./migrations"), }, };