Improve error handling in event.route.js

incremental-updater/src/routes/event.route.js

@@ -9,20 +9,27 @@ import { logger } from '../utils/logger.utils.js';
 const eventRouter = Router();
 
 async function eventHandler(request, response) {
-  // Check request body
-  if (!request.body) {
-    logger.error('Missing request body.');
-    throw new CustomError(400, 'Bad request: No Pub/Sub message was received');
-  }
+  try {
+    // Check request body
+    if (!request.body) {
+      logger.error('Missing request body.');
+      throw new CustomError(
+        400,
+        'Bad request: No Pub/Sub message was received'
+      );
+    }
 
-  // Check if the body comes in a message
-  if (!request.body.message) {
-    logger.error('Missing body message');
-    throw new CustomError(400, 'Bad request: Wrong No Pub/Sub message format');
-  }
+    // Check if the body comes in a message
+    if (!request.body.message || !request.body.message.data) {
+      logger.error('Missing message data in incoming message');
+      throw new CustomError(
+        400,
+        'Bad request: No message data in incoming message'
+      );
+    }
+
+    const encodedMessageBody = request.body.message.data;
 
-  const encodedMessageBody = request.body?.message?.data;
-  if (encodedMessageBody) {
     const buff = new Buffer(encodedMessageBody, 'base64');
     const messageBody = JSON.parse(buff.toString('ascii'));
 
@@ -44,8 +51,9 @@ async function eventHandler(request, response) {
           'Bad request: Resource type is not defined in incoming message data'
         );
     }
-  } else {
-    throw new CustomError(400, 'Bad request: message data is not defined');
+  } catch (err) {
+    logger.error(err);
+    return response.status(err.statusCode).send(err);
   }
 }