Merge branch 'master' into agh-gsr-booking

darrentweng · darrentweng · commit ccf6791ef66c · 2026-02-14T00:45:30.000-05:00
diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"
diff --git a/backend/gsr_booking/serializers.py b/backend/gsr_booking/serializers.py
@@ -85,8 +85,11 @@ class Meta:
 class GSRShareCodeSerializer(serializers.ModelSerializer):
     status = serializers.SerializerMethodField()
     expires_at = serializers.SerializerMethodField()
-    booking_id = serializers.PrimaryKeyRelatedField(
-        source="booking", queryset=GSRBooking.objects.all(), write_only=True
+    booking_id = serializers.SlugRelatedField(
+        slug_field="booking_id",
+        source="booking",
+        queryset=GSRBooking.objects.all(),
+        write_only=True,
     )
 
     class Meta:
@@ -124,13 +127,34 @@ def create(self, validated_data):
 
 class SharedGSRBookingSerializer(serializers.ModelSerializer):
 
-    building = serializers.CharField(source="gsr.name")
     is_valid = serializers.SerializerMethodField()
+    owner_name = serializers.SerializerMethodField()
+    gsr = GSRSerializer(read_only=True)
 
     class Meta:
         model = GSRBooking
-        fields = ["room_name", "building", "start", "end", "is_valid"]
+        fields = [
+            "booking_id",
+            "gsr",
+            "room_id",
+            "room_name",
+            "start",
+            "end",
+            "is_valid",
+            "owner_name",
+        ]
         read_only_fields = fields
 
+    def get_owner_name(self, obj):
+        user = obj.reservation.creator if obj.reservation else obj.user
+        if not user:
+            return "Unknown"
+
+        full_name = f"{user.first_name} {user.last_name}".strip()
+        if full_name:
+            return full_name
+
+        return user.username
+
     def get_is_valid(self, obj):
         return obj.end and obj.end > timezone.now()
diff --git a/backend/penndata/management/commands/get_calendar.py b/backend/penndata/management/commands/get_calendar.py
@@ -17,9 +17,17 @@ def handle(self, *args, **kwargs):
         # Clears out previous CalendarEvents
         CalendarEvent.objects.all().delete()
 
+        headers = {
+            "User-Agent": (
+                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) "
+                "AppleWebKit/537.36 (KHTML, like Gecko) "
+                "Chrome/143.0.0.0 Safari/537.36"
+            )
+        }
+
         # Scrapes UPenn Almanac
         try:
-            resp = requests.get(UPENN_ALMANAC_WEBSITE)
+            resp = requests.get(UPENN_ALMANAC_WEBSITE, headers=headers)
         except ConnectionError:
             return None
 
diff --git a/backend/penndata/management/commands/get_fitness_snapshot.py b/backend/penndata/management/commands/get_fitness_snapshot.py
@@ -1,8 +1,11 @@
+import zoneinfo
+
 import requests
-from bs4 import BeautifulSoup
-from dateutil import parser
+from django.conf import settings
 from django.core.management.base import BaseCommand
-from django.utils import timezone
+from django.db.models import Q
+from django.utils.dateparse import parse_datetime
+from django.utils.timezone import make_aware
 
 from penndata.models import FitnessRoom, FitnessSnapshot
 
@@ -12,77 +15,68 @@ def cap_string(s):
 
 
 def get_usages():
