Fixed BaseBall Scoring and IsLive (#102)

* git issue fix

* advanced fitler first iteration

* center icon

* google-services.json

* fix scrollable

* pagination

* changes for baseball scores

* Delete app/src/google-services.json

Author: EmilJiang

app/build.gradle.kts

@@ -11,7 +11,7 @@ if (secretsPropertiesFile.exists()) {
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsKotlinAndroid) version "1.9.10"
-    alias(libs.plugins.apollo)
+    id("com.apollographql.apollo") version "4.0.0"
     id("kotlin-kapt")
     id("com.google.dagger.hilt.android")
     id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" // this version matches your Kotlin version
@@ -97,7 +97,7 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
-    implementation(libs.apollo.runtime)
+    implementation("com.apollographql.apollo:apollo-runtime:4.0.0")
     implementation("io.coil-kt.coil3:coil-compose:3.1.0")
     implementation("io.coil-kt.coil3:coil-network-okhttp:3.1.0")
     lintChecks(libs.compose.lint.checks)

app/src/main/graphql/Games.graphql

@@ -2,6 +2,7 @@ query Games{
     games{
         id
         date
+        time
         city
         sport
         team{

app/src/main/java/com/cornellappdev/score/model/Game.kt

@@ -20,6 +20,7 @@ data class Game(
     val id: String,
     val teamName: String,
     val teamLogo: String,
+    val time: String?,
     val teamColor: Color,
     val gender: String,
     val sport: String,
@@ -146,7 +147,7 @@ data class TeamScore(
 // Aggregated game data showing scores for both teams
 data class GameData(
     val teamScores: Pair<TeamScore, TeamScore>
-){
+) {
     val maxPeriods: Int
         get() =
             maxOf(
@@ -250,7 +251,11 @@ fun Game.toGameCardData(): GameCardData {
         date = parseDateOrNull(date),
         dateString = parseDateOrNull(date)?.format(outputFormatter)
             ?: date,
-        isLive = (LocalDate.now() == parseDateOrNull(date)),
+        isLive = parseDateTimeOrNull(date, time ?: "")?.let { startTime ->
+            val now = LocalDateTime.now()
+            val endTime = startTime.plusHours(2)
+            now.isAfter(startTime) && now.isBefore(endTime)
+        } ?: false,
         isPast = isPast,
         location = city,
         gender = gender,
@@ -290,14 +295,15 @@ fun GameDetailsGame.toGameCardData(): DetailsCardData {
             scoreBreakdown = scoreBreakdown,
             team1 = TeamBoxScore("Cornell"),
             team2 = TeamBoxScore(team?.name ?: ""),
-            sport = sport
+            sport = sport,
+            result = result ?: ""
         ),
         scoreEvent = boxScore?.toScoreEvents(team?.image ?: "") ?: emptyList(),
         daysUntilGame = daysUntil,
         hoursUntilGame = hoursUntil,
-        homeScore = convertScores(scoreBreakdown?.getOrNull(0), sport).second
+        homeScore = convertScores(scoreBreakdown?.getOrNull(0), sport, result ?: "").second
             ?: parsedScores?.first ?: 0,
-        oppScore = convertScores(scoreBreakdown?.getOrNull(1), sport).second
+        oppScore = convertScores(scoreBreakdown?.getOrNull(1), sport, result ?: "").second
             ?: parsedScores?.second ?: 0
     )
 }

app/src/main/java/com/cornellappdev/score/model/ScoreRepository.kt

@@ -4,6 +4,7 @@ import android.util.Log
 import com.apollographql.apollo.ApolloClient
 import com.cornellappdev.score.util.isValidSport
 import com.cornellappdev.score.util.parseColor
+import com.cornellappdev.score.util.parseResultScore
 import com.example.score.GameByIdQuery
 import com.example.score.GamesQuery
 import com.example.score.PagedGamesQuery
@@ -75,6 +76,7 @@ class ScoreRepository @Inject constructor(
                                     id = game.id ?: "", // Should never be null
                                     teamLogo = it,
                                     teamName = game.team.name,
+                                    time = game.time,
                                     teamColor = parseColor(game.team.color).copy(alpha = 0.4f * 255),
                                     gender = if (game.gender == "Mens") "Men's" else "Women's",
                                     sport = game.sport,
@@ -133,11 +135,15 @@ class ScoreRepository @Inject constructor(
                     .mapNotNull { graphqlGame ->
                         val scores = graphqlGame.result?.split(",")?.getOrNull(1)?.split("-")
                         val cornellScore = scores?.getOrNull(0)?.toNumberOrNull()
-                        val otherScore = scores?.getOrNull(1)?.toNumberOrNull()
+                            ?: parseResultScore(graphqlGame.result)?.first
+                        val otherScore = scores?.getOrNull(1)?.toNumberOrNull() ?: parseResultScore(
+                            graphqlGame.result
+                        )?.second
                         graphqlGame.team?.image?.let { imageUrl ->
                             Game(
                                 id = graphqlGame.id ?: "",
                                 teamLogo = imageUrl,
+                                time = graphqlGame.time,
                                 teamName = graphqlGame.team.name,
                                 teamColor = parseColor(graphqlGame.team.color).copy(alpha = 0.4f * 255),
                                 gender = if (graphqlGame.gender == "Mens") "Men's" else "Women's",
@@ -171,6 +177,7 @@ class ScoreRepository @Inject constructor(
      * `currentGamesFlow` to be observed.
      */
     fun getGameById(id: String) = appScope.launch {
+        Log.d("ScoreRepository", "Fetching game with id: $id")
         _currentGameFlow.value = ApiResponse.Loading
         try {
             val result =
@@ -181,6 +188,7 @@ class ScoreRepository @Inject constructor(
 
             result.getOrNull()?.game?.let {
                 _currentGameFlow.value = ApiResponse.Success(it.toGameDetails())
+
             } ?: _currentGameFlow.update { ApiResponse.Error }
         } catch (e: Exception) {
             Log.e("ScoreRepository", "Error fetching game with id: ${id}: ", e)

app/src/main/java/com/cornellappdev/score/util/GameDataUtil.kt

@@ -1,5 +1,6 @@
 package com.cornellappdev.score.util
 
+import android.util.Log
 import com.cornellappdev.score.model.GameData
 import com.cornellappdev.score.model.TeamBoxScore
 import com.cornellappdev.score.model.TeamScore
@@ -17,7 +18,7 @@ import com.cornellappdev.score.model.TeamScore
  * @return a pair where the first value is a list of parsed period scores and the second is the total score (or null if invalid)
  */
 // TODO: ASK ABOUT OT. Other sports might be added.
-fun convertScores(scoreList: List<String?>?, sport: String): Pair<List<Int>, Int?> {
+fun convertScores(scoreList: List<String?>?, sport: String, result: String): Pair<List<Int>, Int?> {
     if (scoreList == null || scoreList.size < 2) return Pair(emptyList(), null)
 
     var scoresByPeriod = scoreList
@@ -31,7 +32,12 @@ fun convertScores(scoreList: List<String?>?, sport: String): Pair<List<Int>, Int
         }
 
     if (sport.lowercase() == "baseball") {
-        scoresByPeriod = scoresByPeriod.take(9)
+        val scoreParsed = result.split("(")
+        scoresByPeriod = if (scoreParsed.size > 1) {
+            scoresByPeriod.take(6)
+        } else {
+            scoresByPeriod.take(9)
+        }
         val totalScore = scoresByPeriod.sum()
         return Pair(scoresByPeriod, totalScore)
     }
@@ -56,14 +62,15 @@ fun toGameData(
     scoreBreakdown: List<List<String?>?>?,
     team1: TeamBoxScore,
     team2: TeamBoxScore,
-    sport: String
+    sport: String,
+    result: String,
 ): GameData {
     val (team1Scores, team1Total) = scoreBreakdown?.getOrNull(0)?.let {
-        convertScores(it, sport)
+        convertScores(it, sport, result)
     } ?: (emptyList<Int>() to null)
 
     val (team2Scores, team2Total) = scoreBreakdown?.getOrNull(1)?.let {
-        convertScores(it, sport)
+        convertScores(it, sport, result)
     } ?: (emptyList<Int>() to null)
 
     val team1Score =
@@ -90,11 +97,12 @@ fun parseResultScore(result: String?): Pair<Int, Int>? {
     if (parts.size != 2) return null
 
     val scorePart = parts[1].split("-")
+    val secondScorePartEdge = scorePart[1].split("(")
     if (scorePart.size != 2) return null
 
     val homeScore = scorePart[0].toIntOrNull()
-    val oppScore = scorePart[1].toIntOrNull()
-
+    val oppScore = secondScorePartEdge[0].toIntOrNull()
+    Log.d("HIHI", oppScore.toString())
     if (homeScore != null && oppScore != null) {
         return Pair(homeScore, oppScore)
     } else {