Skip to content

10168 fix api error response for getDatasetVersionArchivalStatus #10185

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
pdurbin merged 2 commits into from
Dec 15, 2023
Merged

10168 fix api error response for getDatasetVersionArchivalStatus #10185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
960a20c
#10168 fix error response status
sekmiller Dec 12, 2023
daf8926
#10168 update integration tests
sekmiller Dec 12, 2023
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
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4288,7 +4288,7 @@ public Response getDatasetVersionArchivalStatus(@Context ContainerRequestContext
headers);

if (dsv.getArchivalCopyLocation() == null) {
return error(Status.NO_CONTENT, "This dataset version has not been archived");
return error(Status.NOT_FOUND, "This dataset version has not been archived");
} else {
JsonObject status = JsonUtil.getJsonObject(dsv.getArchivalCopyLocation());
return ok(status);
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3291,7 +3291,8 @@ public void testArchivalStatusAPI() throws IOException {

//Verify the status is empty
Response nullStatus = UtilIT.getDatasetVersionArchivalStatus(datasetId, "1.0", apiToken);
nullStatus.then().assertThat().statusCode(NO_CONTENT.getStatusCode());
nullStatus.prettyPrint();
nullStatus.then().assertThat().statusCode(NOT_FOUND.getStatusCode());

//Set it
Response setStatus = UtilIT.setDatasetVersionArchivalStatus(datasetId, "1.0", apiToken, "pending",
Expand All @@ -3309,7 +3310,7 @@ public void testArchivalStatusAPI() throws IOException {

//Make sure it's gone
Response nullStatus2 = UtilIT.getDatasetVersionArchivalStatus(datasetId, "1.0", apiToken);
nullStatus2.then().assertThat().statusCode(NO_CONTENT.getStatusCode());
nullStatus2.then().assertThat().statusCode(NOT_FOUND.getStatusCode());

}

Expand Down