-
-    # count/capacities default to 0 since spreadsheet number appears blank if no one there
-    locations = [
-        "4th Floor Fitness",
-        "3rd Floor Fitness",
-        "2nd Floor Strength",
-        "Basketball Courts",
-        "MPR",
-        "Climbing Wall",
-        "1st Floor Fitness",
-        "Pool-Shallow",
-        "Pool-Deep",
-    ]
-    usages = {location: {"count": 0, "capacity": 0} for location in locations}
-
-    date = timezone.localtime()  # default if can't get date from spreadsheet
-
     try:
         resp = requests.get(
-            (
-                "https://docs.google.com/spreadsheets/u/0/d/e/"
-                "2PACX-1vSX91_MlAjJo5uVLznuy7BFnUgiBOI28oBCReLRKKo76L"
-                "-k8EFgizAYXpIKPBX_c76wC3aztn3BogD4"
-                "/pubhtml/sheet?headers=false&gid=0"
-            )
+            "https://goboardapi.azurewebsites.net/api/FacilityCount/GetCountsByAccount",
+            params={"AccountAPIKey": settings.FITNESS_TOKEN},
         )
+        data = resp.json()
     except ConnectionError:
         return None
-
-    html = resp.content.decode("utf8")
-    soup = BeautifulSoup(html, "html5lib")
-    if not (embedded_spreadsheet := soup.find("tbody")):
+    except requests.exceptions.JSONDecodeError:
         return None
 
-    table_rows = embedded_spreadsheet.findChildren("tr")
-    for i, row in enumerate(table_rows):
-        cells = row.findChildren("td")
-        if i == 0:
-            date = timezone.make_aware(parser.parse(cells[1].getText()))
-        elif (location := cap_string(cells[0].getText())) in usages:
-            try:
-                count = int(cells[1].getText())
-                capacity = float(cells[2].getText().strip("%"))
-                usages[location] = {"count": count, "capacity": capacity}
-            except ValueError:
-                pass
-        else:
-            print(f"Unknown location: {location}")
-    return usages, date
+    def location_aware_datetime(time_str):
+        date = parse_datetime(time_str)
+        timezone = zoneinfo.ZoneInfo("America/New_York")
+        return make_aware(date, timezone=timezone)
+
+    usages = {
+        location["LocationName"]: {
+            "count": location["LastCount"],
+            "capacity": location["TotalCapacity"],
+            "last_updated": location_aware_datetime(location["LastUpdatedDateAndTime"]),
+        }
+        for location in data
+    }
+    return usages
 
 
 class Command(BaseCommand):
-    help = "Captures a new Fitness Snapshot for every Laundry room."
+    help = "Captures a new Fitness Snapshot for every Fitness room."
 
     def handle(self, *args, **kwargs):
-        usage_by_location, date = get_usages()
+        # Don't update locations for which we already have a room with a matching last_updated date.
+        # Fixed the O(n^2) issue by loading everything into memory. Should be fine since there's
+        # not many rooms, and 1 snapshot returned per room
+        all_rooms = FitnessRoom.objects.all()
+        all_room_names = set(room.name for room in all_rooms)
+        query = Q()
+        for room_name, room_usage in get_usages().items():
+            query |= Q(room__name=room_name, date=room_usage["last_updated"])
+        existing_snapshots = FitnessSnapshot.objects.filter(query)
+        existing_room_date_pairs = set(
+            (snapshot.room.name, snapshot.date) for snapshot in existing_snapshots
+        )
 
-        # prevent double creating FitnessSnapshots
-        if FitnessSnapshot.objects.filter(date=date).exists():
-            self.stdout.write("FitnessSnapshots already exist for this date!")
-            return
+        def exists(record):
+            (name, usage) = record
+            if name not in all_room_names:
+                return False
+            if (name, usage["last_updated"]) in existing_room_date_pairs:
+                return False
+            return True
 
+        usage_by_location = filter(exists, get_usages().items())
         FitnessSnapshot.objects.bulk_create(
             [
                 FitnessSnapshot(
                     room=FitnessRoom.objects.get_or_create(name=room_name)[0],
-                    date=date,
+                    date=room_usage["last_updated"],
                     count=room_usage["count"],
                     capacity=room_usage["capacity"],
                 )
-                for room_name, room_usage in usage_by_location.items()
+                for (room_name, room_usage) in usage_by_location
             ]
         )
 
