Skip to content
Snippets Groups Projects
Commit a1bfedd8 authored by Bernard Roland (Student Com20)'s avatar Bernard Roland (Student Com20)
Browse files

Refactored code to allow running endpoint tests

parent 34d5656a
No related branches found
No related tags found
No related merge requests found
import express, { Request, Response, NextFunction } from 'express';
import { json as bodyJson } from 'body-parser';
import fileupload from 'express-fileupload';
import { addDefaultHeaders } from './headers';
import v1 from './v1';
export const api = express();
api.use(addDefaultHeaders);
api.use(bodyJson());
api.use(fileupload());
api.use('/v1', v1);
api.use((_req, res) => {
res.status(404).json({
status: 'error',
message: 'unknown resource',
});
});
api.use((err: Error, _req: Request, res: Response, _next: NextFunction) => {
return res.status(400).json({
status: 'error',
message: err.message,
});
});
......@@ -11,7 +11,7 @@ export const keys = {
export const allowedOrigins = [ "*" ];
export const environment = (env.NODE_ENV ?? 'development') as ('development' | 'staging' | 'production');
export const environment = (env.NODE_ENV ?? 'development') as ('development' | 'testing' | 'staging' | 'production');
export const web_serve = '../client/build/';
import express, { Request, Response, NextFunction } from 'express';
import { json as bodyJson } from 'body-parser';
import fileupload from 'express-fileupload';
import express from 'express';
import { api } from './api';
import { port, web_serve } from './config';
import { addDefaultHeaders } from './headers';
import v1 from './v1';
const app = express();
app.use(addDefaultHeaders);
app.use(bodyJson());
app.use(fileupload());
app.use('/v1', v1);
if (web_serve) {
app.use('/', express.static(web_serve));
}
app.use((_req, res) => {
res.status(404).json({
status: 'error',
message: 'unknown resource',
});
});
app.use((err: Error, _req: Request, res: Response, _next: NextFunction) => {
return res.status(400).json({
status: 'error',
message: err.message,
});
});
app.use(api);
app.listen(port);
......@@ -4,6 +4,10 @@ import { join } from 'path';
import { parse } from 'pg-connection-string';
const pgconfig: any = parse(env.DATABASE_URL ?? 'postgresql://postgres@localhost/ryoko');
const migrations = {
tableName: "knex_migrations",
directory: join(__dirname, 'migrations'),
};
export default {
development: {
......@@ -11,9 +15,12 @@ export default {
connection: {
filename: "./dev.sqlite3",
},
migrations: {
tableName: "knex_migrations",
directory: join(__dirname, 'migrations'),
migrations: migrations,
},
testing: {
client: "sqlite3",
connection: {
filename: ":memory:",
},
},
staging: {
......@@ -23,10 +30,7 @@ export default {
min: 2,
max: 10,
},
migrations: {
tableName: "knex_migrations",
directory: join(__dirname, 'migrations'),
},
migrations: migrations,
},
production: {
client: "postgresql",
......@@ -40,10 +44,7 @@ export default {
min: 2,
max: 10,
},
migrations: {
tableName: "knex_migrations",
directory: join(__dirname, 'migrations'),
},
migrations: migrations,
}
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment