Merge branch '937-internal-server-error-when-parsing-sbgn' into 'master'

Internal server error when parsing SBGN -> Bad request

See merge request minerva/core!944

rest-api/src/main/java/lcsb/mapviewer/api/convert/ConvertRestImpl.java

@@ -51,9 +51,12 @@ public class ConvertRestImpl extends BaseRestImpl {
   }
 
   public ByteArrayOutputStream converToImage(String fromFormat, String toFormat, String input)
-      throws InvalidInputDataExecption, SBMLException, IOException, ConverterException, DrawingException,
-      QueryException {
-    return converToImage(fromFormat, toFormat, input, 0.0, 0.0);
+      throws IOException, DrawingException, QueryException {
+    try {
+      return converToImage(fromFormat, toFormat, input, 0.0, 0.0);
+    } catch (InvalidInputDataExecption | ConverterException e) {
+      throw new QueryException("Input file is invalid", e);
+    }
   }
 
   public Map<String, Object> getInformation() {

web/src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java

@@ -9,6 +9,7 @@ import org.junit.runners.Suite.SuiteClasses;
     ChemicalControllerIntegrationTest.class,
     CommentControllerIntegrationTest.class,
     CommentControllerIntegrationTestWithoutTransaction.class,
+    ConvertControllerIntegrationTest.class,
     DrugControllerIntegrationTest.class,
     EndPointsInputValidationTests.class,
     FileControllerIntegrationTest.class,

web/src/test/java/lcsb/mapviewer/web/ConvertControllerIntegrationTest.java

+package lcsb.mapviewer.web;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.servlet.RequestBuilder;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ConvertControllerIntegrationTest extends ControllerIntegrationTest {
+
+  @Test
+  public void testConvertInvalidFile() throws Exception {
+    String body = "invalid content";
+    RequestBuilder request = post("/convert/image/SBGN-ML:svg")
+        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+        .content(body);
+
+    mockMvc.perform(request)
+        .andExpect(status().isBadRequest());
+  }
+
+  @Test
+  public void testConvertInvalidMapFormat() throws Exception {
+    String body = "invalid content";
+    RequestBuilder request = post("/convert/image/unknown:svg")
+        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+        .content(body);
+
+    mockMvc.perform(request)
+        .andExpect(status().isBadRequest());
+  }
+
+}