ci: bump version to v4.14.0

feat: FRO-31 Small backend changes (#108 )
Force pushing Janis changes Co-authored-by: Janis <janis.e.20@gmx.de> Co-authored-by: Janis <janis-e@gmx.de> Reviewed-on: #108 Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>
2025-12-11 06:13:24 +00:00 · 2025-12-11 07:10:24 +01:00 · 2025-12-10 14:19:44 +00:00 · 2025-12-10 15:16:53 +01:00 · 2025-12-10 13:15:50 +00:00 · 2025-12-10 14:12:48 +01:00
7 changed files with 27 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -234,3 +234,18 @@
 ### Features

 * FRO-2 Implement Login Component ([#105](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/105)) ([e8b31b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e8b31b174819b5f033034501856c4b1189c4c4ee))
+##  (2025-12-10)
+
+### Features
+
+* FRO-20 Create scoreboard component ([#106](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/106)) ([2a29ca8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2a29ca8cdd3ef55f6f66f00b5e7727e1b1af1458))
+##  (2025-12-10)
+
+### Features
+
+* **api:** FRO-14 Create Game ([#107](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/107)) ([bd7a055](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bd7a055a0944a1c5219f21bb080bf658229f49e9))
+##  (2025-12-11)
+
+### Features
+
+* FRO-31 Small backend changes ([#108](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/108)) ([b17aae5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b17aae5795b35ce3805db87c9bf741a5a96cd5ac))
--- a/knockoutwhistweb/app/controllers/MainMenuController.scala
+++ b/knockoutwhistweb/app/controllers/MainMenuController.scala
@@ -44,8 +44,7 @@ class MainMenuController @Inject()(
      )
      Ok(Json.obj(
        "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameLobby.id).url,
-        "content" -> IngameController.returnInnerHTML(gameLobby, gameLobby.logic.getCurrentState, request.user).toString
+        "gameId" -> gameLobby.id,
      ))
    } else {
      BadRequest(Json.obj(
--- a/knockoutwhistweb/app/controllers/StatusController.scala
+++ b/knockoutwhistweb/app/controllers/StatusController.scala
@@ -34,7 +34,7 @@ class StatusController @Inject()(
            Json.obj(
              "status" -> "authenticated",
              "username" -> user.name,
-              "inGame" -> "false"
+              "inGame" -> false
            )
          )
        } else {
@@ -43,7 +43,7 @@ class StatusController @Inject()(
            Json.obj(
              "status" -> "authenticated",
              "username" -> user.name,
-              "inGame" -> "true",
+              "inGame" -> true,
              "gameId" -> game.id
            )
          )
@@ -80,7 +80,7 @@ class StatusController @Inject()(
  }}

  private def getUserFromSession(request: RequestHeader): Option[User] = {
-    val session = request.cookies.get("sessionId")
+    val session = request.cookies.get("accessToken")
    if (session.isDefined)
      return sessionManager.getUserBySession(session.get.value)
    None
--- a/knockoutwhistweb/app/dto/GameInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/GameInfoDTO.scala
@@ -28,7 +28,7 @@ object GameInfoDTO {
      hand = selfPlayer.flatMap(_.currentHand()).map(HandDTO(_)),
      playerQueue = PlayerQueueDTO(lobby.logic),
      currentTrick = lobby.logic.getCurrentTrick.map(TrickDTO(_)),
-      currentRound = lobby.logic.getCurrentRound.map(RoundDTO(_))
+      currentRound = lobby.logic.getCurrentRound.map(r => RoundDTO(r, lobby.logic.getCurrentMatch))
    )
  }

--- a/knockoutwhistweb/app/dto/subDTO/RoundDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/RoundDTO.scala
@@ -2,14 +2,16 @@ package dto.subDTO

 import de.knockoutwhist.cards.Card
 import de.knockoutwhist.cards.CardValue.Ace
+import de.knockoutwhist.rounds.{Match, Round}

-case class RoundDTO(trumpSuit: CardDTO, firstRound: Boolean, trickList: List[TrickDTO])
+case class RoundDTO(trumpSuit: CardDTO, playersIn: Seq[PlayerDTO], firstRound: Boolean, trickList: List[TrickDTO])

 object RoundDTO {

-  def apply(round: de.knockoutwhist.rounds.Round): RoundDTO = {
+  def apply(round: Round, matchImpl: Option[Match]): RoundDTO = {
    RoundDTO(
      trumpSuit = CardDTO(Card(Ace, round.trumpSuit)),
+      playersIn = matchImpl.map(_.playersIn.map(PlayerDTO(_))).getOrElse(Seq.empty),
      firstRound = round.firstRound,
      trickList = round.tricklist.map(trick => TrickDTO(trick))
    )
--- a/knockoutwhistweb/app/util/WebsocketEventMapper.scala
+++ b/knockoutwhistweb/app/util/WebsocketEventMapper.scala
@@ -57,7 +57,8 @@ object WebsocketEventMapper {
    Json.obj(
      "id" -> ("request-" + java.util.UUID.randomUUID().toString),
      "event" -> obj.id,
-      "state" -> stateToJson(session),
+      "state" -> session.gameLobby.getLogic.getCurrentState.toString,
+      "stateData" -> stateToJson(session),
      "data" -> data
    )
  }
--- a/versions.env
+++ b/versions.env
@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=11
+MINOR=14
 PATCH=0
Author	SHA1	Message	Date
TeamCity	13038b0cb9	ci: bump version to v4.14.0	2025-12-11 06:13:24 +00:00
lq64	b17aae5795	feat: FRO-31 Small backend changes (#108 ) Force pushing Janis changes Co-authored-by: Janis <janis.e.20@gmx.de> Co-authored-by: Janis <janis-e@gmx.de> Reviewed-on: #108 Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-11 07:10:24 +01:00
TeamCity	421f769cb6	ci: bump version to v4.13.0	2025-12-10 14:19:44 +00:00
lq64	bd7a055a09	feat(api): FRO-14 Create Game (#107 ) Added functionality to create Game so that it creates a game in the Backend Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #107 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-10 15:16:53 +01:00
TeamCity	e2a2b56174	ci: bump version to v4.12.0	2025-12-10 13:15:50 +00:00
Janis	2a29ca8cdd	feat: FRO-20 Create scoreboard component (#106 ) Reviewed-on: #106 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 14:12:48 +01:00