Skip to content

[BI-1446] trait error: fix error display on trait form #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctucker3 merged 3 commits into from
Jun 14, 2022
Merged

[BI-1446] trait error: fix error display on trait form #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d39ad42
trait error: fix error display on trait form
Jun 10, 2022
3766227
trait validation: fix unit tests
Jun 10, 2022
fd3cf90
trait controller: fix tests
Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/main/java/org/breedinginsight/services/validators/TraitValidatorError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,86 +37,86 @@ public Integer getRowNumber(Integer row) {

@Override
public ValidationError getTraitIdDoesNotExistMsg() {
return new ValidationError("Trait Id", "Trait with that id does not exist", HttpStatus.NOT_FOUND);
return new ValidationError("traitId", "Trait with that id does not exist", HttpStatus.NOT_FOUND);
}

@Override
public ValidationError getMissingMethodMsg() {
return new ValidationError("Method", "Missing method", HttpStatus.BAD_REQUEST);
return new ValidationError("method", "Missing method", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingMethodClassMsg() {
return new ValidationError("Method Class", "Missing method class", HttpStatus.BAD_REQUEST);
return new ValidationError("method.methodClass", "Missing method class", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingScaleMsg() {
return new ValidationError("Scale", "Missing scale", HttpStatus.BAD_REQUEST);
return new ValidationError("scale", "Missing scale", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingScaleNameMsg() {
return new ValidationError("Scale Name", "Missing scale name", HttpStatus.BAD_REQUEST);
return new ValidationError("scale.scaleName", "Missing scale name", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingScaleDataTypeMsg() {
return new ValidationError("Scale Data Type", "Missing scale data type", HttpStatus.BAD_REQUEST);
return new ValidationError("scale.dataType", "Missing scale data type", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingObsVarNameMsg() {
return new ValidationError("Name", "Missing Name", HttpStatus.BAD_REQUEST);
return new ValidationError("observationVariableName", "Missing Name", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingTraitEntityMsg() {
return new ValidationError("Entity", "Missing trait entity", HttpStatus.BAD_REQUEST);
return new ValidationError("entity", "Missing trait entity", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingTraitAttributeMsg() {
return new ValidationError("Attribute", "Missing trait attribute", HttpStatus.BAD_REQUEST);
return new ValidationError("attribute", "Missing trait attribute", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingTraitDescriptionMsg() {
return new ValidationError("Trait Description", "Missing trait description", HttpStatus.BAD_REQUEST);
return new ValidationError("traitDescription", "Missing trait description", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingProgramObservationLevelMsg() {
return new ValidationError("Program Observation Level Name", "Missing program observation level", HttpStatus.BAD_REQUEST);
return new ValidationError("programObservationLevel.name", "Missing program observation level", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingMethodFormulaMsg() {
return new ValidationError("Method Formula", "Missing method formula for Computation method", HttpStatus.BAD_REQUEST);
return new ValidationError("method.formula", "Missing method formula for Computation method", HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getMissingScaleCategoriesMsg(DataType dataType) {
return new ValidationError("Scale Categories",
return new ValidationError("scale.categories",
String.format("Missing scale categories for %s scale", WordUtils.capitalize(dataType.getLiteral().toLowerCase())),
HttpStatus.BAD_REQUEST);
}

@Override
public ValidationError getBadScaleCategory() {
return new ValidationError("Scale Categories", "Scale categories contain errors", HttpStatus.UNPROCESSABLE_ENTITY);
return new ValidationError("scale.categories", "Scale categories contain errors", HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getBlankScaleCategoryLabelMsg() {
return new ValidationError("Scale Categories Label",
return new ValidationError("scale.categories.label",
"Label missing.",
HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getBlankScaleCategoryValueMsg() {
return new ValidationError("Scale Categories Value",
return new ValidationError("scale.categories.value",
"Value missing.",
HttpStatus.UNPROCESSABLE_ENTITY);
}
Expand All @@ -130,7 +130,7 @@ public ValidationError getPopulatedNominalCategoryLabelMsg() {

@Override
public ValidationError getMaxLessThenMinError() {
return new ValidationError("Scale Valid Value Max",
return new ValidationError("scale.validValueMax",
"Scale valid value max must be greater than valid value min.",
HttpStatus.UNPROCESSABLE_ENTITY);
}
Expand All @@ -142,39 +142,39 @@ public ValidationError getInsufficientNominalValError() {

@Override
public ValidationError getInsufficientOrdinalValError() {
return new ValidationError("Scale Categories", "Ordinal scales must have at least two categories.", HttpStatus.UNPROCESSABLE_ENTITY);
return new ValidationError("scale.categories", "Ordinal scales must have at least two categories.", HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getCharLimitObsVarNameMsg() {
return new ValidationError("Name", "Name exceeds 12 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
return new ValidationError("observationVariableName", "Name exceeds 12 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getCharLimitTraitEntityMsg() {
return new ValidationError("Entity", "Trait entity exceeds 30 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
return new ValidationError("entity", "Trait entity exceeds 30 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getCharLimitTraitAttributeMsg() {
return new ValidationError("Attribute", "Trait attribute exceeds 30 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
return new ValidationError("attribute", "Trait attribute exceeds 30 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getCharLimitMethodDescriptionMsg() {
return new ValidationError("Method Description", "Method description exceeds 30 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
return new ValidationError("method.description", "Method description exceeds 30 character limit", HttpStatus.UNPROCESSABLE_ENTITY);
}

@Override
public ValidationError getDuplicateTraitByNamesMsg() {
return new ValidationError("Trait Name", "Trait name already exists", HttpStatus.CONFLICT);
return new ValidationError("traitName", "Trait name already exists", HttpStatus.CONFLICT);
}


@Override
public ValidationError getDuplicateTraitsByNameInFileMsg(List<Integer> matchingRows) {
matchingRows = matchingRows.stream().map(rowIndex -> getRowNumber(rowIndex)).collect(Collectors.toList());
return new ValidationError("Trait Name",
return new ValidationError("traitName",
"traitName is a duplicate. Duplicate set of traits are rows " + matchingRows.toString(),
HttpStatus.CONFLICT);
}
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,12 +1120,12 @@ public void postTraitOrdinalMissingCategoryVariables() {
JsonObject categoryError = categoryErrors.get(0).getAsJsonObject();
assertEquals(0, categoryError.get("rowIndex").getAsInt(), "wrong error row index returned");
JsonObject valueError = categoryError.getAsJsonArray("errors").get(0).getAsJsonObject();
assertEquals("Scale Categories Value", valueError.get("field").getAsString(), "wrong error returned");
assertEquals("scale.categories.value", valueError.get("field").getAsString(), "wrong error returned");

JsonObject secondCategoryError = categoryErrors.get(1).getAsJsonObject();
assertEquals(2, secondCategoryError.get("rowIndex").getAsInt(), "wrong error row index returned");
JsonObject labelError = secondCategoryError.getAsJsonArray("errors").get(0).getAsJsonObject();
assertEquals("Scale Categories Label", labelError.get("field").getAsString(), "wrong error returned");
assertEquals("scale.categories.label", labelError.get("field").getAsString(), "wrong error returned");
}

@Test
Expand Down Expand Up @@ -1365,13 +1365,13 @@ public void putTraitMultipleValidationErrors() {
JsonArray errors = rowError.getAsJsonArray("errors");
assertEquals(1, errors.size(), "Not enough errors were returned");
JsonObject error1 = errors.get(0).getAsJsonObject();
assertEquals("Name", error1.get("field").getAsString(), "wrong error returned");
assertEquals("observationVariableName", error1.get("field").getAsString(), "wrong error returned");

JsonObject badIdRowError = rowErrors.get(1).getAsJsonObject();
errors = badIdRowError.getAsJsonArray("errors");
assertEquals(1, errors.size(), "Not enough errors were returned");
JsonObject error = errors.get(0).getAsJsonObject();
assertEquals("Trait Id", error.get("field").getAsString(), "wrong error returned");
assertEquals("traitId", error.get("field").getAsString(), "wrong error returned");
}

@Test
Expand Down Expand Up @@ -1447,7 +1447,7 @@ public void putTraitIdDoesNotExist() {
JsonArray errors = rowError.getAsJsonArray("errors");
assertEquals(1, errors.size(), "Not enough errors were returned");
JsonObject error = errors.get(0).getAsJsonObject();
assertEquals("Trait Id", error.get("field").getAsString(), "wrong error returned");
assertEquals("traitId", error.get("field").getAsString(), "wrong error returned");
}

@Test
Expand Down
36 changes: 18 additions & 18 deletions src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void missingMethod() {
RowValidationErrors rowValidationErrors = validationErrors.getRowErrors().get(0);
assertEquals(1, rowValidationErrors.getErrors().size(), "Wrong number of errors for row");
assertEquals(400, rowValidationErrors.getErrors().get(0).getHttpStatusCode(), "Wrong error code");
assertEquals("Method", rowValidationErrors.getErrors().get(0).getField(), "Wrong error column");
assertEquals("method", rowValidationErrors.getErrors().get(0).getField(), "Wrong error column");
}

@Test
Expand Down Expand Up @@ -124,7 +124,7 @@ public void missingScale() {
RowValidationErrors rowValidationErrors = validationErrors.getRowErrors().get(0);
assertEquals(1, rowValidationErrors.getErrors().size(), "Wrong number of errors for row");
assertEquals(400, rowValidationErrors.getErrors().get(0).getHttpStatusCode(), "Wrong error code");
assertEquals("Scale", rowValidationErrors.getErrors().get(0).getField(), "Wrong error column");
assertEquals("scale", rowValidationErrors.getErrors().get(0).getField(), "Wrong error column");
}

@Test
Expand All @@ -143,14 +143,14 @@ public void missingMultiple() {
RowValidationErrors rowValidationErrors = validationErrors.getRowErrors().get(0);
assertEquals(6, rowValidationErrors.getErrors().size(), "Wrong number of errors for row");
Map<String, Integer> expectedColumns = new HashMap<>();
expectedColumns.put("Name", 400);
expectedColumns.put("Entity", 400);
expectedColumns.put("Attribute", 400);
expectedColumns.put("Trait Description", 400);
expectedColumns.put("Program Observation Level Name", 400);
expectedColumns.put("Method Class", 400);
expectedColumns.put("Scale Name", 400);
expectedColumns.put("Scale Data Type", 400);
expectedColumns.put("observationVariableName", 400);
expectedColumns.put("entity", 400);
expectedColumns.put("attribute", 400);
expectedColumns.put("traitDescription", 400);
expectedColumns.put("programObservationLevel.name", 400);
expectedColumns.put("method.methodClass", 400);
expectedColumns.put("scale.scaleName", 400);
expectedColumns.put("scale.dataType", 400);
List<Boolean> seenTrackList = expectedColumns.keySet().stream().map(column -> false).collect(Collectors.toList());

Boolean unknownColumnReturned = false;
Expand Down Expand Up @@ -187,8 +187,8 @@ public void dataConsistencyCheckFailure() {
RowValidationErrors rowValidationErrors = validationErrors.getRowErrors().get(0);
assertEquals(2, rowValidationErrors.getErrors().size(), "Wrong number of errors for row");
Map<String, Integer> expectedColumns = new HashMap<>();
expectedColumns.put("Method Formula", 400);
expectedColumns.put("Scale Categories", 400);
expectedColumns.put("method.formula", 400);
expectedColumns.put("scale.categories", 400);
List<Boolean> seenTrackList = expectedColumns.keySet().stream().map(column -> false).collect(Collectors.toList());

Boolean unknownColumnReturned = false;
Expand Down Expand Up @@ -229,8 +229,8 @@ public void dataInsufficientCategoriesFailure() {
RowValidationErrors rowValidationErrors = validationErrors.getRowErrors().get(0);
assertEquals(2, rowValidationErrors.getErrors().size(), "Wrong number of errors for row");
Map<String, Integer> expectedColumns = new HashMap<>();
expectedColumns.put("Method Formula", 400);
expectedColumns.put("Scale Categories", 422);
expectedColumns.put("method.formula", 400);
expectedColumns.put("scale.categories", 422);
List<Boolean> seenTrackList = expectedColumns.keySet().stream().map(column -> false).collect(Collectors.toList());

Boolean unknownColumnReturned = false;
Expand Down Expand Up @@ -328,10 +328,10 @@ public void charLimitExceeded() {
assertEquals(4, rowValidationErrors.getErrors().size(), "Wrong number of errors for row");

Map<String, Integer> expectedColumns = new HashMap<>();
expectedColumns.put("Name", 422);
expectedColumns.put("Entity", 422);
expectedColumns.put("Attribute", 422);
expectedColumns.put("Method Description", 422);
expectedColumns.put("observationVariableName", 422);
expectedColumns.put("entity", 422);
expectedColumns.put("attribute", 422);
expectedColumns.put("method.description", 422);
List<Boolean> seenTrackList = expectedColumns.keySet().stream().map(column -> false).collect(Collectors.toList());

Boolean unknownColumnReturned = false;
Expand Down