From 31784a97ade359881040e3d99d923075f865ee70 Mon Sep 17 00:00:00 2001
From: Juan Pablo Tosca Villanueva <jptosca@gmail.com>
Date: Thu, 4 Apr 2024 13:20:37 -0400
Subject: [PATCH 1/4] Add Harvesting Client name to the Metadata Source facet

---
 .../java/edu/harvard/iq/dataverse/search/IndexServiceBean.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d6b3fd8c339..c68554db180 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -897,7 +897,8 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
 
         if (dataset.isHarvested()) {
             solrInputDocument.addField(SearchFields.IS_HARVESTED, true);
-            solrInputDocument.addField(SearchFields.METADATA_SOURCE, HARVESTED);
+            solrInputDocument.addField(SearchFields.METADATA_SOURCE,
+                                        dataset.getHarvestedFrom() != null ? dataset.getHarvestedFrom().getName() : HARVESTED);
         } else {
             solrInputDocument.addField(SearchFields.IS_HARVESTED, false);
             solrInputDocument.addField(SearchFields.METADATA_SOURCE, rdvName); //rootDataverseName);

From 59d55786072e742e472d28f783a038a559acadae Mon Sep 17 00:00:00 2001
From: Juan Pablo Tosca Villanueva <jptosca@gmail.com>
Date: Fri, 5 Apr 2024 11:16:53 -0400
Subject: [PATCH 2/4] Add release note

---
 doc/release-notes/10464-add-name-harvesting-client-facet.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/release-notes/10464-add-name-harvesting-client-facet.md

diff --git a/doc/release-notes/10464-add-name-harvesting-client-facet.md b/doc/release-notes/10464-add-name-harvesting-client-facet.md
new file mode 100644
index 00000000000..f56d9f164af
--- /dev/null
+++ b/doc/release-notes/10464-add-name-harvesting-client-facet.md
@@ -0,0 +1,3 @@
+The Metadata Source facet has been updated to show the name of the import client rather than grouping all under 'harvested'
+
+TODO: Please add notes to re-index http://localhost:8080/api/admin/index guides at: https://guides.dataverse.org/en/latest/admin/solr-search-index.html
\ No newline at end of file

From c435bc91de533d8f6bdb54b0d29efc1c0f7a400a Mon Sep 17 00:00:00 2001
From: Juan Pablo Tosca Villanueva <jptosca@gmail.com>
Date: Fri, 5 Apr 2024 18:42:08 -0400
Subject: [PATCH 3/4] Integration Test added

---
 .../edu/harvard/iq/dataverse/api/HarvestingClientsIT.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java
index 4466182b435..1c23af36142 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java
@@ -15,9 +15,7 @@
 import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
 import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * This class tests Harvesting Client functionality. 
@@ -272,6 +270,12 @@ private void harvestingClientRun(boolean allowHarvestingMissingCVV)  throws Inte
         } while (i<maxWait); 
         
         System.out.println("Waited " + i + " seconds for the harvest to complete.");
+
+        Response searchHarvestedDatasets = UtilIT.search("metadataSource:" + nickName, normalUserAPIKey);
+        searchHarvestedDatasets.prettyPrint();
+        searchHarvestedDatasets.then().assertThat()
+                                .statusCode(OK.getStatusCode())
+                                .body("data.total_count", equalTo(expectedNumberOfSetsHarvested));
         
         // Fail if it hasn't completed in maxWait seconds
         assertTrue(i < maxWait);

From 8b527418340a926f8e000d38dd8ade170c44e008 Mon Sep 17 00:00:00 2001
From: landreev <leonid@hmdc.harvard.edu>
Date: Wed, 10 Apr 2024 13:49:26 -0400
Subject: [PATCH 4/4] Update 10464-add-name-harvesting-client-facet.md

---
 doc/release-notes/10464-add-name-harvesting-client-facet.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes/10464-add-name-harvesting-client-facet.md b/doc/release-notes/10464-add-name-harvesting-client-facet.md
index f56d9f164af..1fc0bb47caf 100644
--- a/doc/release-notes/10464-add-name-harvesting-client-facet.md
+++ b/doc/release-notes/10464-add-name-harvesting-client-facet.md
@@ -1,3 +1,3 @@
-The Metadata Source facet has been updated to show the name of the import client rather than grouping all under 'harvested'
+The Metadata Source facet has been updated to show the name of the harvesting client rather than grouping all such datasets under 'harvested'
 
-TODO: Please add notes to re-index http://localhost:8080/api/admin/index guides at: https://guides.dataverse.org/en/latest/admin/solr-search-index.html
\ No newline at end of file
+TODO: for the v6.13 release note: Please add a full re-index using http://localhost:8080/api/admin/index to the upgrade instructions.