Fix fitness settings

pennlabs · Mar 19, 2024 · 3383341 · 3383341
1 parent 3cc8e59
commit 3383341
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt
@@ -107,8 +107,9 @@ class PottruckFragment : Fragment() {
                             "Bearer " + sp.getString(context.getString(R.string.access_token), "")
                                 .toString()
 
-                        mStudentLife.getFitnessPreferences(bearerToken).subscribe({ favorites ->
+                        mStudentLife.getFitnessPreferences(bearerToken).subscribe({ preferences ->
                             mActivity.runOnUiThread {
+                                val favorites = preferences.rooms!!
                                 for (roomId in favorites) {
                                     dataModel.addId(roomId)
                                 }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.kt
@@ -5,6 +5,7 @@ import com.pennapps.labs.pennmobile.classes.CalendarEvent
 import com.pennapps.labs.pennmobile.classes.DiningHall
 import com.pennapps.labs.pennmobile.classes.DiningPreferences
 import com.pennapps.labs.pennmobile.classes.DiningRequest
+import com.pennapps.labs.pennmobile.classes.FitnessPreferences
 import com.pennapps.labs.pennmobile.classes.FitnessRequest
 import com.pennapps.labs.pennmobile.classes.FitnessRoom
 import com.pennapps.labs.pennmobile.classes.FitnessRoomUsage
@@ -165,7 +166,7 @@ interface StudentLife {
     ): Observable<FitnessRoomUsage>
 
     @GET("penndata/fitness/preferences")
-    fun getFitnessPreferences(@Header("Authorization") bearerToken: String): Observable<List<Int>>
+    fun getFitnessPreferences(@Header("Authorization") bearerToken: String): Observable<FitnessPreferences>
 
     @POST("penndata/fitness/preferences/")
     fun sendFitnessPref(

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferences.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferences.kt
@@ -0,0 +1,10 @@
+package com.pennapps.labs.pennmobile.classes
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class FitnessPreferences {
+    @SerializedName("rooms")
+    @Expose
+    val rooms: List<Int>? = null
+}