Author info collapsed on ORCID and if not, email

Helps to prevent duplication of author information in the RO manifest

Author: MarkRobbo

src/main/java/org/commonwl/view/researchobject/HashableAgent.java

@@ -78,18 +78,26 @@ public boolean equals(Object o) {
 
         HashableAgent that = (HashableAgent) o;
 
-        if (name != null ? !name.equals(that.name) : that.name != null) return false;
+        // ORCID is a unique identifier so if matches, the objects are equal
+        if (orcid != null && orcid.equals(that.orcid)) return true;
+
+        // If no ORCID is present but email is the name, the objects are equal
+        if (orcid == null && uri != null && uri.equals(that.uri)) return true;
+
+        // Default to checking all parameters
         if (orcid != null ? !orcid.equals(that.orcid) : that.orcid != null) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) return false;
         return uri != null ? uri.equals(that.uri) : that.uri == null;
 
     }
 
+    /**
+     * ORCID is used as hashcode to fall back to comparison if missing
+     * @return The hash code for this object
+     */
     @Override
     public int hashCode() {
-        int result = name != null ? name.hashCode() : 0;
-        result = 31 * result + (orcid != null ? orcid.hashCode() : 0);
-        result = 31 * result + (uri != null ? uri.hashCode() : 0);
-        return result;
+        return orcid != null ? orcid.hashCode() : 0;
     }
 
 }

src/main/java/org/commonwl/view/researchobject/ROBundleService.java

@@ -303,7 +303,7 @@ private void addFilesToBundle(GitDetails gitDetails, Bundle bundle, Path bundleP
                                     gitPath.toString());
 
                             if (cwl) {
-                                // Attempt to get authors from cwl description
+                                // Attempt to get authors from cwl description - takes priority
                                 ResultSet descAuthors = rdfService.getAuthors(bundlePath
                                         .resolve(file.getName()).toString().substring(10), url);
                                 if (descAuthors.hasNext()) {
@@ -318,6 +318,7 @@ private void addFilesToBundle(GitDetails gitDetails, Bundle bundle, Path bundleP
                                     if (authorSoln.contains("orcid")) {
                                         newAuthor.setOrcid(new URI(authorSoln.get("orcid").toString()));
                                     }
+                                    fileAuthors.remove(newAuthor);
                                     fileAuthors.add(newAuthor);
                                 }
                             }

src/test/java/org/commonwl/view/researchobject/HashableAgentTest.java

@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.commonwl.view.researchobject;
+
+import org.junit.Test;
+
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class HashableAgentTest {
+
+    /**
+     * If the ORCID of two agents is the same, they are the same person
+     * regardless of other information
+     */
+    @Test
+    public void orcidsMakeAgentsEqual() throws Exception {
+
+        HashableAgent firstOrcid = new HashableAgent("Mark Robindsason",
+                new URI("http://orcid.org/0000-0002-8184-7507"),
+                new URI("[email protected]"));
+
+        HashableAgent secondOrcid = new HashableAgent("Mark Robinson",
+                new URI("http://orcid.org/0000-0002-8184-7507"),
+                new URI("[email protected]"));
+
+        Set<HashableAgent> testSet = new HashSet<>();
+        testSet.add(firstOrcid);
+        testSet.remove(secondOrcid);
+        testSet.add(secondOrcid);
+
+        assertEquals(1, testSet.size());
+        HashableAgent fromSet = testSet.iterator().next();
+        assertEquals("Mark Robinson", fromSet.getName());
+        assertEquals(new URI("[email protected]"), fromSet.getUri());
+        assertEquals(new URI("http://orcid.org/0000-0002-8184-7507"), fromSet.getOrcid());
+
+    }
+
+    /**
+     * When no ORCID is present but emails are the same, the agents are
+     * the same person regardless of name
+     */
+    @Test
+    public void noOrcidEmailSameMakesAgentsEqual() throws Exception {
+
+        HashableAgent firstEmail = new HashableAgent("Mark Robindsason",
+                null,
+                new URI("[email protected]"));
+
+        HashableAgent secondEmail = new HashableAgent("Mark Robinson",
+                null,
+                new URI("[email protected]"));
+
+        Set<HashableAgent> testSet = new HashSet<>();
+        testSet.add(firstEmail);
+        testSet.remove(secondEmail);
+        testSet.add(secondEmail);
+
+        assertEquals(1, testSet.size());
+        HashableAgent fromSet = testSet.iterator().next();
+        assertEquals("Mark Robinson", fromSet.getName());
+        assertEquals(new URI("[email protected]"), fromSet.getUri());
+        assertNull(fromSet.getOrcid());
+
+    }
+}