#11710 add search term to already linked

Author: sekmiller

src/main/java/edu/harvard/iq/dataverse/DatasetLinkingDataverse.java

@@ -9,6 +9,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedNativeQuery;
 import jakarta.persistence.NamedQueries;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.OneToOne;
@@ -35,6 +36,18 @@
     @NamedQuery(name = "DatasetLinkingDataverse.findIdsByLinkingDataverseId",
                query = "SELECT o.dataset.id FROM DatasetLinkingDataverse AS o WHERE o.linkingDataverse.id = :linkingDataverseId")
 })
+
+    @NamedNativeQuery(
+        name = "DatasetLinkingDataverse.findByDatasetIdAndLinkingDataverseName",
+        query = """
+                select o.linkingDataverse_id  from DatasetLinkingDataverse as o  
+                LEFT JOIN dataverse dv ON dv.id = o.linkingDataverse_id 
+                WHERE o.dataset_id =? AND ((LOWER(dv.name) LIKE ? and ((SUBSTRING(LOWER(dv.name),0,(LENGTH(dv.name)-9)) LIKE ?)
+                or (SUBSTRING(LOWER(dv.name),0,(LENGTH(dv.name)-9)) LIKE ?))) 
+                or (LOWER(dv.name) NOT LIKE ? and ((LOWER(dv.name) LIKE ?)
+                or (LOWER(dv.name) LIKE ?))))""" 
+    )
+
 public class DatasetLinkingDataverse implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id

src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java

@@ -5,6 +5,7 @@
  */
 package edu.harvard.iq.dataverse;
 
+import jakarta.ejb.EJB;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
@@ -27,6 +28,9 @@ public class DatasetLinkingServiceBean implements java.io.Serializable {
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
 
+    @EJB
+    DataverseServiceBean dataverseService;
+    
 
 
     public List<Dataset> findLinkedDatasets(Long dataverseId) {
@@ -40,13 +44,44 @@ public List<Dataset> findLinkedDatasets(Long dataverseId) {
     }
 
     public List<Dataverse> findLinkingDataverses(Long datasetId) {
+        return findLinkingDataverses(datasetId, "");
+    }
+    
+    public List<Dataverse> findLinkingDataverses(Long datasetId, String searchTerm) {
         List<Dataverse> retList = new ArrayList<>();
-        TypedQuery<DatasetLinkingDataverse> typedQuery = em.createNamedQuery("DatasetLinkingDataverse.findByDatasetId", DatasetLinkingDataverse.class)
-            .setParameter("datasetId", datasetId);
-        for (DatasetLinkingDataverse datasetLinkingDataverse : typedQuery.getResultList()) {
-            retList.add(datasetLinkingDataverse.getLinkingDataverse());
+        if (searchTerm == null || searchTerm.isEmpty()) {
+            TypedQuery<DatasetLinkingDataverse> typedQuery = em.createNamedQuery("DatasetLinkingDataverse.findByDatasetId", DatasetLinkingDataverse.class)
+                    .setParameter("datasetId", datasetId);
+            for (DatasetLinkingDataverse datasetLinkingDataverse : typedQuery.getResultList()) {
+                retList.add(datasetLinkingDataverse.getLinkingDataverse());
+            }
+            return retList;
+
+        } else {
+
+            String pattern = searchTerm.toLowerCase();
+
+            String pattern1 = pattern + "%";
+            String pattern2 = "% " + pattern + "%";
+
+            // Adjust the queries for very short, 1 and 2-character patterns:
+            if (pattern.length() == 1) {
+                pattern1 = pattern;
+                pattern2 = pattern + " %";
+            }
+            System.out.print("pattern1: " + pattern1);
+            System.out.print("pattern2: " + pattern2);
+            TypedQuery<Long> typedQuery
+                    = em.createNamedQuery("DatasetLinkingDataverse.findByDatasetIdAndLinkingDataverseName", Long.class)
+                            .setParameter(1, datasetId).setParameter(2, "%dataverse").setParameter(3, pattern1)
+                            .setParameter(4, pattern2).setParameter(5, "%dataverse").setParameter(6, pattern1).setParameter(7, pattern2);
+
+            for (Long id : typedQuery.getResultList()) {
+                retList.add(dataverseService.find(id));
+            }
+            return retList;
         }
-        return retList;
+
     }
 
     public void save(DatasetLinkingDataverse datasetLinkingDataverse) {

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetLinkingDataverseListCommand.java

@@ -86,7 +86,7 @@ public List<Dataverse> execute(CommandContext ctxt) throws CommandException {
             return ctxt.dataverses().removeUnlinkableDataverses(dataversesForLinking, dvObject);
         } else {
             if (dvObject instanceof Dataset) {
-                return ctxt.dsLinking().findLinkingDataverses(dvObject.getId());
+                return ctxt.dsLinking().findLinkingDataverses(dvObject.getId(), searchParam);
             } else {
                 return ctxt.dvLinking().findLinkingDataverses(dvObject.getId());
             }

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

@@ -842,7 +842,15 @@ public void testGetLinkableDataverses(){
         getLinkableDataverses.prettyPrint();
                 getLinkableDataverses.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.size()", equalTo(1));        
+                .body("data.size()", equalTo(1));  
+                
+        //if you ask for already linked you should get one unless there's a bad search terms     
+        getLinkableDataverses = UtilIT.getLinkableDataverses("dataset", datasetPersistentId, apiToken, "QQQBatmanSymbol", true);
+        
+        getLinkableDataverses.prettyPrint();
+                getLinkableDataverses.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(0));          
 
         //set user api back to super user for cleanup
         UtilIT.setSuperuserStatus(username, Boolean.TRUE);

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

@@ -4749,7 +4749,7 @@ static Response getLinkableDataverses(String type, String dvObjectId, String api
         }
 
         if (alreadyLinked){
-            if (optionalQueryParam.isEmpty()){
+            if (optionalQueryParam.isEmpty() && (searchTerm == null ||  searchTerm.isEmpty())){
                 optionalQueryParam = "?alreadyLinking=true";
             } else {
                 optionalQueryParam = optionalQueryParam + "&alreadyLinking=true";