From 1066b1e8252120c9150e020abf7d6c9be2feef56 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 26 Nov 2024 13:37:24 -0500
Subject: [PATCH] fix search files to return latest published citation

---
 ...set-name-and-dataset-citation-different.md |  4 ++
 .../iq/dataverse/search/IndexServiceBean.java |  3 +-
 .../harvard/iq/dataverse/api/SearchIT.java    | 48 +++++++++++++++----
 3 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 doc/release-notes/10735-search-dataset-name-and-dataset-citation-different.md

diff --git a/doc/release-notes/10735-search-dataset-name-and-dataset-citation-different.md b/doc/release-notes/10735-search-dataset-name-and-dataset-citation-different.md
new file mode 100644
index 00000000000..6a6b2008772
--- /dev/null
+++ b/doc/release-notes/10735-search-dataset-name-and-dataset-citation-different.md
@@ -0,0 +1,4 @@
+
+### Search files Bug fix
+
+dataset-citation was displaying DRAFT version instead of latest released version
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
index f72973076ec..ea9e8ba0506 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -1328,7 +1328,8 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
             }
             LocalDate embargoEndDate=null;
             LocalDate retentionEndDate=null;
-            final String datasetCitation = dataset.getCitation();
+            final String datasetCitation = (dataset.isReleased() && dataset.getReleasedVersion() != null) ?
+                    dataset.getCitation(dataset.getReleasedVersion()) : dataset.getCitation();
             final Long datasetId = dataset.getId();
             final String datasetGlobalId = dataset.getGlobalId().toString();
             for (FileMetadata fileMetadata : fileMetadatas) {
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
index b03c23cd1e2..c82942eb8dc 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
@@ -175,6 +175,7 @@ public void testSearchCitation() {
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        String datasetPersistentId = UtilIT.getDatasetPersistentIdFromResponse(createDatasetResponse);
 
         Response searchResponse = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken);
         searchResponse.prettyPrint();
@@ -185,20 +186,49 @@ public void testSearchCitation() {
                 .body("data.items[0].citationHtml", Matchers.containsString("href"))
                 .statusCode(200);
 
-        Response deleteDatasetResponse = UtilIT.deleteDatasetViaNativeApi(datasetId, apiToken);
-        deleteDatasetResponse.prettyPrint();
-        deleteDatasetResponse.then().assertThat()
+        String pathToFile = "src/main/webapp/resources/images/dataverseproject.png";
+        Response uploadImage = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
+        uploadImage.prettyPrint();
+        uploadImage.then().assertThat()
+                .statusCode(200);
+
+        Response publishResponse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishResponse.prettyPrint();
+        publishResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        publishResponse = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishResponse.prettyPrint();
+        publishResponse.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
-        deleteDataverseResponse.prettyPrint();
-        deleteDataverseResponse.then().assertThat()
+        Response updateTitleResponseAuthor = UtilIT.updateDatasetTitleViaSword(datasetPersistentId, "New Title", apiToken);
+        updateTitleResponseAuthor.prettyPrint();
+        updateTitleResponseAuthor.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
-        Response deleteUserResponse = UtilIT.deleteUser(username);
-        deleteUserResponse.prettyPrint();
-        assertEquals(200, deleteUserResponse.getStatusCode());
+        // search descending will get the latest 100.
+        // This could fail if more than 100 get created between our update and the search. Highly unlikely
+        searchResponse = UtilIT.search("*&type=file&sort=date&order=desc&per_page=100&start=0&subtree=root" , apiToken);
+        searchResponse.prettyPrint();
 
+        int i=0;
+        String parentCitation = "";
+        String datasetName = "";
+        // most likely ours is in index 0, but it's not a guaranty.
+        while (i < 100) {
+            String dataset_persistent_id = searchResponse.body().jsonPath().getString("data.items[" + i + "].dataset_persistent_id");
+            if (datasetPersistentId.equalsIgnoreCase(dataset_persistent_id)) {
+                parentCitation = searchResponse.body().jsonPath().getString("data.items[" + i + "].dataset_citation");
+                datasetName = searchResponse.body().jsonPath().getString("data.items[" + i + "].dataset_name");
+                break;
+            }
+            i++;
+        }
+        // see https://github.com/IQSS/dataverse/issues/10735
+        // was showing the citation of the draft version and not the released parent
+        assertFalse(parentCitation.contains("New Title"));
+        assertTrue(parentCitation.contains(datasetName));
+        assertFalse(parentCitation.contains("DRAFT"));
     }
     
     @Test