undo not needed requestBody middleware

AliceO2Group · Jan 29, 2025 · cf12d57 · cf12d57
1 parent 99579e9
commit cf12d57
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 90 deletions.
diff --git a/QualityControl/lib/api.js b/QualityControl/lib/api.js
@@ -18,7 +18,6 @@ import { UserRole } from './../common/library/userRole.enum.js';
 import { layoutOwnerMiddleware } from './middleware/layouts/layoutOwner.middleware.js';
 import { layoutIdMiddleware } from './middleware/layouts/layoutId.middleware.js';
 import { layoutServiceMiddleware } from './middleware/layouts/layoutService.middleware.js';
-import { requestBodyMiddleware } from './middleware/requestBody.middleware.js';
 
 /**
  * Adds paths and binds websocket to instance of HttpServer passed
@@ -48,7 +47,6 @@ export const setup = (http, ws) => {
     '/layout/:id',
     layoutServiceMiddleware(jsonDb),
     layoutIdMiddleware(jsonDb),
-    requestBodyMiddleware,
     layoutOwnerMiddleware(jsonDb),
     layoutService.putLayoutHandler.bind(layoutService),
   );

diff --git a/QualityControl/lib/controllers/LayoutController.js b/QualityControl/lib/controllers/LayoutController.js
@@ -126,11 +126,18 @@ export class LayoutController {
     try {
       let layoutProposed = {};
       try {
+        if (!req.body) {
+          updateAndSendExpressResponseFromNativeError(
+            res,
+            new InvalidInputError('Missing request body to update layout'),
+          );
+          return;
+        }
         layoutProposed = await LayoutDto.validateAsync(req.body);
       } catch (error) {
         updateAndSendExpressResponseFromNativeError(
           res,
-          new Error(`Failed to update layout ${error?.details?.[0]?.message || ''}`),
+          new InvalidInputError(`Failed to update layout ${error?.details?.[0]?.message || ''}`),
         );
         return;
       }

diff --git a/QualityControl/lib/middleware/requestBody.middleware.js b/QualityControl/lib/middleware/requestBody.middleware.js
diff --git a/QualityControl/test/lib/controllers/LayoutController.test.js b/QualityControl/test/lib/controllers/LayoutController.test.js
@@ -201,6 +201,18 @@ export const layoutControllerTestSuite = async () => {
       };
     });
 
+    test('should respond with 400 error if request did not contain body id', async () => {
+      const req = { params: { id: 'someid' } };
+      const layoutConnector = new LayoutController({});
+      await layoutConnector.putLayoutHandler(req, res);
+      ok(res.status.calledWith(400), 'Response status was not 400');
+      ok(res.json.calledWith({
+        message: 'Missing request body to update layout',
+        status: 400,
+        title: 'Invalid Input',
+      }), 'Error message was incorrect');
+    });
+
     test('should successfully return the id of the updated layout', async () => {
       const expectedMockWithDefaults = {
         id: 'mylayout',

diff --git a/QualityControl/test/lib/middlewares/requestBody.middleware.test.js b/QualityControl/test/lib/middlewares/requestBody.middleware.test.js
diff --git a/QualityControl/test/test-index.js b/QualityControl/test/test-index.js
@@ -59,7 +59,6 @@ import { commonLibraryUtilsDateTimeTestSuite } from './common/library/utils/date
 import { layoutIdMiddlewareTest } from './lib/middlewares/layouts/layoutId.middleware.test.js';
 import { layoutOwnerMiddlewareTest } from './lib/middlewares/layouts/layoutOwner.middleware.test.js';
 import { layoutServiceMiddlewareTest } from './lib/middlewares/layouts/layoutService.middleware.test.js';
-import { requestBodyMiddlewareTest } from './lib/middlewares/requestBody.middleware.test.js';
 
 const FRONT_END_PER_TEST_TIMEOUT = 5000; // each front-end test is allowed this timeout
 // remaining tests are based on the number of individual tests in each suite
@@ -166,7 +165,6 @@ suite('All Tests - QCG', { timeout: FRONT_END_TIMEOUT + BACK_END_TIMEOUT }, asyn
       suite('LayoutServiceMiddleware test suite', async () => layoutServiceMiddlewareTest());
       suite('LayoutIdMiddleware test suite', async () => layoutIdMiddlewareTest());
       suite('LayoutOwnerMiddleware test suite', async () => layoutOwnerMiddlewareTest());
-      suite('RequestBodyMiddleware test suite', async () => requestBodyMiddlewareTest());
     });
 
     suite('Controllers - Test Suite', async () => {