Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,17 @@ public Response destroyDataset(@Context ContainerRequestContext crc, @PathParam(
fileService.finalizeFileDeletes(deleteStorageLocations);
}

return ok("Dataset " + id + " destroyed");
return ok(getDatasetDestroyedMessage(id, doomed));
}, u);
}

static String getDatasetDestroyedMessage(String id, Dataset dataset) {
String datasetIdentifier = PERSISTENT_ID_KEY.equals(id)
? dataset.getGlobalId().asString()
: id;
return "Dataset " + datasetIdentifier + " destroyed";
}

@DELETE
@AuthRequired
@Path("{id}/versions/{versionId}")
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/edu/harvard/iq/dataverse/api/DatasetsTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package edu.harvard.iq.dataverse.api;

import edu.harvard.iq.dataverse.Dataset;
import edu.harvard.iq.dataverse.GlobalId;
import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
import org.junit.jupiter.api.Test;
import java.util.HashSet;
import java.util.Set;
Expand Down Expand Up @@ -55,4 +58,19 @@ public void testCleanup() {
assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9_suffix"));
assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9.aux"));
}

@Test
public void testGetDatasetDestroyedMessageWithId() {
assertEquals("Dataset 42 destroyed", Datasets.getDatasetDestroyedMessage("42", new Dataset()));
}

@Test
public void testGetDatasetDestroyedMessageWithPersistentId() {
Dataset dataset = new Dataset();
dataset.setGlobalId(new GlobalId(AbstractDOIProvider.DOI_PROTOCOL, "10.5072", "FK2/ABCDEF", "/",
AbstractDOIProvider.DOI_RESOLVER_URL, null));

assertEquals("Dataset doi:10.5072/FK2/ABCDEF destroyed",
Datasets.getDatasetDestroyedMessage(AbstractApiBean.PERSISTENT_ID_KEY, dataset));
}
Comment thread
pdurbin marked this conversation as resolved.
}