From 842f04b7167cb9f1ee16226b40859f9955dd82b6 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 22 Oct 2024 10:53:58 -0400
Subject: [PATCH] fixes for json output

---
 .../harvard/iq/dataverse/DatasetVersionDifference.java    | 8 ++++----
 .../java/edu/harvard/iq/dataverse/api/DatasetsIT.java     | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
index 66542b18c8e..7e5750959ea 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -1893,8 +1893,8 @@ 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());
@@ -1902,8 +1902,8 @@ public JsonObjectBuilder compareVersionsAsJson() {
                     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
index 4b022b00cef..4d515a64cf5 100644
--- 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());
     }