fixes for json output

IQSS · Oct 22, 2024 · 842f04b · 842f04b
1 parent c12932f
commit 842f04b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -1893,17 +1893,17 @@ public JsonObjectBuilder compareVersionsAsJson() {
         if (!changedFileMetadata.isEmpty()) {
             changedFileMetadataDiff.entrySet().forEach(entry -> {
                 JsonArrayBuilder jab = Json.createArrayBuilder();
-                JsonObjectBuilder jobChanges = new NullSafeJsonBuilder();
-                jobChanges.add("fileName", entry.getKey().getDataFile().getOriginalFileName());
+                JsonObjectBuilder jobChanged = new NullSafeJsonBuilder();
+                jobChanged.add("fileName", entry.getKey().getDataFile().getDisplayName());
                 entry.getValue().entrySet().forEach(e -> {
                     JsonObjectBuilder jobDiffField = new NullSafeJsonBuilder();
                     jobDiffField.add("fieldName",e.getKey());
                     jobDiffField.add("oldValue",e.getValue().get(0));
                     jobDiffField.add("newValue",e.getValue().get(1));
                     jab.add(jobDiffField);
                 });
-                jobChanges.add("changes", jab);
-                jabDiffFiles.add(jobChanges);
+                jobChanged.add("changed", jab);
+                jabDiffFiles.add(jobChanged);
             });
             job.add("fileChanges", jabDiffFiles);
         }

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
@@ -5252,7 +5252,8 @@ public void testCompareDatasetVersionsAPI() {
                 .body("data.metadataChanges[1].changed[0].newValue", CoreMatchers.containsString("Parallel Group Design; Nested Case Control Design"))
                 .body("data.filesAdded[0].fileName", CoreMatchers.equalTo("dataverseproject.png"))
                 .body("data.filesRemoved[0].fileName", CoreMatchers.equalTo("dataverseproject_logo.jpg"))
-                .body("data.fileChanges[0].changes[0].newValue", CoreMatchers.equalTo("true"))
+                .body("data.fileChanges[0].fileName", CoreMatchers.equalTo("dataverse-icon-1200.png"))
+                .body("data.fileChanges[0].changed[0].newValue", CoreMatchers.equalTo("true"))
                 .body("data.TermsOfAccess", CoreMatchers.notNullValue())
                 .statusCode(OK.getStatusCode());
     }