Only show matches with at least 1 ranked team

Author: ricknout

match/src/main/kotlin/dev/ricknout/rugbyranker/match/data/MatchDataConverter.kt

@@ -69,7 +69,9 @@ object MatchDataConverter {
             eventEndTimeLabel = event?.end?.label,
             eventEndTimeMillis = event?.end?.millis,
             eventEndTimeGmtOffset = event?.end?.gmtOffset?.toInt(),
-            predictable = teamIds.containsAll(listOf(firstTeam.id, secondTeam.id)),
+            numberOfRankedTeams = teamIds.count { teamId ->
+                teamId == firstTeam.id || teamId == secondTeam.id
+            },
             half = getHalfFromResponse(content),
             minute = null,
         )

match/src/main/kotlin/dev/ricknout/rugbyranker/match/data/MatchRepository.kt

@@ -65,22 +65,24 @@ class MatchRepository(
         return try {
             val response = service.getMatches(sports, states, startDate, endDate, sort, page, pageSize)
             val teamIds = dao.loadTeamIds(sport)
-            val matches = MatchDataConverter.getMatchesFromResponse(response, sport, teamIds).map { match ->
-                when (match.status) {
-                    Status.LIVE -> {
-                        val summaryResponse = service.getMatchSummary(match.id)
-                        val minute = MatchDataConverter.getMinuteFromResponse(summaryResponse)
-                        match.copy(minute = minute)
+            val matches = MatchDataConverter.getMatchesFromResponse(response, sport, teamIds)
+                .filter { match -> match.displayable }
+                .map { match ->
+                    when (match.status) {
+                        Status.LIVE -> {
+                            val summaryResponse = service.getMatchSummary(match.id)
+                            val minute = MatchDataConverter.getMinuteFromResponse(summaryResponse)
+                            match.copy(minute = minute)
+                        }
+                        else -> match
+                    }
+                }.run {
+                    if (sort == WorldRugbyService.SORT_ASC) {
+                        sortedBy { match -> match.timeMillis }
+                    } else {
+                        sortedByDescending { match -> match.timeMillis }
                     }
-                    else -> match
-                }
-            }.run {
-                if (sort == WorldRugbyService.SORT_ASC) {
-                    sortedBy { match -> match.timeMillis }
-                } else {
-                    sortedByDescending { match -> match.timeMillis }
                 }
-            }
             true to matches
         } catch (e: Exception) {
             Log.e(TAG, e.toString())
@@ -96,7 +98,7 @@ class MatchRepository(
             val response = service.getMatchSummary(id)
             val teamIds = dao.loadTeamIds(sport)
             val match = MatchDataConverter.getMatchFromResponse(response, sport, teamIds)
-            true to match
+            match.displayable to match
         } catch (e: Exception) {
             Log.e(TAG, e.toString())
             false to null

match/src/main/kotlin/dev/ricknout/rugbyranker/match/model/Match.kt

@@ -34,10 +34,14 @@ data class Match(
     val eventEndTimeLabel: String?,
     val eventEndTimeMillis: Long?,
     val eventEndTimeGmtOffset: Int?,
-    val predictable: Boolean,
+    val numberOfRankedTeams: Int,
     val half: Half?,
     val minute: Int?,
 ) {
+    val displayable: Boolean
+        get() = numberOfRankedTeams >= 1
+    val predictable: Boolean
+        get() = numberOfRankedTeams == 2
 
     fun toPrediction(): Prediction {
         val switched = secondTeamName == venueCountry