fix budget deletion error and express deprecation

rugglcon · Sep 13, 2019 · 0446bd3 · 0446bd3
1 parent 35e2657
commit 0446bd3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -34,12 +34,6 @@ class App {
     config(): void {
         this.app.options('*', cors());
         this.app.use(cors());
-        // this.app.use((_req, res, next) => {
-        //     res.header('Access-Control-Allow-Origin', '*');
-        //     res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization');
-        //     res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,PATCH,HEAD');
-        //     next();
-        // });
         this.app.use(bodyParser.json());
         this.app.use(bodyParser.urlencoded({extended: false}));
         this.app.use(useragent.express());

diff --git a/src/routes/budget.routes.ts b/src/routes/budget.routes.ts
@@ -183,6 +183,10 @@ export const budgetRoutes = (budgetLogic: BudgetLogic, expenseLogic: ExpenseLogi
                 res.sendStatus(403);
                 return;
             }
+            logger.info(`deleting ${budget.expenses.length} expenses before deleting budget`);
+            for (const expense of budget.expenses) {
+                await expenseLogic.delete(expense.id);
+            }
             const data = await budgetLogic.delete(budget.id);
             logger.info(`delete successful: ${data}`);
             res.send(data);

diff --git a/src/routes/errors.routes.ts b/src/routes/errors.routes.ts
@@ -22,7 +22,7 @@ export const errorRoutes = (errorLogic: ErrorLogic): Router => {
         err.userId = user.id;
         await errorLogic.create(err);
         logger.info('logged new js error', err);
-        res.send(204);
+        res.sendStatus(204);
     });
 
     return errorRouter;