Merge pull request #670 from pennlabs/davidcfu/agh-booking

AGH Booking Support

Author: Divak2004

.github/workflows/android-workflow.yaml

@@ -141,7 +141,7 @@ jobs:
 
       # Run JaCoCo, generate Test Report
       - name: Check Code Coverage
-        run: ./gradlew jacocoTestReport --stacktrace
+        run: ./gradlew testDebugUnitTest jacocoTestReport --stacktrace
 
       # Upload reports to GitHub Actions
       - name: Upload Reports

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java

@@ -153,6 +153,7 @@ public List<GSRLocation> deserialize(JsonElement je, Type type, JsonDeserializat
                 location.gid = jsonLocation.get("gid").getAsInt();
                 location.name = jsonLocation.get("name").getAsString();
                 location.kind = jsonLocation.get("kind").getAsString();
+                location.bookableDays = jsonLocation.get("bookable_days").getAsInt();
                 locations.add(location);
             }
             return locations;

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.kt

@@ -187,7 +187,12 @@ interface StudentLife {
     ): Observable<DiningHall?>
 
     @GET("gsr/locations")
-    fun location(): Observable<List<GSRLocation?>?>
+    fun locationUnfiltered(): Observable<List<GSRLocation?>?>
+
+    @GET("gsr/user-locations")
+    fun location(
+        @Header("Authorization") bearerToken: String?,
+    ): Observable<List<GSRLocation?>?>
 
     @GET("events/fling")
     fun getFlingEvents(): Observable<List<FlingEvent?>?>

PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRLocation.kt

@@ -27,4 +27,9 @@ class GSRLocation {
     @Expose
     @JvmField
     var kind: String? = null
+
+    @SerializedName("bookable_days")
+    @Expose
+    @JvmField
+    var bookableDays: Int = 7
 }