Using Id value class for Match entity.

android/app/src/main/java/com/adammcneilly/pocketleague/ui/EventStageDetailContent.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import com.adammcneilly.pocketleague.core.models.Match
 import com.adammcneilly.pocketleague.shared.screens.eventstagedetail.EventStageDetailViewState
 import com.adammcneilly.tournament.bracket.displaymodels.BracketDisplayModel
 import com.adammcneilly.tournament.bracket.displaymodels.BracketMatchDisplayModel
@@ -18,7 +19,7 @@ import com.adammcneilly.tournament.bracket.ui.MultiEliminationBracket
 @Composable
 fun EventStageDetailContent(
     viewState: EventStageDetailViewState,
-    onMatchClicked: (String) -> Unit,
+    onMatchClicked: (Match.Id) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val brackets = viewState.getBracket()

android/app/src/main/java/com/adammcneilly/pocketleague/ui/FeedContent.kt

@@ -22,6 +22,7 @@ import com.adammcneilly.pocketleague.android.designsystem.matches.RecentMatchesE
 import com.adammcneilly.pocketleague.core.displaymodels.EventSummaryDisplayModel
 import com.adammcneilly.pocketleague.core.displaymodels.MatchDetailDisplayModel
 import com.adammcneilly.pocketleague.core.models.Event
+import com.adammcneilly.pocketleague.core.models.Match
 import com.adammcneilly.pocketleague.feature.feed.FeedViewState
 import com.adammcneilly.pocketleague.shared.ui.match.MatchCarousel
 import com.adammcneilly.pocketleague.ui.composables.eventsummary.EventSummaryListItem
@@ -33,7 +34,7 @@ import com.adammcneilly.pocketleague.ui.composables.eventsummary.EventSummaryLis
 fun FeedContent(
     viewState: FeedViewState,
     modifier: Modifier = Modifier,
-    onMatchClicked: (String) -> Unit = {},
+    onMatchClicked: (Match.Id) -> Unit = {},
     onEventClicked: (Event.Id) -> Unit = {},
 ) {
     Box(
@@ -50,7 +51,7 @@ fun FeedContent(
 @Composable
 private fun SuccessContent(
     viewState: FeedViewState,
-    onMatchClicked: (String) -> Unit,
+    onMatchClicked: (Match.Id) -> Unit,
     onEventClicked: (Event.Id) -> Unit,
 ) {
     LazyColumn(
@@ -112,7 +113,7 @@ private fun FeedSectionTitle(
 @Composable
 private fun RecentMatchesSection(
     recentMatches: List<MatchDetailDisplayModel>,
-    onMatchClicked: (String) -> Unit,
+    onMatchClicked: (Match.Id) -> Unit,
 ) {
     if (recentMatches.isNotEmpty()) {
         MatchCarousel(

core/displaymodels/src/commonMain/kotlin/com/adammcneilly/pocketleague/core/displaymodels/MatchDetailDisplayModel.kt

@@ -13,7 +13,7 @@ private const val MATCH_TIME_FORMAT = "HH:mm"
  * User friendly presentation of detailed info about a match between two teams.
  */
 data class MatchDetailDisplayModel(
-    val matchId: String,
+    val matchId: Match.Id,
     val localDate: String,
     val localTime: String,
     val eventName: String,
@@ -28,7 +28,7 @@ data class MatchDetailDisplayModel(
 
     companion object {
         val placeholder = MatchDetailDisplayModel(
-            matchId = "",
+            matchId = Match.Id(""),
             localDate = "",
             localTime = "",
             eventName = "",

core/models-test/src/commonMain/kotlin/com/adammcneilly/pocketleague/core/models/test/TestMatch.kt

@@ -5,7 +5,7 @@ import com.adammcneilly.pocketleague.core.models.StageRound
 
 val TestModel.matchBlueWinner: Match
     get() = Match(
-        id = "1234",
+        id = Match.Id("1234"),
         event = TestModel.event,
         dateUTC = null,
         blueTeam = TestModel.matchTeamResultWinner,

core/models/src/commonMain/kotlin/com/adammcneilly/pocketleague/core/models/Match.kt

@@ -1,11 +1,13 @@
 package com.adammcneilly.pocketleague.core.models
 
+import kotlin.jvm.JvmInline
+
 /**
  * A [Match] is any competition between two teams. Could be a single game, a series,
  * or even a best of set.
  */
 data class Match(
-    val id: String,
+    val id: Id,
     val event: Event,
     val dateUTC: String?,
     val blueTeam: MatchTeamResult,
@@ -14,4 +16,14 @@ data class Match(
     val format: Format,
     val gameOverviews: List<GameOverview>,
     val round: StageRound,
-)
+) {
+
+    /**
+     * This value class ensures we can have type safety anywhere we plan to use a
+     * string identifier for a match.
+     */
+    @JvmInline
+    value class Id(
+        val id: String,
+    )
+}

data/game/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/game/MatchGamesRequest.kt

@@ -1,8 +1,10 @@
 package com.adammcneilly.pocketleague.data.game
 
+import com.adammcneilly.pocketleague.core.models.Match
+
 /**
  * Used to request a list of games for the given [matchId].
  */
 data class MatchGamesRequest(
-    val matchId: String,
+    val matchId: Match.Id,
 )

data/local-sqldelight/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/local/sqldelight/mappers/LocalMatchMappers.kt

@@ -5,9 +5,9 @@ import com.adammcneilly.pocketleague.sqldelight.LocalMatch
 
 fun Match.toLocalMatch(): LocalMatch {
     return LocalMatch(
-        id = this.id,
+        id = this.id.id,
         dateUTC = this.dateUTC,
-        eventId = this.event.id,
+        eventId = this.event.id.id,
         blueTeamId = this.blueTeam.team.id,
         orangeTeamId = this.orangeTeam.team.id,
         blueTeamGameWins = this.blueTeam.score.toLong(),

data/local-sqldelight/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/local/sqldelight/mappers/MatchWithEventAndTeamsMapper.kt

@@ -21,7 +21,7 @@ fun MatchWithEventAndTeams.toMatch(): Match {
     val orangeTeamWinner = orangeTeamGameWins > blueTeamGameWins
 
     return Match(
-        id = this.localMatchId,
+        id = Match.Id(this.localMatchId),
         event = mapEvent(),
         dateUTC = this.localMatchDateUTC,
         blueTeam = mapBlueTeamResult(blueTeamGameWins, blueTeamWinner),

data/match-test/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/test/FakeMatchRepository.kt

@@ -12,7 +12,7 @@ class FakeMatchRepository : MatchRepository {
 
     lateinit var upcomingMatches: List<Match>
 
-    override fun getMatchDetail(matchId: String): Flow<Match> {
+    override fun getMatchDetail(matchId: Match.Id): Flow<Match> {
         return flowOf(matchDetailsById[matchId]!!)
     }
 

data/match-test/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/test/FakeMatchService.kt

@@ -18,7 +18,7 @@ class FakeMatchService : MatchService {
     )
 
     override suspend fun fetchMatchDetail(
-        matchId: String,
+        matchId: Match.Id,
     ): Result<Match> {
         return matchDetailResponse
     }

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/LocalMatchService.kt

@@ -13,7 +13,7 @@ interface LocalMatchService {
      * Fetches detailed information about a [Match] using the supplied [matchId].
      */
     fun getMatchDetail(
-        matchId: String,
+        matchId: Match.Id,
     ): Flow<Match>
 
     /**

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/MatchRepository.kt

@@ -13,7 +13,7 @@ interface MatchRepository {
      * Fetches detailed information about a [Match] using the supplied [matchId].
      */
     fun getMatchDetail(
-        matchId: String,
+        matchId: Match.Id,
     ): Flow<Match>
 
     /**

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/MatchService.kt

@@ -13,7 +13,7 @@ interface MatchService {
      * Fetches detailed information about a [Match] using the supplied [matchId].
      */
     suspend fun fetchMatchDetail(
-        matchId: String,
+        matchId: Match.Id,
     ): Result<Match>
 
     /**

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/OctaneGGMatchService.kt

@@ -22,7 +22,7 @@ class OctaneGGMatchService(
 
     constructor() : this(OctaneGGAPIClient, defaultClock())
 
-    override suspend fun getMatchDetail(matchId: String): Result<Match> {
+    override suspend fun getMatchDetail(matchId: Match.Id): Result<Match> {
         return apiClient.getResponse<OctaneGGMatch>(
             endpoint = "$MATCHES_ENDPOINT/$matchId",
         ).map { octaneMatch ->

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/OfflineFirstMatchRepository.kt

@@ -17,15 +17,15 @@ class OfflineFirstMatchRepository(
     private val remoteDataSource: RemoteMatchService,
 ) : MatchRepository {
 
-    override fun getMatchDetail(matchId: String): Flow<Match> {
+    override fun getMatchDetail(matchId: Match.Id): Flow<Match> {
         return localDataSource
             .getMatchDetail(matchId)
             .onStart {
                 fetchAndPersistMatchDetail(matchId)
             }
     }
 
-    private suspend fun fetchAndPersistMatchDetail(matchId: String) {
+    private suspend fun fetchAndPersistMatchDetail(matchId: Match.Id) {
         val remoteResponse = remoteDataSource.getMatchDetail(matchId)
 
         remoteResponse.fold(

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/RemoteMatchService.kt

@@ -12,7 +12,7 @@ interface RemoteMatchService {
      * Fetches detailed information about a [Match] using the supplied [matchId].
      */
     suspend fun getMatchDetail(
-        matchId: String,
+        matchId: Match.Id,
     ): Result<Match>
 
     /**

data/match/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/match/SQLDelightMatchService.kt

@@ -21,10 +21,10 @@ class SQLDelightMatchService(
     private val database: PocketLeagueDB,
 ) : LocalMatchService {
 
-    override fun getMatchDetail(matchId: String): Flow<Match> {
+    override fun getMatchDetail(matchId: Match.Id): Flow<Match> {
         return database
             .localMatchQueries
-            .selectById(matchId)
+            .selectById(matchId.id)
             .asFlowSingle(MatchWithEventAndTeams::toMatch)
     }
 

data/octanegg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/octanegg/models/OctaneGGMatch.kt

@@ -35,7 +35,7 @@ data class OctaneGGMatch(
  */
 fun OctaneGGMatch.toMatch(): Match {
     return Match(
-        id = this.id.orEmpty(),
+        id = Match.Id(this.id.orEmpty()),
         event = this.event.toEvent(),
         dateUTC = this.dateUTC,
         blueTeam = this.blue.toMatchTeamResult(),

data/startgg/src/commonMain/kotlin/com/adammcneilly/pocketleague/data/startgg/mappers/SetFragmentMapper.kt

@@ -30,7 +30,7 @@ fun SetFragment.toMatch(): Match {
     val blueTeamWins = this.games?.size?.minus(orangeTeamWins) ?: 0
 
     return Match(
-        id = this.id.orEmpty(),
+        id = Match.Id(this.id.orEmpty()),
         event = this.event?.tournament?.tournamentFragment?.toEvent()!!,
         dateUTC = startDateUTC,
         blueTeam = blueSlot.toMatchTeamResult(

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/feed/FeedPresenter.kt

@@ -87,7 +87,7 @@ class FeedPresenter(
                 }
 
                 is FeedScreen.Event.MatchClicked -> {
-                    navigator.goTo(MatchDetailScreen(event.matchId))
+                    navigator.goTo(MatchDetailScreen(event.matchId.id))
                 }
             }
         }

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/feed/FeedScreen.kt

@@ -3,6 +3,7 @@ package com.adammcneilly.pocketleague.shared.app.feed
 import com.adammcneilly.pocketleague.core.displaymodels.EventGroupDisplayModel
 import com.adammcneilly.pocketleague.core.displaymodels.MatchDetailDisplayModel
 import com.adammcneilly.pocketleague.core.models.Event
+import com.adammcneilly.pocketleague.core.models.Match
 import com.adammcneilly.pocketleague.shared.app.CommonParcelize
 import com.adammcneilly.pocketleague.shared.ui.feed.FeedContent
 import com.slack.circuit.runtime.CircuitContext
@@ -46,7 +47,7 @@ object FeedScreen : Screen {
          * User tapped on a match item.
          */
         data class MatchClicked(
-            val matchId: String,
+            val matchId: Match.Id,
         ) : Event
     }
 

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/match/MatchDetailPresenter.kt

@@ -10,6 +10,7 @@ import com.adammcneilly.pocketleague.core.displaymodels.GameDetailDisplayModel
 import com.adammcneilly.pocketleague.core.displaymodels.MatchDetailDisplayModel
 import com.adammcneilly.pocketleague.core.displaymodels.toDetailDisplayModel
 import com.adammcneilly.pocketleague.core.models.Game
+import com.adammcneilly.pocketleague.core.models.Match
 import com.adammcneilly.pocketleague.data.game.MatchGamesRequest
 import com.adammcneilly.pocketleague.data.game.OctaneGGGameService
 import com.adammcneilly.pocketleague.data.match.OctaneGGMatchService
@@ -19,7 +20,7 @@ import com.slack.circuit.runtime.presenter.Presenter
  * State management container for the [MatchDetailScreen].
  */
 class MatchDetailPresenter(
-    private val matchId: String,
+    private val matchId: Match.Id,
 ) : Presenter<MatchDetailScreen.State> {
 
     @Composable

shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/match/MatchDetailScreen.kt

@@ -2,6 +2,7 @@ package com.adammcneilly.pocketleague.shared.app.match
 
 import com.adammcneilly.pocketleague.core.displaymodels.GameDetailDisplayModel
 import com.adammcneilly.pocketleague.core.displaymodels.MatchDetailDisplayModel
+import com.adammcneilly.pocketleague.core.models.Match
 import com.adammcneilly.pocketleague.shared.app.CommonParcelize
 import com.adammcneilly.pocketleague.shared.ui.match.MatchDetailContent
 import com.slack.circuit.runtime.CircuitContext
@@ -15,6 +16,8 @@ import com.slack.circuit.runtime.ui.ui
 
 /**
  * Shows detailed match information for a match with a given [matchId].
+ *
+ * Need to use a string until we can upgrade Kotlin: https://stackoverflow.com/a/75857372/3131147
  */
 @CommonParcelize
 data class MatchDetailScreen(
@@ -83,7 +86,7 @@ data class MatchDetailScreen(
         override fun create(screen: Screen, navigator: Navigator, context: CircuitContext): Presenter<*>? {
             return when (screen) {
                 is MatchDetailScreen -> MatchDetailPresenter(
-                    matchId = screen.matchId,
+                    matchId = Match.Id(screen.matchId),
                 )
 
                 else -> null

shared/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/screens/matchdetail/LoadMatchDetailEvent.kt

@@ -2,6 +2,7 @@ package com.adammcneilly.pocketleague.shared.screens.matchdetail
 
 import com.adammcneilly.pocketleague.core.displaymodels.toDetailDisplayModel
 import com.adammcneilly.pocketleague.core.models.Game
+import com.adammcneilly.pocketleague.core.models.Match
 import com.adammcneilly.pocketleague.data.game.MatchGamesRequest
 import com.adammcneilly.pocketleague.shared.screens.Events
 import kotlinx.coroutines.CoroutineScope
@@ -11,13 +12,13 @@ import kotlinx.coroutines.flow.onEach
 /**
  * Requests the games for the given [matchId].
  */
-fun Events.loadMatchDetail(matchId: String) = screenCoroutine {
+fun Events.loadMatchDetail(matchId: Match.Id) = screenCoroutine {
     fetchMatchDetail(matchId, it)
 
     fetchGames(matchId)
 }
 
-private suspend fun Events.fetchGames(matchId: String) {
+private suspend fun Events.fetchGames(matchId: Match.Id) {
     val repoResult = appModule
         .dataModule
         .gameService
@@ -31,7 +32,7 @@ private suspend fun Events.fetchGames(matchId: String) {
 }
 
 private fun Events.fetchMatchDetail(
-    matchId: String,
+    matchId: Match.Id,
     scope: CoroutineScope,
 ) {
     appModule

shared/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/screens/matchdetail/MatchDetailParams.kt

@@ -1,12 +1,13 @@
 package com.adammcneilly.pocketleague.shared.screens.matchdetail
 
 import com.adammcneilly.pocketleague.core.feature.ScreenParams
+import com.adammcneilly.pocketleague.core.models.Match
 
 /**
  * Parameters that will be passed into the match detail screen.
  *
  * @property[matchId] The identifier of the match to request details for.
  */
 data class MatchDetailParams(
-    val matchId: String,
+    val matchId: Match.Id,
 ) : ScreenParams

shared/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/screens/matchdetail/MatchDetailViewState.kt

@@ -9,7 +9,7 @@ import com.adammcneilly.pocketleague.core.models.Match
  * The UI state for detailed information about a [Match].
  */
 data class MatchDetailViewState(
-    val matchId: String = "",
+    val matchId: Match.Id = Match.Id(""),
     val matchDetail: MatchDetailDisplayModel? = null,
     val games: List<GameDetailDisplayModel> = emptyList(),
 ) : ScreenState {

shared/ui/build.gradle.kts

@@ -12,6 +12,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(project(":core:displaymodels"))
+                implementation(project(":core:models"))
                 implementation(project(":shared:design-system"))
                 implementation(compose.foundation)
                 implementation(compose.material3)