Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## BUG ##
Changed "userName" in guestbook response to "name" to match the parser in API GET /api/guestbooks/{guestbookId}/responses
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import edu.harvard.iq.dataverse.util.BundleUtil;
import edu.harvard.iq.dataverse.util.DatasetFieldWalker;
import edu.harvard.iq.dataverse.util.MailUtil;
import edu.harvard.iq.dataverse.util.StringUtil;
import edu.harvard.iq.dataverse.workflow.Workflow;
import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
import jakarta.ejb.EJB;
Expand Down Expand Up @@ -426,7 +427,9 @@ public static JsonObjectBuilder json(GuestbookResponse gbResponse) {
if (gbResponse.getDataFile().getGlobalId() != null) {
guestbookResponseObject.add("filePid", gbResponse.getDataFile().getGlobalId().asString());
}
guestbookResponseObject.add("userName", gbResponse.getAuthenticatedUser() != null ? gbResponse.getAuthenticatedUser().getUserIdentifier() : "Guest");
if (!StringUtil.isEmpty(gbResponse.getName())) {
guestbookResponseObject.add("name", gbResponse.getName());
}
if (gbResponse.getEmail() != null) {
guestbookResponseObject.add("email", gbResponse.getEmail());
}
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -4114,6 +4114,8 @@ public void testDownloadFileWithGuestbookResponse() throws IOException, JsonPars
.statusCode(OK.getStatusCode());
JsonPath jsonPath = JsonPath.from(guestbookListResponses.body().asString());
int totalCount = jsonPath.getList("data.responses").size();
assertTrue(totalCount > 0);
assertNotNull(jsonPath.getString("data.responses[0].name"));

// Test Get Responses with pagination
int pages = 4; // total should be 17. set to 4 pages
Expand Down
Loading