refactor: clean up code formatting and improve readability across multiple files

2026-04-29 08:38:27 +02:00
parent 5d97c3c8b5
commit 106118ad29
43 changed files with 414 additions and 379 deletions
@@ -46,5 +46,4 @@ case class RotatedTokenDto(token: String)

 case class OfficialBotAccountDto(id: String, name: String, rating: Int, createdAt: String)

-
 case class OfficialChallengeResponse(gameId: String, botName: String, difficulty: Int)
@@ -96,4 +96,3 @@ class OfficialBotAccountRepository:
  def delete(botId: UUID): Unit =
    em.find(classOf[OfficialBotAccount], botId) match
      case bot: OfficialBotAccount => em.remove(bot)
-
@@ -200,4 +200,3 @@ class AccountResource:
      rating = bot.rating,
      createdAt = bot.createdAt.toString,
    )
-
@@ -24,8 +24,8 @@ import java.util.concurrent.ThreadLocalRandom
 class OfficialChallengeResource:

  // scalafix:off DisableSyntax.var
-  @Inject var accountService: AccountService  = uninitialized
-  @Inject var jwt: JsonWebToken               = uninitialized
+  @Inject var accountService: AccountService    = uninitialized
+  @Inject var jwt: JsonWebToken                 = uninitialized
  @Inject var botEventPublisher: EventPublisher = uninitialized

  @Inject
@@ -43,46 +43,49 @@ class OfficialChallengeResource:
      @QueryParam("color") color: String,
  ): Response =
    if difficulty < 1000 || difficulty > 2800 then
-      return Response
+      Response
        .status(Response.Status.BAD_REQUEST)
        .entity(ErrorDto("difficulty must be between 1000 and 2800"))
        .build()
+    else
+      val normalizedColor = Option(color).map(_.toLowerCase).getOrElse("random")
+      normalizedColor match
+        case "white" | "black" | "random" =>
+          val userId  = UUID.fromString(jwt.getSubject)
+          val botOpt  = accountService.getOfficialBotAccounts().find(_.name == botName)
+          val userOpt = accountService.findById(userId)

-    val playerColor = Option(color).map(_.toLowerCase).getOrElse("random") match
-      case "white" | "black" | "random" => Option(color).map(_.toLowerCase).getOrElse("random")
-      case other =>
-        return Response
-          .status(Response.Status.BAD_REQUEST)
-          .entity(ErrorDto(s"Invalid color: $other. Must be white, black or random"))
-          .build()
-
-    val userId = UUID.fromString(jwt.getSubject)
-    val botOpt  = accountService.getOfficialBotAccounts().find(_.name == botName)
-    val userOpt = accountService.findById(userId)
-
-    (botOpt, userOpt) match
-      case (None, _) =>
-        Response.status(Response.Status.NOT_FOUND).entity(ErrorDto(s"Official bot '$botName' not found")).build()
-      case (_, None) =>
-        Response.status(Response.Status.NOT_FOUND).entity(ErrorDto("User not found")).build()
-      case (Some(bot), Some(user)) =>
-        val userIsWhite = playerColor match
-          case "white" => true
-          case "black" => false
-          case _       => ThreadLocalRandom.current().nextBoolean()
-        val (white, black, botColor) =
-          if userIsWhite then
-            (CorePlayerInfo(user.id.toString, user.username), CorePlayerInfo(bot.id.toString, bot.name), "black")
-          else
-            (CorePlayerInfo(bot.id.toString, bot.name), CorePlayerInfo(user.id.toString, user.username), "white")
-        val req    = CoreCreateGameRequest(Some(white), Some(black), None, Some("Authenticated"))
-        val gameId =
-          try Right(coreGameClient.createGame(req).gameId)
-          catch case _ => Left("Failed to create game")
-        gameId match
-          case Left(err) =>
-            Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ErrorDto(err)).build()
-          case Right(id) =>
-            try botEventPublisher.publishGameStart(bot.name, id, botColor, difficulty, bot.id.toString)
-            catch case ex: Exception => log.warnf(ex, "Failed to notify bot for game %s", id)
-            Response.status(Response.Status.CREATED).entity(OfficialChallengeResponse(id, botName, difficulty)).build()
+          (botOpt, userOpt) match
+            case (None, _) =>
+              Response.status(Response.Status.NOT_FOUND).entity(ErrorDto(s"Official bot '$botName' not found")).build()
+            case (_, None) =>
+              Response.status(Response.Status.NOT_FOUND).entity(ErrorDto("User not found")).build()
+            case (Some(bot), Some(user)) =>
+              val userIsWhite = normalizedColor match
+                case "white" => true
+                case "black" => false
+                case _       => ThreadLocalRandom.current().nextBoolean()
+              val (white, black, botColor) =
+                if userIsWhite then
+                  (CorePlayerInfo(user.id.toString, user.username), CorePlayerInfo(bot.id.toString, bot.name), "black")
+                else
+                  (CorePlayerInfo(bot.id.toString, bot.name), CorePlayerInfo(user.id.toString, user.username), "white")
+              val req = CoreCreateGameRequest(Some(white), Some(black), None, Some("Authenticated"))
+              val gameId =
+                try Right(coreGameClient.createGame(req).gameId)
+                catch case _ => Left("Failed to create game")
+              gameId match
+                case Left(err) =>
+                  Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ErrorDto(err)).build()
+                case Right(id) =>
+                  try botEventPublisher.publishGameStart(bot.name, id, botColor, difficulty, bot.id.toString)
+                  catch case ex: Exception => log.warnf(ex, "Failed to notify bot for game %s", id)
+                  Response
+                    .status(Response.Status.CREATED)
+                    .entity(OfficialChallengeResponse(id, botName, difficulty))
+                    .build()
+        case other =>
+          Response
+            .status(Response.Status.BAD_REQUEST)
+            .entity(ErrorDto(s"Invalid color: $other. Must be white, black or random"))
+            .build()
@@ -163,4 +163,3 @@ class AccountService:
        user.botAccounts.forEach(_.banned = false)
        userAccountRepository.persist(user)
        Right(user)
-
@@ -25,7 +25,6 @@ import org.eclipse.microprofile.rest.client.inject.RestClient
 import org.jboss.logging.Logger
 import scala.compiletime.uninitialized

-
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import java.util.UUID
@@ -10,12 +10,13 @@ import scala.compiletime.uninitialized
 class EventPublisher:

  // scalafix:off DisableSyntax.var
-  @Inject var redis: RedisDataSource = uninitialized
+  @Inject var redis: RedisDataSource   = uninitialized
  @Inject var redisConfig: RedisConfig = uninitialized
  // scalafix:on DisableSyntax.var

  def publishGameStart(botId: String, gameId: String, playingAs: String, difficulty: Int, botAccountId: String): Unit =
-    val event = s"""{"type":"gameStart","gameId":"$gameId","playingAs":"$playingAs","difficulty":$difficulty,"botAccountId":"$botAccountId"}"""
+    val event =
+      s"""{"type":"gameStart","gameId":"$gameId","playingAs":"$playingAs","difficulty":$difficulty,"botAccountId":"$botAccountId"}"""
    redis.pubsub(classOf[String]).publish(s"${redisConfig.prefix}:bot:$botId:events", event)
    ()