Profile Page Implementation

app/build.gradle

@@ -48,8 +48,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField("String", "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"])
             buildConfigField("String", "BACKEND_URL", secretsProperties['PROD_ENDPOINT'])
-            buildConfigField("boolean", "ONBOARDING_FLAG", "false")
-            buildConfigField("boolean", "CHECK_IN_FLAG", "false")
+            buildConfigField("boolean", "ONBOARDING_FLAG", "true")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "true")
         }
         debug {
             buildConfigField("String", "BACKEND_URL", secretsProperties['DEV_ENDPOINT'])
@@ -58,8 +58,8 @@ android {
                     "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"]
             )
             signingConfig signingConfigs.debug
-            buildConfigField("boolean", "ONBOARDING_FLAG", "false")
-            buildConfigField("boolean", "CHECK_IN_FLAG", "false")
+            buildConfigField("boolean", "ONBOARDING_FLAG", "true")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "true")
         }
     }
     compileOptions {

app/src/main/graphql/User.graphql

@@ -1,14 +1,27 @@
 fragment userFields on User {
     id
     email
-    name
     netId
+    name
+    encodedImage
+    activeStreak
+    maxStreak
+    streakStart
+    workoutGoal
+    lastGoalChange
+    lastStreak
+    totalGymDays
+    workoutHistory {
+        ...workoutFields
+    }
 }
 
 fragment workoutFields on Workout {
     id
     workoutTime
     userId
+    facilityId
+    gymName
 }
 
 mutation CreateUser($email: String!, $name: String!, $netId: String!) {
@@ -33,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/graphql/schema.graphqls

@@ -378,9 +378,11 @@ type User {
   totalGymDays: Int!
 
   """
-  The start date of the most recent active streak, up until the current date.
+  The start datetime of the most recent active streak (midnight of the day in local timezone), up until the current date.
   """
-  streakStart: Date
+  streakStart: DateTime
+
+  workoutHistory: [Workout]
 }
 
 type Giveaway {
@@ -421,13 +423,6 @@ type Friendship {
   friend: User
 }
 
-"""
-The `Date` scalar type represents a Date
-value as specified by
-[iso8601](https://en.wikipedia.org/wiki/ISO_8601).
-"""
-scalar Date
-
 type Workout {
   id: ID!
 

app/src/main/java/com/cornellappdev/uplift/data/models/ProfileData.kt

@@ -0,0 +1,17 @@
+package com.cornellappdev.uplift.data.models
+
+import android.net.Uri
+
+
+data class ProfileData(
+    val name: String,
+    val netId: String,
+    val encodedImage: String?,
+    val totalGymDays: Int,
+    val activeStreak: Int,
+    val maxStreak: Int,
+    val streakStart: String?,
+    val workoutGoal: Int,
+    val workouts: List<WorkoutDomain>,
+    val weeklyWorkoutDays: List<String>
+)

app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt

@@ -1,10 +1,17 @@
 package com.cornellappdev.uplift.data.models
 import kotlinx.serialization.Serializable
 
+
 @Serializable
 data class UserInfo(
     val id: String,
     val email: String,
     val name: String,
     val netId: String,
+    val encodedImage: String?,
+    val activeStreak: Int?,
+    val maxStreak: Int?,
+    val streakStart: String?,
+    val workoutGoal: Int?,
+    val totalGymDays: Int
 )

app/src/main/java/com/cornellappdev/uplift/data/models/WorkoutDomain.kt

@@ -0,0 +1,6 @@
+package com.cornellappdev.uplift.data.models
+
+data class WorkoutDomain(
+    val gymName: String,
+    val timestamp: Long
+)

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

@@ -11,6 +11,7 @@ class AuthInterceptor @Inject constructor(
 ) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val token = tokenManager.getAccessToken()
+        android.util.Log.d("AuthInterceptor", "token present = ${token != null}")
         val request = chain.request().newBuilder().apply {
             if (token != null) {
                 addHeader("Authorization", "Bearer $token")

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

@@ -150,12 +150,25 @@ class CheckInRepository @Inject constructor(
      * Logs a completed workout to the backend. Returns true if the mutation succeeded, false otherwise.
      */
     suspend fun logWorkoutFromCheckIn(gymId: Int): Boolean {
-        val userId = userInfoRepository.getUserIdFromDataStore()?.toIntOrNull() ?: return false
+        val userIdString = userInfoRepository.getUserIdFromDataStore()
+        val userId = userIdString?.toIntOrNull()
+
+        if (userId == null) {
+            Log.e("CheckInRepository", "Missing or invalid userId in DataStore: $userIdString")
+            return false
+        }
+
         val time = Instant.now().toString()
 
         return try {
             val response = apolloClient
-                .mutation(LogWorkoutMutation(facilityId = gymId, workoutTime = time, id = userId ))
+                .mutation(
+                    LogWorkoutMutation(
+                        facilityId = gymId,
+                        workoutTime = time,
+                        userId = userId
+                    )
+                )
                 .execute()
 
             val ok = response.data?.logWorkout?.workoutFields != null && !response.hasErrors()

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

@@ -26,7 +26,7 @@ object PreferencesKeys {
     val NETID = stringPreferencesKey("netId")
     val EMAIL = stringPreferencesKey("email")
     val GOAL = intPreferencesKey("workoutGoal")
-    val SKIP = booleanPreferencesKey("skip")
+    val GOAL_SETTING_SKIPPED = booleanPreferencesKey("goalSkip")
     val FCM_TOKEN = stringPreferencesKey("fcmToken")
     val DECLINED_NOTIFICATION_PERMISSION =
         booleanPreferencesKey("declinedNotificationPermission")

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

@@ -0,0 +1,92 @@
+package com.cornellappdev.uplift.data.repositories
+
+import android.util.Log
+import com.apollographql.apollo.ApolloClient
+import com.cornellappdev.uplift.GetUserByNetIdQuery
+import com.cornellappdev.uplift.GetWeeklyWorkoutDaysQuery
+import com.cornellappdev.uplift.SetWorkoutGoalsMutation
+import com.cornellappdev.uplift.data.models.ProfileData
+import com.cornellappdev.uplift.data.models.WorkoutDomain
+import java.time.Instant
+import javax.inject.Inject
+import javax.inject.Singleton
+
+
+@Singleton
+class ProfileRepository @Inject constructor(
+    private val userInfoRepository: UserInfoRepository,
+    private val apolloClient: ApolloClient
+) {
+    suspend fun getProfile(): Result<ProfileData> = runCatching {
+        val netId = userInfoRepository.getNetIdFromDataStore()
+            ?: throw IllegalStateException("NetId missing")
+
+        val userResponse = apolloClient.query(
+            GetUserByNetIdQuery(netId)
+        ).execute()
+
+        if (userResponse.hasErrors()) {
+            Log.e("ProfileRepo", "User query errors: ${userResponse.errors}")
+            throw IllegalStateException("User query failed")
+        }
+
+        val user = userResponse.data?.getUserByNetId?.firstOrNull()?.userFields
+            ?: throw IllegalStateException("User not found")
+
+        val userId = user.id.toIntOrNull()
+            ?: throw IllegalStateException("Invalid user ID: ${user.id}")
+
+        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)
+    }
+
+    suspend fun setWorkoutGoal(goal: Int): Result<Unit> = runCatching {
+        val userId = userInfoRepository.getUserIdFromDataStore()?.toIntOrNull()
+            ?: throw IllegalStateException("Missing user ID")
+
+        val response = apolloClient
+            .mutation(
+                SetWorkoutGoalsMutation(
+                    userId = userId,
+                    workoutGoal = goal
+                )
+            )
+            .execute()
+
+        if (response.hasErrors()) {
+            throw IllegalStateException("Goal update failed")
+        }
+    }.onFailure { e ->
+        Log.e("ProfileRepo", "Failed to update workout goal", e)
+    }
+}