fathomnet/fathomnet-py#25 - completed

src/main/scala/org/fathomnet/worms/Names.scala

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Monterey Bay Aquarium Research Institute 2022
+ *
+ * worms-server code is licensed under the MIT license.
+ */
+
+package org.fathomnet.worms
+
+final case class Names(aphiaId: Long, name: String, acceptedName: String, alternateNames: Seq[String])

src/main/scala/org/fathomnet/worms/StateController.scala

@@ -67,7 +67,8 @@ object StateController:
     def search(data: Data): Option[Names] =
       val allNodes = data.namesMap.values
       val existing = allNodes.find(n => n.aphiaId == aphiaId)
-      existing match
+      val outdated = allNodes.filter(n => n.acceptedAphiaId == aphiaId)
+      val candidate = existing match
         case None => None
         case Some(node) =>
           val accepted = if (node.aphiaId == node.acceptedAphiaId) 
@@ -76,10 +77,25 @@ object StateController:
             allNodes.find(n => n.aphiaId == node.acceptedAphiaId)
           val names = accepted match
             case None => Names(node.aphiaId, node.name, node.name, node.alternateNames)
-            case Some(value) => Names(node.aphiaId, node.name, value.name, node.alternateNames ++ value.alternateNames)
+            case Some(value) => 
+              val alternateNames = (node.alternateNames ++ value.alternateNames)
+                  .toSet
+                  .toSeq
+                  .sorted
+              Names(node.aphiaId, node.name, value.name, alternateNames)
 
           Option(names)
 
+      if (outdated.isEmpty) candidate
+      else 
+        candidate.map(c => {
+          val alternateNames = (outdated.flatMap(n => n.names) ++ c.alternateNames)
+              .toSet
+              .toSeq
+              .sorted
+          c.copy(alternateNames = alternateNames)
+        })
+
     runNodeSearch(search, s"Unable to find a name with aphiaId: $aphiaId")
 
   def descendantNames(name: String): Either[ErrorMsg, List[String]] =