diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java b/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java index a67e11c86e..5ba5676d58 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java @@ -371,7 +371,7 @@ private List validateDeviceModelAndTestPerformedCode( .fieldRequired(true) .fieldHeader(EQUIPMENT_MODEL_NAME) .errorType(ResultUploadErrorType.INVALID_DATA) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .build()); } diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/db/model/auxiliary/ResultUploadErrorSource.java b/backend/src/main/java/gov/cdc/usds/simplereport/db/model/auxiliary/ResultUploadErrorSource.java index 0c92a55598..8b13c7ebed 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/db/model/auxiliary/ResultUploadErrorSource.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/db/model/auxiliary/ResultUploadErrorSource.java @@ -1,6 +1,6 @@ package gov.cdc.usds.simplereport.db.model.auxiliary; public enum ResultUploadErrorSource { - REPORTSTREAM, - SIMPLEREPORT, + REPORT_STREAM, + SIMPLE_REPORT, } diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/service/TestResultUploadService.java b/backend/src/main/java/gov/cdc/usds/simplereport/service/TestResultUploadService.java index 67f8124081..6c8e9f022c 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/service/TestResultUploadService.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/service/TestResultUploadService.java @@ -305,7 +305,7 @@ private TestResultUpload saveSubmissionToDb( if (response.getErrors() != null && response.getErrors().length > 0) { for (var error : response.getErrors()) { - error.setSource(ResultUploadErrorSource.REPORTSTREAM); + error.setSource(ResultUploadErrorSource.REPORT_STREAM); } errorRepository.saveAll( diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java b/backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java index d0cebb1ceb..2cde374b18 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java @@ -186,7 +186,7 @@ public static List validateSpecimenType( .scope(ITEM_SCOPE) .message(getInValidValueErrorMessage(input.getValue(), input.getHeader())) .errorType(ResultUploadErrorType.INVALID_DATA) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .fieldRequired(true) .fieldHeader(input.getHeader()) .build()); @@ -201,7 +201,7 @@ public static List validateSpecimenType( .scope(ITEM_SCOPE) .message(getInValidValueErrorMessage(input.getValue(), input.getHeader())) .errorType(ResultUploadErrorType.INVALID_DATA) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .fieldRequired(true) .fieldHeader(input.getHeader()) .build()); @@ -277,7 +277,7 @@ public static List validateFlexibleDate(ValueOrError input) { .fieldHeader(input.getHeader()) .message(getInValidValueErrorMessage(input.getValue(), input.getHeader())) .errorType(ResultUploadErrorType.INVALID_DATA) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .fieldRequired(input.isRequired()) .build()); } @@ -318,7 +318,7 @@ public static ValueOrError getValue(Map row, String name, boolea .scope(ITEM_SCOPE) .fieldHeader(name) .message(getRequiredValueErrorMessage(name)) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .errorType(ResultUploadErrorType.MISSING_DATA) .fieldRequired(true) .build()); @@ -340,7 +340,7 @@ public static List hasMissingRequiredHeaders( .scope(CsvValidatorUtils.ITEM_SCOPE) .message( "The header for column " + requiredField + " is missing or invalid.") - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .fieldHeader(requiredField) .errorType(ResultUploadErrorType.MISSING_HEADER) .fieldRequired(true) @@ -449,7 +449,7 @@ private static List validateRegex(ValueOrError input, String re FeedbackMessage.builder() .scope(ITEM_SCOPE) .fieldHeader(input.getHeader()) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .message(getInValidValueErrorMessage(input.getValue(), input.getHeader())) .errorType(ResultUploadErrorType.INVALID_DATA) .fieldRequired(input.isRequired()) @@ -471,7 +471,7 @@ private static List validateInSet( .scope(ITEM_SCOPE) .fieldHeader(input.getHeader()) .message(getInValidValueErrorMessage(input.getValue(), input.getHeader())) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .errorType(ResultUploadErrorType.INVALID_DATA) .fieldRequired(input.isRequired()) .build()); diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/validators/FileValidator.java b/backend/src/main/java/gov/cdc/usds/simplereport/validators/FileValidator.java index 7fbd81b7b3..a0b9f662d7 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/validators/FileValidator.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/validators/FileValidator.java @@ -34,7 +34,7 @@ public List validate(InputStream csvStream) { FeedbackMessage.builder() .scope(CsvValidatorUtils.ITEM_SCOPE) .message("File is missing headers and other required data") - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .build(); mergeErrors(mapOfErrors, new ArrayList<>(List.of(feedback))); } @@ -57,7 +57,7 @@ public List validate(InputStream csvStream) { .message( "File has the incorrect number of columns or empty rows. Please make sure all columns match the data template, and delete any empty rows.") .indices(new ArrayList<>(List.of(rowNumber))) - .source(ResultUploadErrorSource.SIMPLEREPORT) + .source(ResultUploadErrorSource.SIMPLE_REPORT) .build(); mergeErrors(mapOfErrors, new ArrayList<>(List.of(feedback))); continue; diff --git a/backend/src/main/resources/db/changelog/db.changelog-master.yaml b/backend/src/main/resources/db/changelog/db.changelog-master.yaml index 2a9c988226..550d107aef 100644 --- a/backend/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/backend/src/main/resources/db/changelog/db.changelog-master.yaml @@ -4738,7 +4738,7 @@ databaseChangeLog: - sql: remarks: Create the enumerations for upload error sources sql: | - CREATE TYPE ${database.defaultSchemaName}.RESULT_UPLOAD_ERROR_SOURCE as ENUM('SIMPLEREPORT', 'REPORTSTREAM'); + CREATE TYPE ${database.defaultSchemaName}.RESULT_UPLOAD_ERROR_SOURCE as ENUM('SIMPLE_REPORT', 'REPORT_STREAM'); - createTable: tableName: result_upload_error remarks: A collection of errors for bulk upload submission attempts.