#11188 revert to json response

IQSS · Feb 6, 2025 · fd92d18 · fd92d18
1 parent 6d31fe3
commit fd92d18
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -63,6 +63,7 @@ public void setDifferenceSummaryGroups(List<DifferenceSummaryGroup> differenceSu
     public DatasetVersionDifference(DatasetVersion newVersion, DatasetVersion originalVersion) {
         setOriginalVersion(originalVersion);
         setNewVersion(newVersion);
+        System.out.print("****************In the constructor....");
         //Compare Data
         for (DatasetField dsfo : originalVersion.getDatasetFields()) {
             boolean deleted = true;
@@ -466,6 +467,8 @@ private void compareValues(DatasetField originalField, DatasetField newField, bo
             }
         }
     }
+
+
 
     public String getFileNote() {
         String retString = "";
@@ -1684,6 +1687,78 @@ List<FileMetadata> getChangedVariableMetadata() {
     List<FileMetadata[]> getReplacedFiles() {
         return replacedFiles;
     }
+
+    public JsonObjectBuilder getSummaryDifferenceAsJson(){
+
+        JsonObjectBuilder jobVersion = new NullSafeJsonBuilder();
+
+        for (SummaryNote sn : this.summaryDataForNote) {
+            jobVersion.add( sn.getDatasetField().getDatasetFieldType().getName(), getSummaryNoteAsJson(sn));
+        }
+        for (SummaryNote sn : this.getBlockDataForNote()){
+             jobVersion.add( sn.getDatasetField().getDatasetFieldType().getMetadataBlock().getName(), getSummaryNoteAsJson(sn));    
+        }   
+
+        jobVersion.add("files", getFileSummaryAsJson());
+
+        if (!this.changedTermsAccess.isEmpty()) {
+            jobVersion.add("termsAccessChanged", "true");
+        } else{
+            jobVersion.add("termsAccessChanged", "false");
+        }      
+
+        return jobVersion;
+    }
+
+    private JsonObjectBuilder getSummaryNoteAsJson(SummaryNote sn){
+        JsonObjectBuilder job = new NullSafeJsonBuilder();
+        //job.add("datasetFieldType", sn.getDatasetField().getDatasetFieldType().getDisplayName());
+        job.add("added", sn.added);
+        job.add("deleted", sn.deleted);
+        job.add("changed", sn.changed);
+        return job;
+    }
+
+    private JsonObjectBuilder getFileSummaryAsJson(){
+        JsonObjectBuilder job = new NullSafeJsonBuilder();
+
+        if (!addedFiles.isEmpty()) {
+            job.add("added", addedFiles.size());
+
+        } else{
+            job.add("added", 0);
+        }
+
+        if (!removedFiles.isEmpty()) {
+            job.add("removed", removedFiles.size());
+
+        } else{
+            job.add("removed", 0);
+        }
+
+        if (!replacedFiles.isEmpty()) {
+            job.add("replaced", replacedFiles.size());
+
+        } else{
+            job.add("replaced", 0);
+        }
+
+        if (!changedFileMetadata.isEmpty()) {
+            job.add("changedFileMetaData", changedFileMetadata.size());
+
+        } else{
+            job.add("changedFileMetaData", 0);
+        }
+
+        if (!changedVariableMetadata.isEmpty()) {
+            job.add("changedVariableMetadata", changedVariableMetadata.size());
+
+        } else{
+            job.add("changedVariableMetadata", 0);
+        }
+
+        return job;
+    }
 
     public String getSummaryAsString() {
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
@@ -3073,11 +3073,11 @@ public Response getCompareVersionsSummary(@Context ContainerRequestContext crc,
                         versionBuilder.add("summary", BundleUtil.getStringFromBundle("file.dataFilesTab.versions.description.draft"));
                     }
                     if (dv.isDeaccessioned()) {
-                        versionBuilder.add("summary", BundleUtil.getStringFromBundle("file.dataFilesTab.versions.description.deaccessionedReason") + " " + dv.getVersionNote());
+                        versionBuilder.add("summary", BundleUtil.getStringFromBundle("file.dataFilesTab.versions.description.deaccessionedReason") + " " + dv.getVersionNote() + " " + dv.getArchiveNote());
                     }
 
                 } else {
-                    versionBuilder.add("summary", dvdiff.getSummaryAsString());
+                    versionBuilder.add("summary", dvdiff.getSummaryDifferenceAsJson());
                 }
 
                 versionBuilder.add("contributors", datasetversionService.getContributorsNames(dv));