Merge pull request #1586 from CMSgov/QPPA-11181

QPPA-11181: Resolve edge-case 500 errors

Author: ckawell-sb

commons/src/main/resources/measures-data.json

@@ -41808,7 +41808,7 @@
     "nqfEMeasureId": null,
     "nqfId": null,
     "measureType": "process",
-    "isHighPriority": true,
+    "isHighPriority": false,
     "primarySteward": "Centers for Medicare & Medicaid Services",
     "isInverse": false,
     "isRiskAdjusted": false,

rest-api/src/main/java/gov/cms/qpp/conversion/api/controllers/v1/ExceptionHandlerControllerV1.java

@@ -9,6 +9,7 @@
 import gov.cms.qpp.conversion.model.error.TransformException;
 
 import com.amazonaws.AmazonServiceException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -18,8 +19,11 @@
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
+import gov.cms.qpp.conversion.api.exceptions.BadZipException;
+
 /**
  * Modify the controller to send back different responses for exceptions
  */
@@ -102,6 +106,23 @@ ResponseEntity<String> handleInvalidFileTypeException(InvalidFileTypeException e
 		return new ResponseEntity<>(exception.getMessage(), httpHeaders, HttpStatus.NOT_FOUND);
 	}
 
+	/**
+	 * "Catch" the {@link BadZipException}.
+	 * Return the {@link AllErrors} with an HTTP status 400.
+	 *
+	 * @param exception The BadZipException that was "caught".
+	 * @return The BadZipException message
+	 */
+	@ExceptionHandler(BadZipException.class)
+	@ResponseBody
+	ResponseEntity<String> handleBadZipException(BadZipException exception) {
+		API_LOG.error("Zip file is corrupt, incomplete, or invalid.", exception);
+		HttpHeaders httpHeaders = new HttpHeaders();
+		httpHeaders.setContentType(MediaType.TEXT_PLAIN);
+
+		return new ResponseEntity<>(exception.getMessage(), httpHeaders, HttpStatus.BAD_REQUEST);
+	}
+
 	@ExceptionHandler(AmazonServiceException.class)
 	@ResponseBody
 	ResponseEntity<String> handleAmazonException(AmazonServiceException exception) {
@@ -122,6 +143,26 @@ ResponseEntity<String> handleInvalidPurposeException(InvalidPurposeException exc
 			.body(exception.getMessage());
 	}
 
+	/**
+	 * "Catch" the {@link MultipartException}.
+	 * Return an error message with an HTTP status 400.
+	 *
+	 * @param exception The MultipartException that was "caught".
+	 * @return The error message explaining the malformed multipart request
+	 */
+	@ExceptionHandler(MultipartException.class)
+	@ResponseBody
+	ResponseEntity<String> handleMultipartException(MultipartException exception) {
+		API_LOG.error("Malformed multipart request", exception);
+		HttpHeaders httpHeaders = new HttpHeaders();
+		httpHeaders.setContentType(MediaType.TEXT_PLAIN);
+
+		String message = "Invalid multipart request: " + 
+			(exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage());
+		
+		return new ResponseEntity<>(message, httpHeaders, HttpStatus.BAD_REQUEST);
+	}
+
 	private ResponseEntity<AllErrors> cope(TransformException exception) {
 		HttpHeaders httpHeaders = new HttpHeaders();
 		httpHeaders.setContentType(MediaType.APPLICATION_JSON);

rest-api/src/main/java/gov/cms/qpp/conversion/api/controllers/v2/ZipController.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
 import org.slf4j.Logger;
@@ -18,6 +19,7 @@
 
 import gov.cms.qpp.conversion.ConversionReport;
 import gov.cms.qpp.conversion.api.controllers.SkeletalQrdaController;
+import gov.cms.qpp.conversion.api.exceptions.BadZipException;
 import gov.cms.qpp.conversion.api.model.ConvertResponse;
 import gov.cms.qpp.conversion.api.model.Metadata;
 import gov.cms.qpp.conversion.api.services.AuditService;
@@ -53,6 +55,9 @@ protected List<ConvertResponse> respond(MultipartFile file, String checkedPurpos
 			}
 			return responses;
 		} catch (IOException e) {
+			if (e instanceof ZipException) {
+				throw new BadZipException("Zip file is corrupt, incomplete, or invalid.");
+			}
 			throw new UncheckedIOException(e);
 		}
 	}

rest-api/src/main/java/gov/cms/qpp/conversion/api/exceptions/BadZipException.java

@@ -0,0 +1,15 @@
+package gov.cms.qpp.conversion.api.exceptions;
+
+/**
+ * Exception for handling an invalid file type
+ */
+public class BadZipException extends RuntimeException {
+
+	/**
+	 * Constructor to call RuntimeException
+	 * @param message Error response
+	 */
+	public BadZipException(String message) {
+		super(message);
+	}
+}

rest-api/src/test/java/gov/cms/qpp/conversion/api/controllers/v2/ZipControllerTest.java

@@ -10,7 +10,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -32,6 +31,7 @@
 import gov.cms.qpp.conversion.ConversionReport;
 import gov.cms.qpp.conversion.Source;
 import gov.cms.qpp.conversion.api.exceptions.AuditException;
+import gov.cms.qpp.conversion.api.exceptions.BadZipException;
 import gov.cms.qpp.conversion.api.model.ConvertResponse;
 import gov.cms.qpp.conversion.api.model.Metadata;
 import gov.cms.qpp.conversion.api.services.AuditService;
@@ -120,7 +120,7 @@ void uploadTestQrdaFile() {
 
 	@Test
 	void uploadNullQrdaFile() {
-		Assertions.assertThrows(UncheckedIOException.class, () -> {
+		Assertions.assertThrows(BadZipException.class, () -> {
 			objectUnderTest.uploadQrdaFile(new MockMultipartFile("null.zip", new byte[0]), "Test");
 		});
 	}