feat(api): Implement received hand event handling and UI updates

This commit is contained in:
2025-11-23 17:39:36 +01:00
parent 8ca909db52
commit a452e7753b
9 changed files with 124 additions and 7 deletions

View File

@@ -1,8 +1,9 @@
package util
import de.knockoutwhist.cards.Card
import de.knockoutwhist.cards.{Card, Hand}
import de.knockoutwhist.cards.CardValue.*
import de.knockoutwhist.cards.Suit.{Clubs, Diamonds, Hearts, Spades}
import play.api.libs.json.{JsArray, Json}
import play.twirl.api.Html
import scalafx.scene.image.Image
@@ -36,4 +37,22 @@ object WebUIUtils {
f"$cv$s"
}
/**
* Map a Hand to a JsArray of cards
* Per card it has the string and the index in the hand
* @param hand
* @return
*/
def handToJson(hand: Hand): JsArray = {
val cards = hand.cards
JsArray(
cards.zipWithIndex.map { case (card, index) =>
Json.obj(
"idx" -> index,
"card" -> cardtoString(card)
)
}
)
}
}

View File

@@ -1,8 +1,10 @@
package util
import de.knockoutwhist.utils.events.SimpleEvent
import play.api.libs.json.{JsValue, Json}
import tools.jackson.databind.json.JsonMapper
import tools.jackson.module.scala.ScalaModule
import util.mapper.{ReceivedHandEventMapper, SimpleEventMapper}
object WebsocketEventMapper {
@@ -13,8 +15,24 @@ object WebsocketEventMapper {
private val mapper = JsonMapper.builder().addModule(scalaModule).build()
def toJsonString(obj: SimpleEvent): String = {
mapper.writeValueAsString(obj)
private var customMappers: Map[String,SimpleEventMapper[SimpleEvent]] = Map()
private def registerCustomMapper[T <: SimpleEvent](mapper: SimpleEventMapper[T]): Unit = {
customMappers = customMappers + (mapper.id -> mapper.asInstanceOf[SimpleEventMapper[SimpleEvent]])
}
// Register all custom mappers here
registerCustomMapper(ReceivedHandEventMapper)
def toJson(obj: SimpleEvent): JsValue = {
val data = if (customMappers.contains(obj.id)) {
return customMappers(obj.id).toJson(obj)
}else Json.parse(mapper.writeValueAsString(obj))
Json.obj(
"id" -> ("request-" + java.util.UUID.randomUUID().toString),
"event" -> obj.id,
"data" -> data
)
}
}

View File

@@ -0,0 +1,16 @@
package util.mapper
import de.knockoutwhist.events.player.ReceivedHandEvent
import play.api.libs.json.{JsArray, JsObject, Json}
import util.WebUIUtils
object ReceivedHandEventMapper extends SimpleEventMapper[ReceivedHandEvent] {
override def id: String = "ReceivedHandEvent"
override def toJson(event: ReceivedHandEvent): JsObject = {
Json.obj(
"dog" -> event.player.isInDogLife,
"hand" -> event.player.currentHand().map(hand => WebUIUtils.handToJson(hand))
)
}
}

View File

@@ -0,0 +1,11 @@
package util.mapper
import de.knockoutwhist.utils.events.SimpleEvent
import play.api.libs.json.JsObject
trait SimpleEventMapper[T <: SimpleEvent] {
def id: String
def toJson(event: T): JsObject
}