feature: last played game id (#221)

Game-as-a-Service · Sep 29, 2024 · 7ade030 · 7ade030
1 parent 7a156d3
commit 7ade030
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 6 deletions.
diff --git a/application/src/main/kotlin/tw/waterballsa/gaas/application/usecases/StartGameUseCase.kt b/application/src/main/kotlin/tw/waterballsa/gaas/application/usecases/StartGameUseCase.kt
@@ -71,7 +71,20 @@ class StartGameUseCase(
         val startGameRequest = StartGameRequest(roomId!!.value, players.map { it.toGamePlayer() })
         val startGameResponse = gameService.startGame(gameServerHost, jwtToken, startGameRequest)
 
-        return StartedGameEvent(GAME_STARTED, Data(startGameResponse.url, roomId!!, game.id!!))
+        return StartedGameEvent(
+            GAME_STARTED,
+            Data(
+                startGameResponse.url,
+                roomId!!,
+                game.id!!,
+                players.map {
+                    Data.Player(
+                        it.id.value,
+                        it.nickname,
+                    )
+                },
+            ),
+        )
     }
 
     private fun Room.Player.toGamePlayer(): StartGameRequest.GamePlayer =

diff --git a/domain/src/main/kotlin/tw/waterballsa/gaas/domain/User.kt b/domain/src/main/kotlin/tw/waterballsa/gaas/domain/User.kt
@@ -8,6 +8,8 @@ class User(
     val email: String = "",
     var nickname: String = "",
     val identities: MutableList<String> = mutableListOf(),
+    val lastPlayedGameId: String? = null,
+    val playedGamesIds: Set<String>? = null,
 ) {
     @JvmInline
     value class Id(val value: String)

diff --git a/domain/src/main/kotlin/tw/waterballsa/gaas/events/StartedGameEvent.kt b/domain/src/main/kotlin/tw/waterballsa/gaas/events/StartedGameEvent.kt
@@ -12,7 +12,13 @@ class StartedGameEvent(
         val gameUrl: String,
         val roomId: Room.Id,
         val gameId: GameRegistration.Id,
-    )
+        val players: List<Player>,
+    ) {
+        data class Player(
+            val id: String,
+            val nickname: String,
+        )
+    }
 
     override fun getEventData(): Any = data
 

diff --git a/spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/presenter/GetUserPresenter.kt b/spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/presenter/GetUserPresenter.kt
@@ -16,5 +16,6 @@ class GetUserPresenter : GetUserUseCase.Presenter {
             id = id!!.value,
             email = email,
             nickname = nickname,
+            lastPlayedGameId = lastPlayedGameId,
         )
 }
diff --git a/spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/viewmodel/GetUserViewModel.kt b/spring/src/main/kotlin/tw/waterballsa/gaas/spring/controllers/viewmodel/GetUserViewModel.kt
@@ -3,5 +3,6 @@ package tw.waterballsa.gaas.spring.controllers.viewmodel
 data class GetUserViewModel(
     val id: String,
     val email: String,
-    val nickname: String
+    val nickname: String,
+    val lastPlayedGameId: String?,
 )
diff --git a/spring/src/main/kotlin/tw/waterballsa/gaas/spring/eventbus/StartedGameEventListener.kt b/spring/src/main/kotlin/tw/waterballsa/gaas/spring/eventbus/StartedGameEventListener.kt
@@ -4,20 +4,25 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 import tw.waterballsa.gaas.events.StartedGameEvent
 import tw.waterballsa.gaas.spring.repositories.dao.GameRegistrationDAO
+import tw.waterballsa.gaas.spring.repositories.dao.UserDAO
 import kotlin.reflect.KClass
 
 @Component
 class StartedGameEventListener(
     override val eventType: KClass<StartedGameEvent>,
     private val gameRegistrationDAO: GameRegistrationDAO,
+    private val userDAO: UserDAO,
 ) : EventListener<StartedGameEvent> {
 
     @Autowired
-    constructor(gameRegistrationDAO: GameRegistrationDAO): this(StartedGameEvent::class, gameRegistrationDAO)
+    constructor(gameRegistrationDAO: GameRegistrationDAO, userDAO: UserDAO): this(StartedGameEvent::class, gameRegistrationDAO, userDAO)
 
     override fun onEvents(events: List<StartedGameEvent>) {
         events.forEach {
             gameRegistrationDAO.incrementTimesPlayedById(it.data.gameId.value)
+            it.data.players.forEach { player ->
+                userDAO.setLastPlayedGameIdAndAddToSetPlayedGamesIdsById(player.id, it.data.gameId.value)
+            }
         }
     }
 }
diff --git a/spring/src/main/kotlin/tw/waterballsa/gaas/spring/repositories/dao/UserDAO.kt b/spring/src/main/kotlin/tw/waterballsa/gaas/spring/repositories/dao/UserDAO.kt
@@ -1,6 +1,8 @@
 package tw.waterballsa.gaas.spring.repositories.dao
 
 import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.Query
+import org.springframework.data.mongodb.repository.Update
 import org.springframework.stereotype.Repository
 import tw.waterballsa.gaas.spring.repositories.data.UserData
 
@@ -10,4 +12,8 @@ interface UserDAO : MongoRepository<UserData, String> {
     fun existsByNickname(nickname: String): Boolean
     fun findByEmail(email: String): UserData?
     fun findByIdentities(identityProviderId: String): UserData?
+
+    @Query("{ '_id' : ?0 }")
+    @Update("{ '\$set': { 'lastPlayedGameId': ?1 }, '\$addToSet': { 'playedGamesIds': ?1 } }")
+    fun setLastPlayedGameIdAndAddToSetPlayedGamesIdsById(id: String, gameId: String)
 }
diff --git a/spring/src/main/kotlin/tw/waterballsa/gaas/spring/repositories/data/UserData.kt b/spring/src/main/kotlin/tw/waterballsa/gaas/spring/repositories/data/UserData.kt
@@ -11,14 +11,18 @@ class UserData(
     val email: String = "",
     val nickname: String = "",
     val identities: List<String> = emptyList(),
+    val lastPlayedGameId: String? = null,
+    val playedGamesIds: Set<String>? = null,
 ) {
 
     fun toDomain(): User =
         User(
             User.Id(id!!),
             email,
             nickname,
-            identities.toMutableList()
+            identities.toMutableList(),
+            lastPlayedGameId,
+            playedGamesIds,
         )
 }
 
@@ -27,5 +31,7 @@ fun User.toData(): UserData =
         id = id?.value,
         email = email,
         nickname = nickname,
-        identities = identities
+        identities = identities,
+        lastPlayedGameId = lastPlayedGameId,
+        playedGamesIds = playedGamesIds,
     )