refactor audit_period validation middlewares and entire code structur…

…e. refactor entire code quality including testcases

package.json

@@ -14,6 +14,7 @@
         "@aws-sdk/client-s3": "^3.409.0",
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
+        "chai-as-promised": "^7.1.1",
         "connect-redis": "^7.1.0",
         "dotenv": "^16.3.1",
         "express": "^4.18.2",
@@ -32,7 +33,8 @@
     "devDependencies": {
         "@types/bcrypt": "^5.0.0",
         "@types/chai": "^4.3.8",
-        "@types/express": "^4.17.17",
+        "@types/chai-as-promised": "^7.1.8",
+        "@types/express": "^4.17.21",
         "@types/express-session": "^1.17.7",
         "@types/mocha": "^10.0.2",
         "@types/multer": "^1.4.7",

src/app.ts

@@ -1,12 +1,7 @@
 import express from 'express';
 import { redisClient } from './db';
-import {
-    budgets,
-    documents,
-    organizations,
-    transactions,
-    users,
-} from './routes';
+import { documents, organizations, transactions, users } from './routes';
+import budgetsRouter from './routes/budget';
 import bodyParser from 'body-parser';
 import session from 'express-session';
 import { config } from 'dotenv';
@@ -16,6 +11,7 @@ import fs from 'fs';
 import YAML from 'yaml';
 import logger from './config/winston';
 import { initDB } from './db/util';
+import errorHandler from './middleware/error_handler';
 
 declare module 'express-session' {
     export interface SessionData {
@@ -64,17 +60,12 @@ app.use(function (req, res, next) {
     next();
 });
 
+app.use('/budgets', budgetsRouter);
 app.use('/organizations', organizations);
-app.use('/budgets', budgets);
 app.use('/transactions', transactions);
 app.use('/documents', documents);
 app.use('/users', users);
-
-// @ts-ignore: Unreachable code error
-app.use(function (err, req, res, next) {
-    logger.error(err);
-    res.sendStatus(500);
-});
+app.use(errorHandler);
 
 app.listen(3000);
 

src/middleware/error_handler.ts

@@ -0,0 +1,14 @@
+import { Request, Response, NextFunction } from 'express';
+
+export default async function errorHandler(
+    err: any,
+    req: Request,
+    res: Response,
+    next: NextFunction,
+) {
+    let status = 500;
+    if ('code' in err) {
+        status = err.code;
+    }
+    res.status(status).send(err.message);
+}

src/middleware/index.ts

@@ -1 +1,2 @@
-export * from './validate';
+export * from './validate_audit_period';
+export { wrapAsync } from './utils';

src/middleware/utils.ts

@@ -0,0 +1,7 @@
+import { Request, Response, NextFunction } from 'express';
+
+export function wrapAsync(fn: Function) {
+    return function (req: Request, res: Response, next: NextFunction) {
+        fn(req, res, next).catch(next);
+    };
+}