diff --git a/src/main/java/uk/ac/ebi/eva/submission/controller/submissionws/SubmissionController.java b/src/main/java/uk/ac/ebi/eva/submission/controller/submissionws/SubmissionController.java index 7cb0b9e..89d36b4 100644 --- a/src/main/java/uk/ac/ebi/eva/submission/controller/submissionws/SubmissionController.java +++ b/src/main/java/uk/ac/ebi/eva/submission/controller/submissionws/SubmissionController.java @@ -94,10 +94,9 @@ public ResponseEntity markSubmissionUploaded(@RequestHeader("Authorization") } String submissionStatus = submissionService.getSubmissionStatus(submissionId); - System.out.println(submissionStatus); if (! Objects.equals(submissionStatus, SubmissionStatus.OPEN.toString())){ return new ResponseEntity<>( - "Submission " + submissionId + "is not in status " + SubmissionStatus.OPEN + + "Submission " + submissionId + " is not in status " + SubmissionStatus.OPEN + ". It cannot be marked as " + SubmissionStatus.UPLOADED + ". Current Status: " + submissionStatus, HttpStatus.BAD_REQUEST); diff --git a/src/test/java/uk/ac/ebi/eva/submission/integration/SubmissionWSIntegrationTest.java b/src/test/java/uk/ac/ebi/eva/submission/integration/SubmissionWSIntegrationTest.java index 8aeef77..364caad 100644 --- a/src/test/java/uk/ac/ebi/eva/submission/integration/SubmissionWSIntegrationTest.java +++ b/src/test/java/uk/ac/ebi/eva/submission/integration/SubmissionWSIntegrationTest.java @@ -633,7 +633,7 @@ public void testSubmissionAlreadyUploaded() throws Exception { .content(metadataJson) .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isBadRequest()) - .andExpect(content().string("Submission " + submissionId + "is not in status OPEN. " + + .andExpect(content().string("Submission " + submissionId + " is not in status OPEN. " + "It cannot be marked as UPLOADED. Current Status: UPLOADED")); }