replace official field with tier in broadcast apis

ornicar · ornicar · commit bf7f38e80d4a · 2024-01-12T09:31:25.000+01:00
diff --git a/modules/relay/src/main/JsonView.scala b/modules/relay/src/main/JsonView.scala
@@ -14,6 +14,9 @@ final class JsonView(baseUrl: BaseUrl, markup: RelayMarkup, leaderboardApi: Rela
   import JsonView.given
   import lila.study.JsonView.given
 
+  given Writes[Option[RelayTour.Tier]] = Writes: t =>
+    JsString(t.flatMap(RelayTour.Tier.keys.get) | "user")
+
   given OWrites[RelayTour] = OWrites: t =>
     Json
       .obj(
@@ -23,7 +26,7 @@ final class JsonView(baseUrl: BaseUrl, markup: RelayMarkup, leaderboardApi: Rela
         "description" -> t.description,
         "createdAt"   -> t.createdAt
       )
-      .add("official" -> t.official)
+      .add("tier" -> t.tier)
 
   given OWrites[RelayRound] = OWrites: r =>
     Json
diff --git a/modules/relay/src/main/RelayTour.scala b/modules/relay/src/main/RelayTour.scala
@@ -55,6 +55,7 @@ object RelayTour:
     def name(tier: Tier) = options.collectFirst {
       case (t, n) if t == tier.toString => n
     } | "???"
+    val keys: Map[Tier, String] = Map(NORMAL -> "normal", HIGH -> "high", BEST -> "best")
 
   case class Spotlight(enabled: Boolean, language: Language, title: Option[String]):
     def isEmpty                           = !enabled && specialLanguage.isEmpty && title.isEmpty
