Skip to content

validation error for projectIdPrefix / researchProjectName #1379

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

Draft
naknomum wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

validation error for projectIdPrefix / researchProjectName #1379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions src/main/java/org/ecocean/api/bulk/BulkImportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,29 @@ public static Map<String, Object> validateRow(JSONObject row, Shepherd myShepher
ApiException.ERROR_RETURN_CODE_INVALID));
}
}

// 1314 introduces catching incomplete project name/prefix combos
List<String> projectPrefixes = findIndexedFieldNames(fieldNames, "Encounter.project.projectIdPrefix");
List<String> projectNames = findIndexedFieldNames(fieldNames, "Encounter.project.researchProjectName");
// we use the bigger of these
int pmax = Integer.max(projectPrefixes.size(), projectNames.size());
for (int i = 0; i < pmax; i++) {
String pnameKey = "Encounter.project" + i + ".researchProjectName";
String pprefixKey = "Encounter.project" + i + ".projectIdPrefix";
Object pname = getValue(rtn, pnameKey);
Object pprefix = getValue(rtn, pprefixKey);
if ((pname == null) && (pprefix == null)) continue;
if ((pname != null) && (pprefix != null)) continue;
if (pname == null)
rtn.put(pnameKey,
new BulkValidatorException("must have researchProjectName if given projectIdPrefix",
ApiException.ERROR_RETURN_CODE_REQUIRED));
if (pprefix == null)
rtn.put(pprefixKey,
new BulkValidatorException("must have projectIdPrefix if given researchProjectName",
ApiException.ERROR_RETURN_CODE_REQUIRED));
}

return rtn;
}

Expand Down
Loading