Compare commits

...

2 Commits

Author SHA1 Message Date
TeamCity
1542906edf ci: bump version to v4.25.0 2026-01-07 15:59:57 +00:00
cf1854976a feat: Update joinGame endpoint to accept gameId as a path parameter 2026-01-07 16:56:35 +01:00
5 changed files with 23 additions and 29 deletions

View File

@@ -307,3 +307,8 @@
### Features
* Update Gateway to use ArrayList for game IDs and bound users ([2f89951](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2f89951c25484d6bc412536a83019ee6d0b7f780))
## (2026-01-07)
### Features
* Update joinGame endpoint to accept gameId as a path parameter ([cf18549](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/cf1854976a51eb4931d50cf93640498ed18686fc))

View File

@@ -55,13 +55,8 @@ class MainMenuController @Inject()(
}
def joinGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
val jsonBody = request.body.asJson
val gameId: Option[String] = jsonBody.flatMap { jsValue =>
(jsValue \ "gameId").asOpt[String]
}
if (gameId.isDefined) {
val game = PodManager.getGame(gameId.get)
def joinGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
val game = PodManager.getGame(gameId)
game match {
case Some(g) =>
g.addUser(request.user)
@@ -76,12 +71,6 @@ class MainMenuController @Inject()(
"errorMessage" -> "No Game found"
))
}
} else {
BadRequest(Json.obj(
"status" -> "failure",
"errorMessage" -> "Invalid form submission"
))
}
}
def rules(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>

View File

@@ -15,7 +15,7 @@ GET /rules controllers.MainMenuController.rules()
GET /navSPA/:pType controllers.MainMenuController.navSPA(pType)
POST /createGame controllers.MainMenuController.createGame()
POST /joinGame controllers.MainMenuController.joinGame()
POST /joinGame/:gameId controllers.MainMenuController.joinGame(gameId: String)
# User authentication routes
POST /login controllers.UserController.login_Post()

View File

@@ -1,3 +1,3 @@
MAJOR=4
MINOR=24
MINOR=25
PATCH=0