adding limit check on multi file upload

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java

@@ -2064,6 +2064,19 @@ public Response addFiles(String jsonData, Dataset dataset, User authUser, boolea
                 totalNumberofFiles = filesJson.getValuesAs(JsonObject.class).size();
                 workingVersion = dataset.getOrCreateEditVersion();
                 clone = workingVersion.cloneDatasetVersion();
+
+                if (!authUser.isSuperuser()) {
+                    Integer effectiveDatasetFileCountLimit = dataset.getEffectiveDatasetFileCountLimit();
+                    boolean hasFileCountLimit = dataset.isDatasetFileCountLimitSet(effectiveDatasetFileCountLimit);
+                    if (hasFileCountLimit) {
+                        int uploadedFileCount = datasetService.getDataFileCountByOwner(dataset.getId());
+                        if (uploadedFileCount + totalNumberofFiles >= effectiveDatasetFileCountLimit) {
+                            return error(Response.Status.BAD_REQUEST,
+                                    BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Arrays.asList(String.valueOf(effectiveDatasetFileCountLimit))));
+                        }
+                    }
+                }
+
                 for (JsonObject fileJson : filesJson.getValuesAs(JsonObject.class)) {
 
                     OptionalFileParams optionalFileParams = null;

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

@@ -450,6 +450,25 @@ public void testCreateUpdateDatasetFileCountLimit() throws JsonParseException {
                 .body("data.datasetFileCountLimit", equalTo(null));
     }
 
+    @Test
+    public void testMultipleFileUploadOverCountLimit() {
+        Response createUser = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response createDataverseResponse = createFileLimitedDataverse(1, apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+
+        String json = "[{\"id\":0},{\"id\":1},{\"id\":2}]"; // simple array since we only need an array size
+        Response addFilesResponse = UtilIT.addFiles(datasetId.toString(), json, apiToken);
+        addFilesResponse.prettyPrint();
+        addFilesResponse.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", Collections.singletonList("1"))))
+                .statusCode(BAD_REQUEST.getStatusCode());
+    }
+
     @Test
     public void testAddUpdateDatasetViaNativeAPI() {
 

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

@@ -2891,6 +2891,14 @@ static Response getUploadUrls(String idOrPersistentIdOfDataset, long sizeInBytes
         return requestSpecification.get("/api/datasets/" + idInPath + "/uploadurls?size=" + sizeInBytes + optionalQueryParam);
     }
 
+    static Response addFiles(String idInPath, String jsonData, String apiToken) {
+        RequestSpecification requestSpecification = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType(ContentType.MULTIPART)
+                .multiPart("jsonData", jsonData);
+        return requestSpecification.post("/api/datasets/" + idInPath + "/addFiles");
+    }
+
     /**
      * If you set dataverse.files.localstack1.disable-tagging=true you will see
      * an error like below.