Skip to content

[BI-2064] Invalid message if required data is missing #334

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
davedrp merged 2 commits into from
Mar 12, 2024
Merged

[BI-2064] Invalid message if required data is missing #334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71a7cf6
[BI-2026] If studyYear is null, change it to a blank, to avoid a null…
davedrp Feb 19, 2024
fc9c1c6
[BI-2026] protect against year = null
davedrp Mar 8, 2024
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
12 changes: 8 additions & 4 deletions ...ain/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ private String getImportObservationHash(ExperimentObservation importRow, String
private String getObservationHash(String observationUnitName, String variableName, String studyName) {
String concat = DigestUtils.sha256Hex(observationUnitName) +
DigestUtils.sha256Hex(variableName) +
DigestUtils.sha256Hex(studyName);
DigestUtils.sha256Hex(StringUtils.defaultString(studyName));
return DigestUtils.sha256Hex(concat);
}

Expand Down Expand Up @@ -792,12 +792,12 @@ private void validateConditionallyRequired(ValidationErrors validationErrors, in
}
}
if(validateRequiredCell(importRow.getEnvYear(), Columns.ENV_YEAR, errorMessage, validationErrors, rowNum)) {
String studyYear = this.studyByNameNoScope.get(importRow.getEnv()).getBrAPIObject().getSeasons().get(0);
String studyYear = StringUtils.defaultString( this.studyByNameNoScope.get(importRow.getEnv()).getBrAPIObject().getSeasons().get(0) );
String rowYear = importRow.getEnvYear();
if(commit) {
rowYear = this.yearToSeasonDbId(importRow.getEnvYear(), program.getId());
}
if(!studyYear.equals(rowYear)) {
if(StringUtils.isNotBlank(studyYear) && !studyYear.equals(rowYear)) {
addRowError(Columns.ENV_YEAR, ENV_YEAR_MISMATCH, validationErrors, rowNum);
}
}
Expand Down Expand Up @@ -1824,7 +1824,11 @@ private String yearToSeasonDbIdFromDatabase(String year, UUID programId) {
}
if (targetSeason == null) {
BrAPISeason newSeason = new BrAPISeason();
newSeason.setYear(Integer.parseInt(year));
Integer intYear = null;
if( StringUtils.isNotBlank(year) ){
intYear = Integer.parseInt(year);
}
newSeason.setYear(intYear);
newSeason.setSeasonName(year);
targetSeason = this.brAPISeasonDAO.addOneSeason(newSeason, programId);
}
Expand Down