feat(game): Implement return to lobby functionality and enhance dog life handling

knockoutwhistweb/app/controllers/IngameController.scala

@@ -227,7 +227,10 @@ class IngameController @Inject() (
     val game = podManager.getGame(gameId)
     game match {
       case Some(g) => {
-        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
+        val jsonBody = request.body.asJson
+        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
+          (jsValue \ "cardID").asOpt[String]
+        }
         var optSession: Option[UserSession] = None
         val result = Try {
           cardIdOpt match {
@@ -343,5 +346,47 @@ class IngameController @Inject() (
         NotFound("Game not found")
     }
   }
+  
+  
+  def returnToLobby(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = podManager.getGame(gameId)
+    game match {
+      case Some(g) =>
+        val result = Try {
+          val session = g.getUserSession(request.user.id)
+          g.returnToLobby(session)
+        }
+        if (result.isSuccess) {
+          Ok(Json.obj(
+            "status" -> "success",
+            "redirectUrl" -> routes.IngameController.game(gameId).url
+          ))
+        } else {
+          val throwable = result.failed.get
+          throwable match {
+            case _: NotInThisGameException =>
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+            case _: IllegalStateException =>
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+            case _ =>
+              InternalServerError(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+          }
+        }
+      case None =>
+        NotFound(Json.obj(
+          "status" -> "failure",
+          "errorMessage" -> "Game not found"
+        ))
+    }
+  }
 
 }

knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala

@@ -20,6 +20,7 @@ class JavaScriptRoutingController  @Inject()(
           routes.javascript.IngameController.kickPlayer,
           routes.javascript.IngameController.leaveGame,
           routes.javascript.IngameController.playCard,
+          routes.javascript.IngameController.playDogCard,
           routes.javascript.PollingController.polling
       )
     ).as("text/javascript")

knockoutwhistweb/app/controllers/PollingController.scala

@@ -3,6 +3,7 @@ package controllers
 import auth.{AuthAction, AuthenticatedRequest}
 import controllers.PollingController.{scheduler, timeoutDuration}
 import de.knockoutwhist.cards.Hand
+import de.knockoutwhist.player.AbstractPlayer
 import logic.PodManager
 import logic.game.{GameLobby, PollingEvents}
 import logic.game.PollingEvents.{CardPlayed, LobbyCreation, LobbyUpdate, NewRound, ReloadEvent}
@@ -28,7 +29,7 @@ class PollingController @Inject() (
                                     implicit val ec: ExecutionContext
                                   ) extends AbstractController(cc) {
 
-  private def buildCardPlayResponse(game: GameLobby, hand: Option[Hand], newRound: Boolean): JsValue = {
+  private def buildCardPlayResponse(game: GameLobby, hand: Option[Hand], player: AbstractPlayer, newRound: Boolean): JsValue = {
     val currentRound = game.logic.getCurrentRound.get
     val currentTrick = game.logic.getCurrentTrick.get
 
@@ -57,6 +58,7 @@ class PollingController @Inject() (
       "status" -> "cardPlayed",
       "animation" -> newRound,
       "handData" -> stringHand,
+      "dog" -> player.isInDogLife,
       "currentPlayerName" -> game.logic.getCurrentPlayer.get.name,
       "trumpSuit" -> currentRound.trumpSuit.toString,
       "trickCards" -> trickCardsJson,
@@ -84,12 +86,12 @@ class PollingController @Inject() (
       case NewRound =>
         val player = game.getPlayerByUser(userSession.user)
         val hand = player.currentHand()
-        val jsonResponse = buildCardPlayResponse(game, hand, true)
+        val jsonResponse = buildCardPlayResponse(game, hand, player, true)
         Ok(jsonResponse)
       case CardPlayed =>
         val player = game.getPlayerByUser(userSession.user)
         val hand = player.currentHand()
-        val jsonResponse = buildCardPlayResponse(game, hand, false)
+        val jsonResponse = buildCardPlayResponse(game, hand, player, false)
         Ok(jsonResponse)
       case LobbyUpdate =>
         Ok(buildLobbyUsersResponse(game, userSession))