From e7d56b8377c6d2a8524b2cdf14c9695d309dae66 Mon Sep 17 00:00:00 2001 From: Roland Seidel Date: Fri, 6 Oct 2023 02:19:58 +0200 Subject: [PATCH] #725 filter empty extrateams --- src/main/scala/ch/seidel/kutu/http/RegistrationRoutes.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/scala/ch/seidel/kutu/http/RegistrationRoutes.scala b/src/main/scala/ch/seidel/kutu/http/RegistrationRoutes.scala index a5b414b9..458622fb 100644 --- a/src/main/scala/ch/seidel/kutu/http/RegistrationRoutes.scala +++ b/src/main/scala/ch/seidel/kutu/http/RegistrationRoutes.scala @@ -379,13 +379,16 @@ trait RegistrationRoutes extends SprayJsonSupport with JwtSupport with JsonSuppo val regs = selectAthletRegistrations(registrationId) val vereinTeams = regs .flatMap(_.team) + .filter(_ > 0) .distinct .sorted val nextVereinTeam = if (vereinTeams.isEmpty) 1 else vereinTeams.max + 1 (1 to nextVereinTeam).toList.map(idx => TeamItem(idx, registration.toVerein.extendedprint)) ::: - wi.wettkampf.toWettkampf.extraTeams.zipWithIndex.map(item => TeamItem(item._2 * -1 - 1, item._1)) + wi.wettkampf.toWettkampf.extraTeams + .filter(_.nonEmpty) + .zipWithIndex.map(item => TeamItem(item._2 * -1 - 1, item._1)) } } }