Skip to content

A fix for the harvesting regression/tests introduced in 10836 #10990

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
ofahimIQSS merged 1 commit into from
Nov 1, 2024
Merged

A fix for the harvesting regression/tests introduced in 10836 #10990

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
49 changes: 33 additions & 16 deletions src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,7 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve
if (harvestedVersion.getReleaseTime() == null) {
harvestedVersion.setReleaseTime(oaiDateStamp);
}

// is this the right place to call tidyUpFields()?
// usually it is called within the body of the create/update commands
// later on.
DatasetFieldUtil.tidyUpFields(harvestedVersion.getDatasetFields(), true);


// Check data against validation constraints.
// Make an attempt to sanitize any invalid fields encountered -
// missing required fields or invalid values, by filling the values
Expand All @@ -382,7 +377,9 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve
if (sanitized) {
validateVersionMetadata(harvestedVersion, cleanupLog);
}


DatasetFieldUtil.tidyUpFields(harvestedVersion.getDatasetFields(), true);

if (existingDataset != null) {
importedDataset = engineSvc.submit(new UpdateHarvestedDatasetCommand(existingDataset, harvestedVersion, dataverseRequest));
} else {
Expand Down Expand Up @@ -742,15 +739,35 @@ private boolean validateVersionMetadata(DatasetVersion version, boolean sanitize
boolean fixed = false;
Set<ConstraintViolation> invalidViolations = version.validate();
if (!invalidViolations.isEmpty()) {
for (ConstraintViolation<DatasetFieldValue> v : invalidViolations) {
DatasetFieldValue f = v.getRootBean();

String msg = "Invalid metadata field: " + f.getDatasetField().getDatasetFieldType().getDisplayName() + "; "
+ "Invalid value: '" + f.getValue() + "'";
if (sanitize) {
msg += ", replaced with '" + DatasetField.NA_VALUE + "'";
f.setValue(DatasetField.NA_VALUE);
fixed = true;
for (ConstraintViolation v : invalidViolations) {
Object invalid = v.getRootBean();
String msg = "";
if (invalid instanceof DatasetField) {
DatasetField f = (DatasetField) invalid;

msg += "Missing required field: " + f.getDatasetFieldType().getDisplayName() + ";";
if (sanitize) {
msg += " populated with '" + DatasetField.NA_VALUE + "'";
f.setSingleValue(DatasetField.NA_VALUE);
fixed = true;
}
} else if (invalid instanceof DatasetFieldValue) {
DatasetFieldValue fv = (DatasetFieldValue) invalid;

msg += "Invalid metadata field: " + fv.getDatasetField().getDatasetFieldType().getDisplayName() + "; "
+ "Invalid value: '" + fv.getValue() + "'";
if (sanitize) {
msg += ", replaced with '" + DatasetField.NA_VALUE + "'";
fv.setValue(DatasetField.NA_VALUE);
fixed = true;
}
} else {
// DatasetVersion.validate() can also produce constraint violations
// in TermsOfUse and FileMetadata classes.
// We do not make any attempt to sanitize those.
if (invalid != null) {
msg += "Invalid " + invalid.getClass().getName() + ": " + v.getMessage();
}
}
cleanupLog.println(msg);

Expand Down