Skip to content
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.

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

prevent double linking of datasets and dataverses #7259 #7415

Merged
merged 6 commits into from
Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
import edu.harvard.iq.dataverse.util.BundleUtil;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.solr.client.solrj.SolrServerException;

/**
Expand Down Expand Up @@ -50,6 +52,13 @@ public DatasetLinkingDataverse execute(CommandContext ctxt) throws CommandExcept
if (linkedDataset.getOwner().getOwners().contains(linkingDataverse)) {
throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.link.not.to.parent.dataverse"), this);
}
List<Dataverse> existingLinksToDataverses = new ArrayList<>();
for (DatasetLinkingDataverse datasetLinkingDataverse : linkedDataset.getDatasetLinkingDataverses()) {
pdurbin marked this conversation as resolved.
Show resolved Hide resolved
existingLinksToDataverses.add(datasetLinkingDataverse.getLinkingDataverse());
}
if (existingLinksToDataverses.contains(linkingDataverse)) {
throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.link.not.already.linked"), this);
}

DatasetLinkingDataverse datasetLinkingDataverse = new DatasetLinkingDataverse();
datasetLinkingDataverse.setDataset(linkedDataset);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/propertyFiles/Bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,7 @@ dataset.link.not.to.owner=Can't link a dataset to its dataverse
dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
dataset.link.not.published=Can't link a dataset that has not been published
dataset.link.not.available=Can't link a dataset that has not been published or is not harvested
dataset.link.not.already.linked=Can't link a dataset that has already been linked to this dataverse
dataset.email.datasetContactTitle=Contact Dataset Owner
dataset.email.hiddenMessage=
dataset.email.messageSubject=Test Message Subject
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@ public void testMoveLinkedDataset() {
linkDataset.then().assertThat()
.statusCode(OK.getStatusCode());

// A dataset cannot be linked to the same dataverse again.
pdurbin marked this conversation as resolved.
Show resolved Hide resolved
Response tryToLinkAgain = UtilIT.linkDataset(datasetPid, dataverse2Alias, superuserApiToken);
tryToLinkAgain.prettyPrint();
tryToLinkAgain.then().assertThat()
.statusCode(FORBIDDEN.getStatusCode());

Response getLinksBefore = UtilIT.getDatasetLinks(datasetPid, superuserApiToken);
getLinksBefore.prettyPrint();
getLinksBefore.then().assertThat()
Expand Down