Merge pull request #53 from prgrms-web-devcourse-final-project/QUZ-109-FIX-Socket-Message

[QUZ-109][BUGFIX] fix socket message

Author: NaMinhyeok

game-service/game-application/app-api/src/main/kotlin/com/grepp/quizy/game/api/game/dto/GameResponse.kt

@@ -1,15 +1,24 @@
 package com.grepp.quizy.game.api.game.dto
 
 import com.grepp.quizy.game.domain.game.Game
+import com.grepp.quizy.game.domain.game.Player
 
 data class GameResponse(
     val id: Long,
+    val subject: String,
+    val level: String,
+    val quizCount: Int,
+    val players: List<Player>,
     val inviteCode: String?,
 ) {
     companion object {
         fun from(game: Game): GameResponse {
             return GameResponse(
                 id = game.id,
+                subject = game.setting.subject.description,
+                level = game.setting.level.description,
+                quizCount = game.setting.quizCount,
+                players = game.players.players,
                 inviteCode = game.inviteCode?.value,
             )
         }

game-service/game-domain/src/main/kotlin/com/grepp/quizy/game/domain/game/GameVO.kt

@@ -164,7 +164,7 @@ data class Players(
         if (players.size >= 5) {
             throw GameException.GameAlreadyFullException
         }
-        if (players.contains(player)) {
+        if (players.any { it.user.id == player.user.id }) {
             throw GameException.GameAlreadyParticipatedException
         }
         return Players(players + player)

game-service/game-infra/src/main/kotlin/com/grepp/quizy/game/infra/game/entity/GameRedisEntity.kt

@@ -23,7 +23,7 @@ class GameRedisEntity(
 
     val players: Players,
 
-    val inviteCode: InviteCode?
+    val inviteCode: String?
 ) {
     companion object {
         fun from(game: Game): GameRedisEntity {
@@ -33,7 +33,7 @@ class GameRedisEntity(
                 setting = game.setting,
                 status = game.status,
                 players = game.players,
-                inviteCode = game.inviteCode
+                inviteCode = game.inviteCode?.value
             )
         }
 
@@ -46,7 +46,7 @@ class GameRedisEntity(
             _setting = setting,
             _status = status,
             _players = players,
-            inviteCode = inviteCode
+            inviteCode = inviteCode?.let { InviteCode(it) }
         )
     }
 

game-service/game-infra/src/main/kotlin/com/grepp/quizy/game/infra/game/repository/GameRepositoryAdapter.kt

@@ -3,12 +3,15 @@ package com.grepp.quizy.game.infra.game.repository
 import com.grepp.quizy.game.domain.game.Game
 import com.grepp.quizy.game.domain.game.GameRepository
 import com.grepp.quizy.game.infra.game.entity.GameRedisEntity
+import org.springframework.data.redis.core.RedisTemplate
+import org.springframework.data.redis.core.ScanOptions
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Repository
 
 @Repository
 class GameRepositoryAdapter(
     private val gameRedisRepository: GameRedisRepository,
+    private val redisTemplate: RedisTemplate<String,String>
 ) : GameRepository {
 
     override fun save(game: Game): Game {
@@ -22,9 +25,26 @@ class GameRepositoryAdapter(
     }
 
     override fun findByInviteCode(code: String): Game? {
-        return gameRedisRepository
-            .findTopByInviteCode(code)
-            ?.toDomain()
+        val scanner = redisTemplate.connectionFactory
+            .connection
+            .scan(
+                ScanOptions.scanOptions()
+                .match("game:*")
+                .count(100)
+                .build())
+
+        while(scanner.hasNext()) {
+            val key = String(scanner.next())
+            val inviteCode = redisTemplate.opsForHash<String, String>()
+                .get(key, "inviteCode")
+
+            if(inviteCode == code) {
+                return gameRedisRepository.findByIdOrNull(key.split(":")[1].toLong())
+                    ?.toDomain()
+            }
+        }
+        return null
+
     }
 
 }

game-service/game-infra/src/main/kotlin/com/grepp/quizy/game/infra/redis/RedisSubscriber.kt

@@ -1,7 +1,6 @@
 package com.grepp.quizy.game.infra.redis
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.grepp.quizy.game.domain.GameMessage
 import com.grepp.quizy.game.infra.websocket.WebSocketDestination.MULTIPLE_PREFIX
 import org.springframework.data.redis.connection.Message
 import org.springframework.data.redis.connection.MessageListener
@@ -10,20 +9,17 @@ import org.springframework.stereotype.Component
 
 @Component
 class RedisSubscriber(
-        private val objectMapper: ObjectMapper,
-        private val messagingTemplate: SimpMessagingTemplate,
+    private val objectMapper: ObjectMapper,
+    private val messagingTemplate: SimpMessagingTemplate,
 ) : MessageListener {
 
     override fun onMessage(message: Message, pattern: ByteArray?) {
-        val publishMessage = String(message.body)
-        val gameMessage =
-                objectMapper.readValue(
-                        publishMessage,
-                        GameMessage::class.java,
-                )
+        val publishMessage = message.toString()
+        val gameId = objectMapper.readTree(publishMessage).get("gameId").asText()
+
         messagingTemplate.convertAndSend(
-                "$MULTIPLE_PREFIX/game/${gameMessage.gameId}",
-                publishMessage,
+            "$MULTIPLE_PREFIX/game/${gameId}",
+            publishMessage,
         )
     }
 }