Added filter to show only 'accepted' descendant names

Author: hohonuuli

build.sbt

@@ -3,7 +3,7 @@ import Dependencies._
 Global / onChangedBuildSource := ReloadOnSourceChanges
 Laika / sourceDirectories := Seq(baseDirectory.value / "docs")
 
-ThisBuild / scalaVersion     := "3.3.1"
+ThisBuild / scalaVersion     := "3.3.3"
 ThisBuild / organization     := "org.fathomnet"
 ThisBuild / organizationName := "MBARI"
 ThisBuild / startYear        := Some(2021)

project/Dependencies.scala

@@ -9,18 +9,18 @@ object Dependencies {
 
   lazy val jansi    = "org.fusesource.jansi"         % "jansi"           % "2.4.1"
 
-  lazy val logback  = "ch.qos.logback"               % "logback-classic" % "1.5.1"
+  lazy val logback  = "ch.qos.logback"               % "logback-classic" % "1.5.3"
   lazy val methanol = "com.github.mizosoft.methanol" % "methanol"        % "1.7.0"
   lazy val munit    = "org.scalameta"               %% "munit"           % "1.0.0-M11"
   lazy val picocli  = "info.picocli"                 % "picocli"         % "4.7.5"
 
   lazy val slf4jJdk     = "org.slf4j"      % "slf4j-jdk-platform-logging"   % "2.0.12"
 
-  private val tapirVersion  = "1.9.10"
+  private val tapirVersion  = "1.10.4"
   lazy val tapirStubServer  = "com.softwaremill.sttp.tapir" %% "tapir-sttp-stub-server" % tapirVersion
   lazy val tapirSwagger     = "com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion
   lazy val tapirCirce       = "com.softwaremill.sttp.tapir" %% "tapir-json-circe" % tapirVersion
-  lazy val tapirCirceClient = "com.softwaremill.sttp.client3" %% "circe" % "3.9.3"
+  lazy val tapirCirceClient = "com.softwaremill.sttp.client3" %% "circe" % "3.9.5"
   lazy val tapirNetty       = "com.softwaremill.sttp.tapir" %% "tapir-netty-server" % tapirVersion
   lazy val tapirVertx       = "com.softwaremill.sttp.tapir" %% "tapir-vertx-server" % tapirVersion
 

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

@@ -99,11 +99,15 @@ object StateController:
 
     runNodeSearch(search, s"Unable to find a name with aphiaId: $aphiaId")
 
-  def descendantNames(name: String): Either[ErrorMsg, List[String]] =
+  def descendantNames(name: String, acceptedOnly: Boolean = false): Either[ErrorMsg, List[String]] =
     def search(data: Data): List[String] =
       data.findNodeByName(name) match
         case None       => Nil
-        case Some(node) => node.descendantNames.sorted.toList
+        case Some(node) => 
+          if (acceptedOnly && node.isAccepted)
+            node.descendants.filter(_.isAccepted).map(_.name).sorted.toList
+          else
+            node.descendantNames.sorted.toList
     runSearch(search).fold(
       e => Left(e),
       v =>

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

@@ -25,6 +25,8 @@ final case class WormsNode(
     children: Seq[WormsNode]
 ):
 
+  lazy val isAccepted: Boolean = this.aphiaId == this.acceptedAphiaId
+
   def find(name: String): Option[WormsNode] =
     if (this.name == name || this.alternateNames.contains(name))
       Some(this)

src/main/scala/org/fathomnet/worms/api/NameEndpoints.scala

@@ -89,17 +89,18 @@ class NameEndpoints(using ec: ExecutionContext) extends Endpoints:
     queryContainsEndpoint.serverLogic(glob => Future(StateController.queryNamesContaining(glob)))
 
   // -- /descendants/:name
-  val descendantsEndpoint: PublicEndpoint[String, ErrorMsg, List[String], Any] = baseEndpoint
+  val descendantsEndpoint: Endpoint[Unit, (String, Option[Boolean]), ErrorMsg, List[String], Any] = baseEndpoint
     .get
     .in("descendants")
     .in(path[String]("name"))
+    .in(query[Option[Boolean]]("accepted").description("Only include accepted names. Allowed values are true or false. Default is false."))
     .out(jsonBody[List[String]])
     .description(
       "Return the primary names of the taxa and all its descendants in alphabetical order."
     )
 
   val descendantsServerEndpoint: ServerEndpoint[Any, Future] =
-    descendantsEndpoint.serverLogic(name => Future(StateController.descendantNames(name)))
+    descendantsEndpoint.serverLogic((name, accepted) => Future(StateController.descendantNames(name, accepted.getOrElse(false))))
 
   // -- /ancestors/:name
   val ancestorsEndpoint: PublicEndpoint[String, ErrorMsg, List[String], Any] = baseEndpoint