opaque type AnyTour

mamciek · Dec 19, 2022 · 1b543d4 · 1b543d4
1 parent dad9fe4
commit 1b543d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/app/mashup/TeamInfo.scala b/app/mashup/TeamInfo.scala
@@ -24,13 +24,15 @@ case class TeamInfo(
   def userIds = forum.??(_.flatMap(_.userId))
 
 object TeamInfo:
-  case class AnyTour(any: Either[Tournament, Swiss]) extends AnyVal:
-    def isEnterable = any.fold(_.isEnterable, _.isEnterable)
-    def startsAt    = any.fold(_.startsAt, _.startsAt)
-    def isNowOrSoon = any.fold(_.isNowOrSoon, _.isNowOrSoon)
-    def nbPlayers   = any.fold(_.nbPlayers, _.nbPlayers)
-  def anyTour(tour: Tournament) = AnyTour(Left(tour))
-  def anyTour(swiss: Swiss)     = AnyTour(Right(swiss))
+  opaque type AnyTour = Either[Tournament, Swiss]
+  object AnyTour extends TotalWrapper[AnyTour, Either[Tournament, Swiss]]:
+    extension (e: AnyTour)
+      def isEnterable = e.fold(_.isEnterable, _.isEnterable)
+      def startsAt    = e.fold(_.startsAt, _.startsAt)
+      def isNowOrSoon = e.fold(_.isNowOrSoon, _.isNowOrSoon)
+      def nbPlayers   = e.fold(_.nbPlayers, _.nbPlayers)
+    def apply(tour: Tournament): AnyTour = Left(tour)
+    def apply(swiss: Swiss): AnyTour     = Right(swiss)
 
   case class PastAndNext(past: List[AnyTour], next: List[AnyTour]):
     def nonEmpty = past.nonEmpty || next.nonEmpty
@@ -71,10 +73,10 @@ final class TeamInfoApi(
       case (tours, swisses) =>
         PastAndNext(
           past = {
-            tours.past.map(anyTour) ::: swisses.past.map(anyTour)
+            tours.past.map(AnyTour(_)) ::: swisses.past.map(AnyTour(_))
           }.sortBy(-_.startsAt.getSeconds),
           next = {
-            tours.next.map(anyTour) ::: swisses.next.map(anyTour)
+            tours.next.map(AnyTour(_)) ::: swisses.next.map(AnyTour(_))
           }.sortBy(_.startsAt.getSeconds)
         )
     }
diff --git a/app/views/team/tournaments.scala b/app/views/team/tournaments.scala
@@ -60,9 +60,9 @@ object tournaments:
             "soon"      -> any.isNowOrSoon
           )
         )(
-          td(cls := "icon")(iconTag(any.any.fold(tournamentIconChar, views.html.swiss.bits.iconChar))),
+          td(cls := "icon")(iconTag(any.value.fold(tournamentIconChar, views.html.swiss.bits.iconChar))),
           td(cls := "header")(
-            any.any.fold(
+            any.value.fold(
               t =>
                 a(href := routes.Tournament.show(t.id))(
                   span(cls := "name")(t.name()),
@@ -91,7 +91,7 @@ object tournaments:
             )
           ),
           td(cls := "infos")(
-            any.any.fold(
+            any.value.fold(
               t =>
                 frag(
                   t.teamBattle map { battle =>