diff --git a/backend/penndata/management/commands/load_fitness_rooms.py b/backend/penndata/management/commands/load_fitness_rooms.py
@@ -6,24 +6,23 @@
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
         fitness_rooms = [
-            "4th Floor Fitness",
-            "3rd Floor Fitness",
-            "2nd Floor Strength",
-            "Basketball Courts",
-            "MPR",
             "Climbing Wall",
+            "Rec Lounge",
             "1st Floor Fitness",
-            "Pool-Shallow",
-            "Pool-Deep",
+            "Court 1",
+            "Court 2",
+            "Court 3",
+            "Multipurpose Room",
+            "2nd Floor Weight Room",
+            "3rd Floor Fitness Room",
+            "4th Floor Fitness Room",
+            "Studio 409",
+            "Sheerr Pool",
         ]
         for room in fitness_rooms:
             obj, _ = FitnessRoom.objects.get_or_create(name=room)
             if obj.image_url == "":
-                s3_image_name = (
-                    room.replace(" ", "_") + (".png" if "2nd" in room else ".jpg")
-                    if "Pool" not in room
-                    else "Pool.jpeg"
-                )
+                s3_image_name = room.replace(" ", "_") + ".jpg"
                 obj.image_url = (
                     f"https://s3.us-east-2.amazonaws.com/penn.mobile/pottruck/{s3_image_name}"
                 )
diff --git a/backend/pennmobile/settings/base.py b/backend/pennmobile/settings/base.py
@@ -186,6 +186,9 @@
 PENNGROUPS_USERNAME = os.environ.get("PENNGROUPS_USERNAME", None)
 PENNGROUPS_PASSWORD = os.environ.get("PENNGROUPS_PASSWORD", None)
 
+# Fitness Token
+FITNESS_TOKEN = os.environ.get("FITNESS_TOKEN", None)
+
 # Upload file storage
 DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID", None)
diff --git a/backend/pennmobile/urls.py b/backend/pennmobile/urls.py
@@ -44,7 +44,7 @@ def universal_identifier_link(request):
                             "VU59R57FGM.org.pennlabs.PennMobile.dev",
                         ],
                         "components": [
-                            {"/": "ios/gsr/share/*", "?": {"data": "*"}, "comment": "GSR Sharing."}
+                            {"/": "/gsr/share/*", "?": {"data": "*"}, "comment": "GSR Sharing."}
                         ],
                     }
                 ]
diff --git a/backend/tests/gsr_booking/test_share_codes.py b/backend/tests/gsr_booking/test_share_codes.py
@@ -63,7 +63,7 @@ def setUp(self):
     def test_create_share_code_success(self):
         # Creates a gsr share code successfully
         self.client.force_authenticate(user=self.owner)
-        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.id})
+        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.booking_id})
         self.assertEqual(response.status_code, 201)
         payload = json.loads(response.content)
 
@@ -79,13 +79,13 @@ def test_create_share_code_duplicate(self):
         self.client.force_authenticate(user=self.owner)
 
         # First creation
-        response1 = self.client.post("/api/gsr/share/", {"booking_id": self.booking.id})
+        response1 = self.client.post("/api/gsr/share/", {"booking_id": self.booking.booking_id})
         self.assertEqual(response1.status_code, 201)
         payload1 = json.loads(response1.content)
         first_code = payload1["code"]
 
         # Second creation (should return existing code)
-        response2 = self.client.post("/api/gsr/share/", {"booking_id": self.booking.id})
+        response2 = self.client.post("/api/gsr/share/", {"booking_id": self.booking.booking_id})
         self.assertEqual(response2.status_code, 201)  # Changed from 200 to 201
         payload2 = json.loads(response2.content)
 
@@ -96,7 +96,7 @@ def test_create_share_code_duplicate(self):
         self.assertEqual(GSRShareCode.objects.filter(booking=self.booking).count(), 1)
 
     def test_create_share_code_without_auth(self):
-        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.id})
+        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.booking_id})
         self.assertEqual(response.status_code, 403)
         self.assertEqual(GSRShareCode.objects.count(), 0)
 
