Skip to content

Commit da35cf2

Browse files
authored
Merge pull request #76 from prgrms-web-devcourse-final-project/QUZ-130-Test-Domain-Module
[QUZ-130][TEST] domain module test, redis refactor
2 parents 155cd95 + 917fa20 commit da35cf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1456
-1815
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ import org.springframework.stereotype.Component
66
class GameManager(
77
private val gameRepository: GameRepository
88
) {
9-
fun destroy(game: Game) {
10-
gameRepository.delete(game)
11-
}
129

1310
fun destroy(gameId: Long) {
1411
gameRepository.deleteById(gameId)
1512
}
13+
1614
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ interface GameRepository {
88

99
fun findByInviteCode(code: String): Game?
1010

11-
fun delete(game: Game)
12-
1311
fun deleteById(id: Long)
1412

1513
}

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,6 @@ data class Players(
182182
return Players(players - player)
183183
}
184184

185-
fun findPlayer(user: User): Player {
186-
return players.find { it.user == user }
187-
?: throw GameException.GameNotParticipatedException
188-
}
189-
190185
fun findPlayer(userId: Long): Player {
191186
return players.find { it.user.id == userId }
192187
?: throw GameException.GameNotParticipatedException
@@ -203,6 +198,14 @@ data class Players(
203198
?: throw GameException.GameAlreadyParticipatedException
204199

205200

201+
fun isAllParticipated(): Boolean {
202+
return players.none() { it.isWaiting() }
203+
}
204+
205+
fun isEmpty(): Boolean {
206+
return players.isEmpty()
207+
}
208+
206209
private fun updatePlayerStatus(player: Player): List<Player> =
207210
players.map { p ->
208211
when (p.user) {
@@ -211,12 +214,4 @@ data class Players(
211214
}
212215
}
213216

214-
fun isEmpty(): Boolean {
215-
return players.isEmpty()
216-
}
217-
218-
fun isAllParticipated(): Boolean {
219-
return players.none() { it.isWaiting() }
220-
}
221-
222217
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ class UserUpdater(
1414
return userRepository.save(oldUser)
1515
}
1616

17-
fun updateRating(user: User, rating: Int) {
18-
user.updateRating(rating)
19-
userRepository.save(user)
20-
}
21-
2217
fun updateRating(id: Long, rating: Int) {
2318
val user = userRepository.findById(id)
2419
?: throw UserException.UserNotFoundException

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import org.springframework.stereotype.Component
66
class UserAnswerAppender(
77
private val userAnswerRepository: UserAnswerRepository
88
) {
9-
fun append(userAnswer: UserAnswer) {
10-
userAnswerRepository.save(userAnswer)
9+
10+
fun append(userAnswer: UserAnswer): UserAnswer {
11+
return userAnswerRepository.save(userAnswer)
1112
}
13+
1214
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.grepp.quizy.game.domain.useranswer
22

33
interface UserAnswerRepository {
44

5-
fun save(userAnswer: UserAnswer): Long?
5+
fun save(userAnswer: UserAnswer): UserAnswer
66

77
fun findAllByGameIdAndUserId(gameId: Long, userId: Long): List<UserAnswer>
88

game-service/game-domain/src/test/kotlin/com/grepp/quizy/game/domain/game/FakeGameApplicationEventPublisher.kt

Lines changed: 0 additions & 21 deletions
This file was deleted.

game-service/game-domain/src/test/kotlin/com/grepp/quizy/game/domain/game/FakeGameMessagePublisher.kt

Lines changed: 0 additions & 20 deletions
This file was deleted.

game-service/game-domain/src/test/kotlin/com/grepp/quizy/game/domain/game/FakeGameRepository.kt

Lines changed: 0 additions & 67 deletions
This file was deleted.

game-service/game-domain/src/test/kotlin/com/grepp/quizy/game/domain/game/FakeIdGenerator.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)