Merge branch 'develop' into patch-1

Author: Parthsuii

src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java

@@ -241,7 +241,7 @@ private void addGuidesFields(final NullSafeJsonBuilder notificationJson, String
     }
 
     private void addSubmittedDatasetFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification, final AuthenticatedUser requestor) {
-        addDatasetFields(notificationJson, userNotification);
+        addDatasetVersionFields(notificationJson, userNotification);
         addRequestorFields(notificationJson, requestor);
     }
 

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

@@ -437,13 +437,40 @@ public void testCuratorSendsCommentsToAuthor() {
                 //   .body("data[3].reasonsForReturn", equalTo(null))
                 .statusCode(OK.getStatusCode());
 
-        // Confirm that when getting the dataset, the "InReview" lock is no longer listed
-        JsonArray emptyArray = Json.createArrayBuilder().build();
-        getDatasetJson = UtilIT.nativeGet(datasetId, authorApiToken);
-        getDatasetJson.prettyPrint();
-        getDatasetJson.then().assertThat()
-                .body("data.locks", equalTo(emptyArray))
-                .statusCode(200);
+        // The author realizes she wants to add another file and creates a new draft version.
+        Response authorAddsNewFileCreatingNewDraft = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile1, authorApiToken);
+        authorAddsNewFileCreatingNewDraft.prettyPrint();
+        authorAddsNewFileCreatingNewDraft.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        // The author re-submits.
+        Response submit4 = UtilIT.submitDatasetForReview(datasetPersistentId, authorApiToken);
+        submit4.prettyPrint();
+        submit4.then().assertThat()
+                .body("data.inReview", equalTo(true))
+                .statusCode(OK.getStatusCode());
+
+        // The curator checks notifications and sees that the dataset has been re-submitted after it was published.
+        Response curatorChecksForNotificationsPostPublication = UtilIT.getNotifications(curatorApiToken);
+        curatorChecksForNotificationsPostPublication.prettyPrint();
+        curatorChecksForNotificationsPostPublication.then().assertThat()
+                .body("data[0].type", equalTo(SUBMITTEDDS.toString()))
+                .body("data[1].type", equalTo(PUBLISHEDDS.toString()))
+                .statusCode(OK.getStatusCode());
+
+        // The curator checks again, this time in app notification format.
+        Response curatorChecksForNotificationsPostPublicationInAppFormat = UtilIT.getNotifications(curatorApiToken, true, null, null, null);
+        curatorChecksForNotificationsPostPublicationInAppFormat.prettyPrint();
+        curatorChecksForNotificationsPostPublicationInAppFormat.then().assertThat()
+                .body("data[0].type", equalTo(SUBMITTEDDS.toString()))
+                .body("data[0].objectDeleted", equalTo(null))
+                .body("data[0].datasetPersistentIdentifier", equalTo(datasetPersistentId))
+                .body("data[0].ownerAlias", equalTo(dataverseAlias))
+                .body("data[1].type", equalTo(PUBLISHEDDS.toString()))
+                .body("data[1].objectDeleted", equalTo(null))
+                .body("data[1].datasetPersistentIdentifier", equalTo(datasetPersistentId))
+                .body("data[1].ownerAlias", equalTo(dataverseAlias))
+                .statusCode(OK.getStatusCode());
 
         // These println's are here in case you want to log into the GUI to see what notifications look like.
         System.out.println("Curator username/password: " + curatorUsername);

src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java

@@ -402,13 +402,16 @@ public void testAddFieldsByType_submittedDs() {
         userNotification.setObjectId(1L);
         userNotification.setRequestor(requestor);
 
+        DatasetVersion datasetVersion = mock(DatasetVersion.class);
         Dataset dataset = mock(Dataset.class);
         Dataverse owner = mock(Dataverse.class);
 
+        when(datasetVersion.getDataset()).thenReturn(dataset);
+
         when(dataset.getGlobalId()).thenReturn(testGlobalId);
         when(dataset.getDisplayName()).thenReturn("Submitted Dataset");
         when(dataset.getOwner()).thenReturn(owner);
-        when(datasetService.find(1L)).thenReturn(dataset);
+        when(datasetVersionService.find(1L)).thenReturn(datasetVersion);
 
         when(owner.getAlias()).thenReturn("reviewDv");
         when(owner.getDisplayName()).thenReturn("Review Dataverse");