@@ -124,13 +124,22 @@ def test_view_shared_booking_public_access(self):
         payload = json.loads(response.content)
 
         # Should only contain booking info and not owner info
+        print("Payload: ", payload)
+        self.assertIn("booking_id", payload)
+        self.assertIn("gsr", payload)
+        self.assertIn("lid", payload["gsr"])
+        self.assertIn("gid", payload["gsr"])
+        self.assertIn("name", payload["gsr"])
+        self.assertIn("kind", payload["gsr"])
+        self.assertIn("image_url", payload["gsr"])
         self.assertIn("room_name", payload)
-        self.assertIn("building", payload)
+        self.assertIn("room_id", payload)
         self.assertIn("start", payload)
         self.assertIn("end", payload)
         self.assertIn("is_valid", payload)
+        self.assertIn("owner_name", payload)
         self.assertEqual(payload["room_name"], self.booking.room_name)
-        self.assertEqual(payload["building"], self.booking.gsr.name)
+        self.assertEqual(payload["gsr"]["name"], self.booking.gsr.name)
         self.assertEqual(payload["is_valid"], True)
 
     def test_view_shared_booking_invalid_code(self):
@@ -224,7 +233,7 @@ def test_create_share_code_for_expired_booking_code_invalid(self):
         self.booking.save(update_fields=["end"])
 
         self.client.force_authenticate(user=self.owner)
-        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.id})
+        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.booking_id})
         self.assertEqual(response.status_code, 201)
         payload = json.loads(response.content)
         self.assertEqual(payload["status"], "expired")
@@ -254,7 +263,7 @@ def test_create_share_code_replaces_expired(self):
 
         # Create again
         self.client.force_authenticate(user=self.owner)
-        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.id})
+        response = self.client.post("/api/gsr/share/", {"booking_id": self.booking.booking_id})
         self.assertEqual(response.status_code, 201)  # Changed from 200 to 201
         payload = json.loads(response.content)
 
@@ -314,17 +323,24 @@ def test_shared_booking_serializer(self):
         data = serializer.data
 
         # Should have booking details
+        self.assertIn("booking_id", data)
+        self.assertIn("gsr", data)
+        self.assertIn("lid", data["gsr"])
+        self.assertIn("gid", data["gsr"])
+        self.assertIn("name", data["gsr"])
+        self.assertIn("kind", data["gsr"])
+        self.assertIn("image_url", data["gsr"])
         self.assertIn("room_name", data)
-        self.assertIn("building", data)
+        self.assertIn("room_id", data)
         self.assertIn("start", data)
         self.assertIn("end", data)
         self.assertIn("is_valid", data)
+        self.assertIn("owner_name", data)
 
         # Should not have owner info
         self.assertNotIn("user", data)
         self.assertNotIn("owner", data)
         self.assertNotIn("reservation", data)
-        self.assertNotIn("booking_id", data)
 
     def test_is_valid_method(self):
         share_code = GSRShareCode.objects.create(
diff --git a/backend/tests/penndata/fitness_snapshot.html b/backend/tests/penndata/fitness_snapshot.html
diff --git a/backend/tests/penndata/fitness_snapshot.js b/backend/tests/penndata/fitness_snapshot.js
diff --git a/backend/tests/penndata/test_views.py b/backend/tests/penndata/test_views.py

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def universal_identifier_link(request):`
`44`	`44`	`"VU59R57FGM.org.pennlabs.PennMobile.dev",`
`45`	`45`	`],`
`46`	`46`	`"components": [`
`47`		`- {"/": "ios/gsr/share/", "?": {"data": ""}, "comment": "GSR Sharing."}`
	`47`	`+ {"/": "/gsr/share/", "?": {"data": ""}, "comment": "GSR Sharing."}`
`48`	`48`	`],`
`49`	`49`	`}`
`50`	`50`	`]`