Show minute in live matches

Author: ricknout

Diff for: core/src/main/java/com/ricknout/rugbyranker/core/api/WorldRugbyResponses.kt

@@ -41,6 +41,11 @@ data class Venue(
     val country: String
 )
 
+data class Clock(
+    val secs: Int,
+    val label: String
+)
+
 data class Event(
     val id: Long,
     val label: String,
@@ -59,6 +64,7 @@ data class Match(
     val teams: List<Team>,
     val scores: List<Int>,
     val status: String,
+    val clock: Clock?,
     val events: List<Event>
 )
 
@@ -67,6 +73,10 @@ data class WorldRugbyMatchesResponse(
     val content: List<Match>
 )
 
+data class WorldRugbyMatchSummaryResponse(
+    val match: Match
+)
+
 data class TeamDetail(
     val id: Long,
     val country: String,

Diff for: core/src/main/java/com/ricknout/rugbyranker/core/api/WorldRugbyService.kt

@@ -23,6 +23,11 @@ interface WorldRugbyService {
         @Query("pageSize") pageSize: Int
     ): WorldRugbyMatchesResponse
 
+    @GET("rugby/match/{id}/summary")
+    suspend fun getMatchSummary(
+        @Path("id") id: Long
+    ): WorldRugbyMatchSummaryResponse
+
     @GET("rugby/team/{id}")
     suspend fun getTeams(
         @Path("id") id: Long

Diff for: core/src/main/java/com/ricknout/rugbyranker/core/util/DateUtils.kt

@@ -56,4 +56,5 @@ object DateUtils {
     const val DAY_MILLIS = 1000L * 60L * 60L * 24L
     const val HOUR_MILLIS = 1000L * 60L * 60L
     const val MINUTE_MILLIS = 1000L * 60L
+    const val MINUTE_SECS = 60
 }

Diff for: matches/src/main/java/com/ricknout/rugbyranker/matches/repository/MatchesRepository.kt

@@ -40,7 +40,8 @@ class MatchesRepository(
         matchStatus: MatchStatus,
         cache: Boolean = true,
         pageSize: Int = PAGE_SIZE_WORLD_RUGBY_MATCHES_NETWORK,
-        fetchMultiplePages: Boolean = true
+        fetchMultiplePages: Boolean = true,
+        fetchMinutes: Boolean = false
     ): Pair<Boolean, List<WorldRugbyMatch>> {
         val sports = when (sport) {
             Sport.MENS -> WorldRugbyService.SPORT_MENS
@@ -74,7 +75,15 @@ class MatchesRepository(
         return try {
             while (page < pageCount) {
                 val worldRugbyMatchesResponse = worldRugbyService.getMatches(sports, states, startDate, endDate, sort, page, pageSize)
-                val matches = MatchesDataConverter.getWorldRugbyMatchesFromWorldRugbyMatchesResponse(worldRugbyMatchesResponse, sport)
+                val matches = MatchesDataConverter.getWorldRugbyMatchesFromWorldRugbyMatchesResponse(worldRugbyMatchesResponse, sport).map { match ->
+                    if (fetchMinutes) {
+                        val worldRugbyMatchSummaryResponse = worldRugbyService.getMatchSummary(match.matchId)
+                        val minute = MatchesDataConverter.getMinuteFromWorldRugbyMatchSummaryResponse(worldRugbyMatchSummaryResponse)
+                        match.copy(minute = minute)
+                    } else {
+                        match
+                    }
+                }
                 if (cache) worldRugbyMatchDao.insert(matches)
                 page++
                 pageCount = if (fetchMultiplePages && !initialMatchesFetched) worldRugbyMatchesResponse.pageInfo.numPages else 1
@@ -92,7 +101,8 @@ class MatchesRepository(
         if (matchStatus == MatchStatus.LIVE) throw IllegalArgumentException("Cannot handle MatchStatus type $matchStatus in fetchAndCacheLatestWorldRugbyMatchesSync")
         coroutineScope.launch {
             val result = withContext(Dispatchers.IO) {
-                fetchAndCacheLatestWorldRugbyMatchesSync(sport, matchStatus, cache = true, pageSize = PAGE_SIZE_WORLD_RUGBY_MATCHES_NETWORK_REFRESH, fetchMultiplePages = false)
+                fetchAndCacheLatestWorldRugbyMatchesSync(
+                        sport, matchStatus, cache = true, pageSize = PAGE_SIZE_WORLD_RUGBY_MATCHES_NETWORK_REFRESH, fetchMultiplePages = false, fetchMinutes = false)
             }
             val success = result.first
             onComplete(success)
@@ -102,7 +112,8 @@ class MatchesRepository(
     fun fetchLatestWorldRugbyMatchesAsync(sport: Sport, matchStatus: MatchStatus, coroutineScope: CoroutineScope, onComplete: (success: Boolean, worldRugbyMatches: List<WorldRugbyMatch>) -> Unit) {
         coroutineScope.launch {
             val result = withContext(Dispatchers.IO) {
-                fetchAndCacheLatestWorldRugbyMatchesSync(sport, matchStatus, cache = false, pageSize = PAGE_SIZE_WORLD_RUGBY_MATCHES_NETWORK_REFRESH, fetchMultiplePages = false)
+                fetchAndCacheLatestWorldRugbyMatchesSync(
+                        sport, matchStatus, cache = false, pageSize = PAGE_SIZE_WORLD_RUGBY_MATCHES_NETWORK_REFRESH, fetchMultiplePages = false, fetchMinutes = true)
             }
             val success = result.first
             val worldRugbyMatches = result.second

Diff for: matches/src/main/java/com/ricknout/rugbyranker/matches/ui/WorldRugbyMatchViewHolder.kt

@@ -35,13 +35,18 @@ class WorldRugbyMatchViewHolder(itemView: View) : RecyclerView.ViewHolder(itemVi
         }
         if (showTime) {
             if (worldRugbyMatch.status == MatchStatus.LIVE) {
+                val minute = worldRugbyMatch.minute
                 val half = when (worldRugbyMatch.half) {
                     MatchHalf.FIRST_HALF -> itemView.context.getString(R.string.text_match_first_half)
                     MatchHalf.SECOND_HALF -> itemView.context.getString(R.string.text_match_second_half)
                     MatchHalf.HALF_TIME -> itemView.context.getString(R.string.text_match_half_time)
                     else -> null
                 }
-                itemView.timeTextView.text = half
+                itemView.timeTextView.text = if (minute != null && half != null) {
+                    itemView.context.getString(R.string.text_match_minute_half, minute, half)
+                } else {
+                    half
+                }
                 itemView.timeTextView.isVisible = true
             } else {
                 val time = DateUtils.getDate(DateUtils.DATE_FORMAT_HH_MM, worldRugbyMatch.timeMillis)

Diff for: matches/src/main/java/com/ricknout/rugbyranker/matches/vo/MatchesDataConverter.kt

@@ -1,8 +1,10 @@
 package com.ricknout.rugbyranker.matches.vo
 
 import com.ricknout.rugbyranker.core.api.Match
+import com.ricknout.rugbyranker.core.api.WorldRugbyMatchSummaryResponse
 import com.ricknout.rugbyranker.core.api.WorldRugbyMatchesResponse
 import com.ricknout.rugbyranker.core.api.WorldRugbyService
+import com.ricknout.rugbyranker.core.util.DateUtils
 import com.ricknout.rugbyranker.core.vo.Sport
 import java.lang.IllegalArgumentException
 
@@ -39,8 +41,10 @@ object MatchesDataConverter {
                     eventStartTimeGmtOffset = match.events.firstOrNull()?.start?.gmtOffset?.toInt(),
                     eventEndTimeLabel = match.events.firstOrNull()?.end?.label,
                     eventEndTimeMillis = match.events.firstOrNull()?.end?.millis,
-                    eventEndTimeGmtOffset = match.events.firstOrNull()?.end?.gmtOffset?.toInt()
-            ).apply { half = getMatchHalfFromMatch(match) }
+                    eventEndTimeGmtOffset = match.events.firstOrNull()?.end?.gmtOffset?.toInt(),
+                    half = getMatchHalfFromMatch(match),
+                    minute = null
+            )
         }
     }
 
@@ -61,4 +65,12 @@ object MatchesDataConverter {
             else -> null
         }
     }
+
+    fun getMinuteFromWorldRugbyMatchSummaryResponse(worldRugbyMatchSummaryResponse: WorldRugbyMatchSummaryResponse): Int? {
+        return if (worldRugbyMatchSummaryResponse.match.clock != null) {
+            worldRugbyMatchSummaryResponse.match.clock!!.secs / DateUtils.MINUTE_SECS
+        } else {
+            null
+        }
+    }
 }

Diff for: matches/src/main/java/com/ricknout/rugbyranker/matches/vo/WorldRugbyMatch.kt

@@ -36,8 +36,50 @@ data class WorldRugbyMatch(
     val eventStartTimeGmtOffset: Int?,
     val eventEndTimeLabel: String?,
     val eventEndTimeMillis: Long?,
-    val eventEndTimeGmtOffset: Int?
-) {
+    val eventEndTimeGmtOffset: Int?,
+    @Ignore
+    val half: MatchHalf?,
     @Ignore
-    var half: MatchHalf? = null
+    val minute: Int?
+) {
+
+    constructor(
+        matchId: Long,
+        description: String?,
+        status: MatchStatus,
+        attendance: Int,
+        firstTeamId: Long,
+        firstTeamName: String,
+        firstTeamAbbreviation: String?,
+        firstTeamScore: Int,
+        secondTeamId: Long,
+        secondTeamName: String,
+        secondTeamAbbreviation: String?,
+        secondTeamScore: Int,
+        timeLabel: String,
+        timeMillis: Long,
+        timeGmtOffset: Int,
+        venueId: Long?,
+        venueName: String?,
+        venueCity: String?,
+        venueCountry: String?,
+        eventId: Long?,
+        eventLabel: String?,
+        eventSport: Sport,
+        eventRankingsWeight: Float?,
+        eventStartTimeLabel: String?,
+        eventStartTimeMillis: Long?,
+        eventStartTimeGmtOffset: Int?,
+        eventEndTimeLabel: String?,
+        eventEndTimeMillis: Long?,
+        eventEndTimeGmtOffset: Int?
+    ) : this(matchId, description, status, attendance,
+            firstTeamId, firstTeamName, firstTeamAbbreviation, firstTeamScore,
+            secondTeamId, secondTeamName, secondTeamAbbreviation, secondTeamScore,
+            timeLabel, timeMillis, timeGmtOffset, venueId, venueName, venueCity, venueCountry,
+            eventId, eventLabel, eventSport, eventRankingsWeight,
+            eventStartTimeLabel, eventStartTimeMillis, eventStartTimeGmtOffset,
+            eventEndTimeLabel, eventEndTimeMillis, eventEndTimeGmtOffset,
+            half = null, minute = null
+    )
 }

Diff for: matches/src/main/res/values/strings.xml

@@ -13,5 +13,6 @@
     <string name="text_match_first_half">1st half</string>
     <string name="text_match_second_half">2nd half</string>
     <string name="text_match_half_time">Half time</string>
+    <string name="text_match_minute_half">%1$02d\' (%2$s)</string>
 
 </resources>