From 51c744de26a6604a970f1770dad39a7adfa03d49 Mon Sep 17 00:00:00 2001
From: Stephan <57194608+stephan418@users.noreply.github.com>
Date: Thu, 28 Apr 2022 14:35:15 +0200
Subject: [PATCH] Add debugging code

+ Small fix in the event controller
+ Add development flag to the dev container
---
 dev.sh                              |  1 +
 src/Controllers/event.controller.ts | 14 +++++++-------
 src/Middleware/debug/logger.ts      | 10 ++++++++++
 src/app.ts                          |  7 +++++++
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/Middleware/debug/logger.ts

diff --git a/dev.sh b/dev.sh
index b669776..258ad38 100755
--- a/dev.sh
+++ b/dev.sh
@@ -52,6 +52,7 @@ if [ "$RECREATE" = true ]; then
         -p $D_PORT:$D_PORT -e PORT=$D_PORT \
         -e DATABASE_PASSWORD=server \
         -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \
+        -e NODE_ENV="development" \
         --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \
         node
 fi
diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts
index 4789a1f..6667aa6 100644
--- a/src/Controllers/event.controller.ts
+++ b/src/Controllers/event.controller.ts
@@ -14,13 +14,13 @@ export const getAllEvents = async (req: Request, res: Response) => {
       id: false,
     },
   });
-  if (events.length > 0)
-    res.status(200).json({
-      type: "success",
-      payload: {
-        events,
-      },
-    });
+
+  res.status(200).json({
+    type: "success",
+    payload: {
+      events,
+    },
+  });
 };
 
 export const getEvent = async (req: Request, res: Response) => {
diff --git a/src/Middleware/debug/logger.ts b/src/Middleware/debug/logger.ts
new file mode 100644
index 0000000..11711a2
--- /dev/null
+++ b/src/Middleware/debug/logger.ts
@@ -0,0 +1,10 @@
+import { NextFunction, Request, Response } from "express";
+import logger from "../error/logger";
+
+export default function debugLogger(req: Request, res: Response, next: NextFunction) {
+  // Only log when in development mode
+  if (process.env.NODE_ENV === "development") {
+    logger.debug(`Request to: ${req.url}`);
+    next();
+  }
+}
diff --git a/src/app.ts b/src/app.ts
index bda5053..da3df2c 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -8,6 +8,7 @@ import organisationRouter from "./Routes/organisation.routes";
 import groupRouter from "./Routes/group.routes";
 import defaultErrorHandler from "./Middleware/error/handler";
 import logger from "./Middleware/error/logger";
+import debugLogger from "./Middleware/debug/logger";
 
 // Set up async error handling
 require("express-async-errors");
@@ -16,6 +17,10 @@ require("dotenv").config(); // Load dotenv config
 
 const app = express();
 
+if (process.env.NODE_ENV === "development") {
+  logger.info("Using development mode");
+}
+
 async function main() {
   // Dev
   await prisma.admin.upsert({
@@ -34,6 +39,8 @@ async function main() {
   app.use(express.urlencoded({ extended: true }));
   app.use(express.json());
 
+  app.use(debugLogger);
+
   // Admin authentication endpoints
   app.use("/api/authentication", adminAuthRouter);