Improve logger on backend-javascript

Author: ganatan

backend-javascript/package-lock.json

@@ -83,6 +83,7 @@
     "pg": "8.16.3",
     "swagger-jsdoc": "6.2.8",
     "swagger-ui-express": "5.0.1",
+    "uuid": "^11.1.0",
     "winston": "3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
     "zod": "3.25.75"

backend-javascript/package.json

@@ -11,6 +11,7 @@ import notFoundHandler from './middlewares/error/not-found-handler.js';
 import responseHandler from './middlewares/response/response-handler.js';
 import errorHandler from './middlewares/error/error-handler.js';
 
+import correlationIdMiddleware from './middlewares/core/correlation-id.js';
 import requestLogger from './infrastructure/logger/request-logger.js';
 
 import fakeAuth from './middlewares/auth/fake-auth.js';
@@ -34,6 +35,7 @@ if (['development', 'test'].includes(appConfig.app.nodeEnv)) {
   app.use(fakeAuth(appConfig.app.fakeUser));
 }
 
+app.use(correlationIdMiddleware);
 app.use(requestLogger);
 
 app.use(healthRoutes);

backend-javascript/src/app.js

@@ -4,6 +4,9 @@ const requestLogger = (req, res, next) => {
   logger.info(`[${req.method}] ${req.originalUrl}`, {
     method: req.method,
     route: req.originalUrl,
+    correlationId: req.correlationId,
+    ip: req.ip,
+    userAgent: req.headers['user-agent'],
   });
   next();
 };

backend-javascript/src/infrastructure/logger/request-logger.js

@@ -0,0 +1,9 @@
+import { v4 as uuidv4 } from 'uuid';
+
+const correlationIdMiddleware = (req, res, next) => {
+  req.correlationId = uuidv4();
+  res.setHeader('X-Correlation-Id', req.correlationId);
+  next();
+};
+
+export default correlationIdMiddleware;

backend-javascript/src/middlewares/core/correlation-id.js

@@ -19,9 +19,10 @@ function errorHandler(err, req, res, next) {
     context: context,
     details: details,
     stack: err.stack,
+    correlationId: req.correlationId,
   };
 
-  if (statusCode >= 500) {
+  if (statusCode >= 500 || statusCode === 401 || statusCode === 403 || statusCode === 409) {
     logger.error(logMessage, logData);
   } else {
     logger.warn(logMessage, logData);

backend-javascript/src/middlewares/error/error-handler.js

@@ -6,7 +6,6 @@ function responseHandler(req, res, next) {
   const statusCode = res.locals.statusCode || 200;
   const payload = res.locals.data || null;
   const success = statusCode >= 200 && statusCode < 300;
-
   const response = { success };
 
   if (payload && payload.metadata && payload.data) {
@@ -22,3 +21,26 @@ function responseHandler(req, res, next) {
 }
 
 export default responseHandler;
+
+// function responseHandler(req, res, next) {
+//   if (res.headersSent) {
+//     return next();
+//   }
+
+//   const statusCode = res.locals.statusCode || 200;
+//   const payload = res.locals.data || null;
+//   const success = statusCode >= 200 && statusCode < 300;
+
+//   const response = { success };
+
+//   if (payload && payload.metadata && payload.data) {
+//     response.metadata = payload.metadata;
+//     response.data = payload.data;
+//   } else {
+//     response.data = payload;
+//   }
+
+//   res.status(statusCode).json(response);
+// }
+
+// export default responseHandler;

backend-javascript/src/middlewares/response/response-handler.js

@@ -19,6 +19,8 @@ class Controller {
   getItems = async (req, res, next) => {
     try {
 
+      // throw new Error('Erreur volontaire');
+
       const result = await this.service.getItems(req.query);
       res.locals = { data: result, statusCode: HTTP_STATUS.OK };