feat(user-sessions): implemented interactivity

knockoutwhistweb/app/logic/PodManager.scala

@@ -6,6 +6,7 @@ import de.knockoutwhist.control.controllerBaseImpl.BaseGameLogic
 import di.KnockOutWebConfigurationModule
 import logic.game.GameLobby
 import model.users.User
+import util.GameUtil
 
 import javax.inject.Singleton
 import scala.collection.mutable
@@ -27,7 +28,7 @@ class PodManager {
                 ): GameLobby = {
     val gameLobby = GameLobby(
       logic = BaseGameLogic(injector.getInstance(classOf[Configuration])),
-      id = java.util.UUID.randomUUID().toString,
+      id = GameUtil.generateCode(),
       internalId = java.util.UUID.randomUUID(),
       name = name,
       maxPlayers = maxPlayers,

knockoutwhistweb/app/logic/game/GameLobby.scala

@@ -2,9 +2,9 @@ package logic.game
 
 import de.knockoutwhist.cards.{Hand, Suit}
 import de.knockoutwhist.control.GameLogic
-import de.knockoutwhist.control.GameState.Lobby
+import de.knockoutwhist.control.GameState.{Lobby, MainMenu}
 import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
-import de.knockoutwhist.events.global.SessionClosed
+import de.knockoutwhist.events.global.{GameStateChangeEvent, SessionClosed}
 import de.knockoutwhist.events.player.PlayerEvent
 import de.knockoutwhist.player.Playertype.HUMAN
 import de.knockoutwhist.player.{AbstractPlayer, PlayerFactory}
@@ -46,9 +46,13 @@ class GameLobby private(
     event match {
       case event: PlayerEvent =>
         users.get(event.playerId).foreach(session => session.updatePlayer(event))
+      case event: GameStateChangeEvent =>
+        if (event.oldState == MainMenu && event.newState == Lobby) {
+          return
+        }
+        users.values.foreach(session => session.updatePlayer(event))
       case event: SessionClosed =>
         users.values.foreach(session => session.updatePlayer(event))
-
       case event: SimpleEvent =>
         users.values.foreach(session => session.updatePlayer(event))
     }
@@ -70,6 +74,9 @@ class GameLobby private(
     users.values.foreach { player =>
       playerNamesList += PlayerFactory.createPlayer(player.name, player.id, HUMAN)
     }
+    if (playerNamesList.size < 2) {
+      throw new NotEnoughPlayersException("Not enough players to start the game!")
+    }
     logic.createMatch(playerNamesList.toList)
     logic.controlMatch()
   }
@@ -150,13 +157,25 @@ class GameLobby private(
   
   //-------------------
   
-  private def getUserSession(userId: UUID): UserSession = {
+  def getUserSession(userId: UUID): UserSession = {
     val sessionOpt = users.get(userId)
     if (sessionOpt.isEmpty) {
       throw new NotInThisGameException("You are not in this game!")
     }
     sessionOpt.get
   }
+
+  def getPlayerByUser(user: User): AbstractPlayer = {
+    getPlayerBySession(getUserSession(user.id))
+  }
+
+  private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
+    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
+    if (playerOption.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    playerOption.get
+  }
   
   private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = {
     if (!Thread.holdsLock(userSession.lock)) {
@@ -165,11 +184,7 @@ class GameLobby private(
     if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) {
       throw new NotInteractableException("You can't play a card!")
     }
-    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
-    if (playerOption.isEmpty) {
-      throw new NotInThisGameException("You are not in this game!")
-    }
-    playerOption.get
+    getPlayerBySession(userSession)
   }
   
   private def getHand(player: AbstractPlayer): Hand = {