#25 support rounds

stoerti · Dec 21, 2024 · bc6b342 · bc6b342
1 parent 13a9b82
commit bc6b342
Show file tree

Hide file tree

Showing 48 changed files with 1,779 additions and 627 deletions.
diff --git a/backend/src/main/kotlin/org/quizmania/game/api/GameConfig.kt b/backend/src/main/kotlin/org/quizmania/game/api/GameConfig.kt
@@ -5,9 +5,6 @@ import org.quizmania.question.api.QuestionType
 
 data class GameConfig(
   val maxPlayers: Int = 10,
-  val numQuestions: Int = 10,
   val secondsToAnswer: Long = 10,
-  val questionTypes: Set<QuestionType> = QuestionType.entries.toSet(),
   val questionSetId: QuestionSetId,
-  val useBuzzer: Boolean = false,
-)
+  )
diff --git a/backend/src/main/kotlin/org/quizmania/game/api/commands.kt b/backend/src/main/kotlin/org/quizmania/game/api/commands.kt
@@ -35,6 +35,23 @@ data class StartGameCommand(
     override val gameId: UUID,
 ): GameCommand
 
+data class StartNextRoundCommand(
+    @TargetAggregateIdentifier
+    override val gameId: UUID,
+): GameCommand
+
+data class ScoreRoundCommand(
+    @TargetAggregateIdentifier
+    override val gameId: UUID,
+): GameCommand
+
+data class CloseRoundCommand(
+    @TargetAggregateIdentifier
+    override val gameId: UUID,
+): GameCommand
+
+
+
 data class AnswerQuestionCommand(
     @TargetAggregateIdentifier
     override val gameId: UUID,

diff --git a/backend/src/main/kotlin/org/quizmania/game/api/events.kt b/backend/src/main/kotlin/org/quizmania/game/api/events.kt
@@ -2,6 +2,8 @@ package org.quizmania.game.api
 
 import org.quizmania.question.api.Question
 import org.quizmania.question.api.QuestionId
+import org.quizmania.question.api.Round
+import org.quizmania.question.api.RoundConfig
 import java.time.Instant
 import java.util.*
 
@@ -22,7 +24,7 @@ data class GameCreatedEvent(
   override val gameId: GameId,
   val name: String,
   val config: GameConfig,
-  val questionList: List<QuestionId>,
+  val rounds: List<Round>,
   val creatorUsername: String,
   val moderatorUsername: String?,
 ) : GameEvent
@@ -51,10 +53,30 @@ data class GameCanceledEvent(
   override val gameId: GameId,
 ) : GameEvent
 
+data class RoundStartedEvent(
+  override val gameId: GameId,
+  val gameRoundId: GameRoundId,
+  val roundNumber: Int,
+  val roundName: String,
+  val roundConfig: RoundConfig,
+  val questions: List<QuestionId>,
+) : GameEvent
+
+data class RoundScoredEvent(
+  override val gameId: GameId,
+  val gameRoundId: GameRoundId,
+) : GameEvent
+
+data class RoundClosedEvent(
+  override val gameId: GameId,
+  val gameRoundId: GameRoundId,
+) : GameEvent
+
 data class QuestionAskedEvent(
   override val gameId: GameId,
   override val gameQuestionId: GameQuestionId,
-  val gameQuestionNumber: GameQuestionNumber,
+  val roundNumber: GameRoundNumber,
+  val roundQuestionNumber: RoundQuestionNumber,
   val questionMode: GameQuestionMode,
   val questionTimestamp: Instant,
   val timeToAnswer: Long,

diff --git a/backend/src/main/kotlin/org/quizmania/game/api/exceptions.kt b/backend/src/main/kotlin/org/quizmania/game/api/exceptions.kt
@@ -22,12 +22,21 @@ class UsernameTakenProblem(gameId: UUID) :
 class GameAlreadyFullProblem(gameId: UUID) :
         GameProblem(gameId, "urn:quizmania:game:alreadyFull", "Game already full")
 
+class GameNotStartedProblem(gameId: UUID) :
+  GameProblem(gameId, "urn:quizmania:game:notStarted", "Game has not started")
+
 class GameAlreadyStartedProblem(gameId: UUID) :
   GameProblem(gameId, "urn:quizmania:game:alreadyStarted", "Game has already started")
 
 class GameAlreadyEndedProblem(gameId: UUID) :
   GameProblem(gameId, "urn:quizmania:game:alreadyEnded", "Game has already ended")
 
+class RoundAlreadyStartedProblem(gameId: UUID) :
+  GameProblem(gameId, "urn:quizmania:game:roundAlreadyStarted", "Round has already started")
+
+class RoundAlreadyClosedProblem(gameId: UUID) :
+  GameProblem(gameId, "urn:quizmania:game:alreadyEnded", "Round has already ended")
+
 class OtherQuestionStillOpenProblem(gameId: UUID) :
   GameProblem(gameId, "urn:quizmania:game:questionStillOpen", "Another question is still open")
 

diff --git a/backend/src/main/kotlin/org/quizmania/game/api/types.kt b/backend/src/main/kotlin/org/quizmania/game/api/types.kt
@@ -5,4 +5,6 @@ import java.util.UUID
 typealias GameId = UUID
 typealias GameQuestionId = UUID
 typealias GamePlayerId = UUID
-typealias GameQuestionNumber = Int
+typealias GameRoundId = UUID
+typealias GameRoundNumber = Int
+typealias RoundQuestionNumber = Int