Refactored to new backend schema

Author: melissavelasquezz

app/src/main/graphql/User.graphql

@@ -11,6 +11,9 @@ fragment userFields on User {
     lastGoalChange
     lastStreak
     totalGymDays
+    workoutHistory {
+        ...workoutFields
+    }
 }
 
 fragment workoutFields on Workout {
@@ -43,14 +46,14 @@ query getUserByNetId($netId: String!) {
     }
 }
 
-mutation SetWorkoutGoals($id: Int!, $workoutGoal: Int!) {
-    setWorkoutGoals(userId: $id, workoutGoal: $workoutGoal) {
+mutation SetWorkoutGoals($userId: Int!, $workoutGoal: Int!) {
+    setWorkoutGoals(userId: $userId, workoutGoal: $workoutGoal) {
         ...userFields
     }
 }
 
-mutation LogWorkout($facilityId: Int!, $workoutTime: DateTime!, $id: Int!) {
-    logWorkout(facilityId: $facilityId, userId: $id, workoutTime: $workoutTime) {
+mutation LogWorkout($facilityId: Int!, $workoutTime: DateTime!, $userId: Int!) {
+    logWorkout(facilityId: $facilityId, userId: $userId, workoutTime: $workoutTime) {
         ...workoutFields
     }
 }

app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt

@@ -4,12 +4,9 @@ import android.util.Log
 import com.apollographql.apollo.ApolloClient
 import com.cornellappdev.uplift.GetUserByNetIdQuery
 import com.cornellappdev.uplift.GetWeeklyWorkoutDaysQuery
-import com.cornellappdev.uplift.GetWorkoutsByIdQuery
 import com.cornellappdev.uplift.SetWorkoutGoalsMutation
 import com.cornellappdev.uplift.data.models.ProfileData
 import com.cornellappdev.uplift.data.models.WorkoutDomain
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -39,51 +36,36 @@ class ProfileRepository @Inject constructor(
         val userId = user.id.toIntOrNull()
             ?: throw IllegalStateException("Invalid user ID: ${user.id}")
 
-        coroutineScope {
-            val workoutDeferred = async {
-                apolloClient.query(GetWorkoutsByIdQuery(userId)).execute()
-            }
-            val weeklyDeferred = async {
-                apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
-            }
-
-            val workoutResponse = workoutDeferred.await()
-            if (workoutResponse.hasErrors()) {
-                Log.e("ProfileRepo", "Workout query errors: ${workoutResponse.errors}")
-                throw IllegalStateException("Workout query failed")
-            }
-
-            val workouts = workoutResponse.data?.getWorkoutsById?.filterNotNull().orEmpty()
-
-            val workoutDomain = workouts.map {
-                WorkoutDomain(
-                    gymName = it.workoutFields.gymName,
-                    timestamp = Instant.parse(it.workoutFields.workoutTime.toString())
-                        .toEpochMilli()
-                )
-            }
-
-            val weeklyResponse = weeklyDeferred.await()
-            if (weeklyResponse.hasErrors()) {
-                Log.e("ProfileRepo", "Weekly query errors: ${weeklyResponse.errors}")
-                throw IllegalStateException("Weekly workout days query failed")
-            }
-
-            val weeklyDays = weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull().orEmpty()
-
-            ProfileData(
-                name = user.name,
-                netId = user.netId,
-                encodedImage = user.encodedImage,
-                totalGymDays = user.totalGymDays,
-                activeStreak = user.activeStreak,
-                maxStreak = user.maxStreak,
-                streakStart = user.streakStart?.toString(),
-                workoutGoal = user.workoutGoal ?: 0,
-                workouts = workoutDomain,
-                weeklyWorkoutDays = weeklyDays
+        val weeklyResponse = apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
+
+        if (weeklyResponse.hasErrors()) {
+            throw IllegalStateException("Weekly workout days query failed: ${weeklyResponse.errors}")
+        }
+
+        val workouts = user.workoutHistory?.filterNotNull().orEmpty()
+
+        val workoutDomain = workouts.map {
+            WorkoutDomain(
+                gymName = it.workoutFields.gymName,
+                timestamp = Instant.parse(it.workoutFields.workoutTime.toString())
+                    .toEpochMilli()
             )
         }
+
+        val weeklyDays = weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull().orEmpty()
+
+        ProfileData(
+            name = user.name,
+            netId = user.netId,
+            encodedImage = user.encodedImage,
+            totalGymDays = user.totalGymDays,
+            activeStreak = user.activeStreak,
+            maxStreak = user.maxStreak,
+            streakStart = user.streakStart?.toString(),
+            workoutGoal = user.workoutGoal ?: 0,
+            workouts = workoutDomain,
+            weeklyWorkoutDays = weeklyDays
+        )
     }.onFailure { e ->
         Log.e("ProfileRepo", "Failed to load profile", e)
     }
@@ -95,7 +77,7 @@ class ProfileRepository @Inject constructor(
         val response = apolloClient
             .mutation(
                 SetWorkoutGoalsMutation(
-                    id = userId,
+                    userId = userId,
                     workoutGoal = goal
                 )
             )

app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt

@@ -79,7 +79,6 @@ class ProfileViewModel @Inject constructor(
                 time = formatTime.format(workoutInstant),
                 date = formatDate.format(workoutInstant),
                 timestamp = it.timestamp,
-                dayOfWeek = formatDayOfWeek.format(workoutInstant),
                 ago = calendar.timeAgoString()
             )
         }