fix download all files in dataset with guestbook response

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/api/Access.java

@@ -454,9 +454,11 @@ private Response processDatafileWithGuestbookResponse(ContainerRequestContext cr
         String displayName = "";
         String gbrids = null;
         List<String> fileIdList = new ArrayList<>();
+        String id = null;
         try {
             // since all files must be in the same Dataset we can generate a Guestbook Response once and just replace the DataFile for each file in the list
             DataFile firstDatafile = datafilesMap.values().size() > 0 ? (DataFile) Arrays.stream(datafilesMap.values().toArray()).findFirst().get() : null;
+            id = firstDatafile.getOwner().getId().toString();
             GuestbookResponse gbr = getGuestbookResponseFromBody(firstDatafile, GuestbookResponse.DOWNLOAD, jsonBody, user);
             boolean guestbookResponseRequired = checkGuestbookRequiredResponse(crc, uriInfo, firstDatafile, null);
             for (DataFile df : datafilesMap.values()) {
@@ -484,7 +486,11 @@ private Response processDatafileWithGuestbookResponse(ContainerRequestContext cr
             List<String> args = Arrays.asList(displayName, ex.getLocalizedMessage());
             return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.download.failure.guestbook.commandError", args));
         }
-        return returnSignedUrl(crc, uriInfo, user, String.join(",", fileIdList), gbrids);
+        // Check if requesting datafile(s) or all files within dataset
+        if (!uriInfo.getPath().toLowerCase().contains("/dataset/")) {
+            id = String.join(",", fileIdList);
+        }
+        return returnSignedUrl(crc, uriInfo, user, id, gbrids);
     }
 
     private Map<Long, DataFile> getDatafilesMap(ContainerRequestContext crc, String fileIds) {

src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java

@@ -4037,6 +4037,14 @@ public void testDownloadFileWithGuestbookResponse() throws IOException, JsonPars
         downloadResponse = UtilIT.postDownloadDatafiles(jsonBody, apiToken);
         assertEquals(OK.getStatusCode(), downloadResponse.getStatusCode());
 
+        // Download all files in dataset with guestbook response using dataset persistentId
+        downloadResponse = UtilIT.downloadAllDatasetFilesWithGuestbookResponse(persistentId, apiToken, guestbookResponse);
+        downloadResponse.prettyPrint();
+        assertEquals(OK.getStatusCode(), signedUrlResponse.getStatusCode());
+        signedUrl = UtilIT.getSignedUrlFromResponse(downloadResponse);
+        signedUrlResponse = get(signedUrl);
+        assertEquals(OK.getStatusCode(), signedUrlResponse.getStatusCode());
+
         downloadResponse = UtilIT.downloadFilesUrlWithGuestbookResponse(new Integer[]{fileId1, fileId2, fileId3}, apiToken, guestbookResponse);
         signedUrl = UtilIT.getSignedUrlFromResponse(downloadResponse);
         signedUrlResponse = get(signedUrl);

src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java

@@ -1302,8 +1302,19 @@ static Response downloadFilesUrlWithGuestbookResponse(String persistentId, Strin
         if (body != null) {
             requestSpecification.body(body);
         }
-        String getString = "/api/access/datafile/:persistentId?persistentId=" + persistentId;
-        return requestSpecification.post(getString);
+        String postString = "/api/access/datafile/:persistentId?persistentId=" + persistentId;
+        return requestSpecification.post(postString);
+    }
+    static Response downloadAllDatasetFilesWithGuestbookResponse(String persistentId, String apiToken, String body) {
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        if (body != null) {
+            requestSpecification.body(body);
+        }
+        String postString = "/api/access/dataset/:persistentId?persistentId=" + persistentId;
+        return requestSpecification.post(postString);
     }
 
     static Response postDownloadDatafiles(String body, String apiToken) {