Merge branch 'master' into james/claude-code-config

Author: i30101

backend/market/migrations/0005_sublet_true_latitude_sublet_true_longitude.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.2 on 2026-02-13 23:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("market", "0004_rename_address_sublet_street_address_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sublet",
+            name="latitude",
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="sublet",
+            name="longitude",
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

backend/market/models.py

@@ -1,3 +1,8 @@
+import hashlib
+import hmac
+import math
+
+from django.conf import settings
 from django.contrib.auth.models import AbstractUser
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
@@ -42,7 +47,6 @@ class Meta:
     def __str__(self):
         return f"Offer for {self.listing} made by {self.user}"
 
-
 class Category(models.Model):
     name = models.CharField(max_length=100, unique=True)
 
@@ -130,12 +134,46 @@ class Sublet(Listing):
     baths = models.PositiveIntegerField()
     start_date = models.DateField()
     end_date = models.DateField()
+    latitude = models.FloatField(null=True, blank=True)
+    longitude = models.FloatField(null=True, blank=True)
 
     def clean(self):
         super().clean()
         if self.start_date and self.end_date and self.start_date >= self.end_date:
             raise ValidationError({"end_date": "End date must be after start date"})
 
+    def _calculate_approximate_location(self, latitude, longitude):
+        if latitude is None or longitude is None:
+            return None, None
+
+        lat_str = f"{float(latitude):.9f}"
+        lon_str = f"{float(longitude):.9f}"
+        seed = hmac.new(
+            settings.SECRET_KEY.encode(),
+            f"{lat_str}{lon_str}".encode(),
+            hashlib.sha256,
+        ).hexdigest()
+
+        offset_factor = int(seed[:8], 16) / 0xFFFFFFFF
+
+        offset_distance = 0.0005 + (offset_factor * 0.0013)
+        angle = offset_factor * 2 * math.pi
+
+        lat_offset = offset_distance * math.sin(angle)
+        lon_offset = offset_distance * math.cos(angle)
+
+        approx_lat = float(latitude) + lat_offset
+        approx_lon = float(longitude) + lon_offset
+        return approx_lat, approx_lon
+
+    @property
+    def approximate_location(self):
+        if self.latitude is not None and self.longitude is not None:
+            approximate_location = self._calculate_approximate_location(
+                self.latitude, self.longitude)
+            return approximate_location
+        return None, None
+
     def save(self, *args, **kwargs):
         self.full_clean()
         super().save(*args, **kwargs)

backend/market/serializers.py

@@ -1,3 +1,4 @@
+
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError as ModelValidationError
 from profanity_check import predict
@@ -98,10 +99,32 @@ def get_condition(self, obj):
 
 
 class SubletDataSerializer(ModelSerializer):
+    latitude = SerializerMethodField()
+    longitude = SerializerMethodField()
+
     class Meta:
         model = Sublet
-        fields = ["street_address", "beds", "baths", "start_date", "end_date"]
+        fields = [
+            "street_address",
+            "beds",
+            "baths",
+            "start_date",
+            "end_date",
+            "latitude",
+            "longitude",
+        ]
+
+    def get_latitude(self, obj):
+        approx_lat, _ = obj.approximate_location
+        if approx_lat is not None:
+            return float(approx_lat)
+        return None
 
+    def get_longitude(self, obj):
+        _, approx_lon = obj.approximate_location
+        if approx_lon is not None:
+            return float(approx_lon)
+        return None
 
 # Unified serializer for all listing types (Items and Sublets); used for CRUD operations
 class ListingSerializer(ListingTypeMixin, ModelSerializer):
@@ -265,12 +288,23 @@ def _create_item(self, validated_data, additional_data):
     def _create_sublet(self, validated_data, additional_data):
         tags = validated_data.pop("tags", None)
 
+        latitude = additional_data.get("latitude")
+        longitude = additional_data.get("longitude")
+
+
+        if latitude is not None:
+            latitude = float(latitude)
+        if longitude is not None:
+            longitude = float(longitude)
+
         sublet = Sublet.objects.create(
             street_address=additional_data.get("street_address"),
             beds=additional_data.get("beds"),
             baths=additional_data.get("baths"),
             start_date=additional_data.get("start_date"),
             end_date=additional_data.get("end_date"),
+            latitude=latitude,
+            longitude=longitude,
             **validated_data,
         )
 
@@ -323,10 +357,16 @@ def _update_item(self, instance, additional_data):
 
     def _update_sublet(self, instance, additional_data):
         sublet = instance.sublet
-        sublet_fields = ["street_address", "beds", "baths", "start_date", "end_date"]
-        for field in sublet_fields:
+        str_fields = ["street_address", "beds", "baths", "start_date", "end_date"]
+        float_fields = ["latitude", "longitude"]
+        for field in str_fields:
             if field in additional_data:
                 setattr(sublet, field, additional_data[field])
+
+        for field in float_fields:
+            if field in additional_data:
+                value = additional_data[field]
+                setattr(sublet, field, float(value) if value is not None else None)
         sublet.full_clean()
         sublet.save()
 

backend/market/views.py

@@ -189,7 +189,7 @@ def retrieve(self, request, *args, **kwargs):
             serializer_class = ListingSerializer
         else:
             serializer_class = ListingSerializerPublic
-        serializer = serializer_class(instance)
+        serializer = serializer_class(instance, context={"request": request})
         return Response(serializer.data)
 
 

frontend/app/items/[id]/page.tsx

@@ -1,9 +1,20 @@
+import { QueryClient, dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { ListingDetail } from "@/components/listings/detail/ListingDetail";
 import { getListingOrNotFound } from "@/lib/actions";
+import { queryKeys } from "@/lib/queryKeys";
 
 export default async function ItemPage({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
   const item = await getListingOrNotFound(id);
 
-  return <ListingDetail listing={item} initialIsFavorited={item.is_favorited ?? false} />;
+  // seed the cache with the already-fetched listing (no additional fetch).
+  // We use setQueryData instead of prefetchQuery to preserve the notFound() throw above.
+  const queryClient = new QueryClient();
+  queryClient.setQueryData(queryKeys.listing(item.id), item);
+
+  return (
+    <HydrationBoundary state={dehydrate(queryClient)}>
+      <ListingDetail listingId={item.id} />
+    </HydrationBoundary>
+  );
 }

frontend/app/page.tsx

@@ -1,16 +1,32 @@
+import { QueryClient, dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { getCurrentUser, getItems } from "@/lib/actions";
+import { queryKeys } from "@/lib/queryKeys";
 import { PageHeader } from "@/components/common/PageHeader";
 import { ItemFilters } from "@/components/filters/ItemFilters";
 import { ListingsGrid } from "@/components/listings/ListingsGrid";
 
 export default async function ItemsPage() {
-  const [items, currentUser] = await Promise.all([getItems({ pageParam: 1 }), getCurrentUser()]);
+  const queryClient = new QueryClient();
+
+  const [, currentUser] = await Promise.all([
+    queryClient.fetchInfiniteQuery({
+      queryKey: queryKeys.listings("items"),
+      queryFn: () => getItems({ pageParam: 1 }),
+      initialPageParam: 1,
+      getNextPageParam: (lastPage, allPages) =>
+        lastPage.results.length > 0 ? allPages.length + 1 : undefined,
+      pages: 1,
+    }),
+    getCurrentUser(),
+  ]);
 
   return (
     <div className="container mx-auto w-full max-w-[96rem] space-y-6 px-12 pt-6">
       <PageHeader title="Browse Items" description="Discover the latest items on sale at Penn" />
       <ItemFilters />
-      <ListingsGrid type="items" listings={items} currentUser={currentUser} />
+      <HydrationBoundary state={dehydrate(queryClient)}>
+        <ListingsGrid type="items" currentUser={currentUser} />
+      </HydrationBoundary>
     </div>
   );
 }

frontend/app/sublets/[id]/page.tsx

@@ -1,9 +1,20 @@
+import { QueryClient, dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { ListingDetail } from "@/components/listings/detail/ListingDetail";
 import { getListingOrNotFound } from "@/lib/actions";
+import { queryKeys } from "@/lib/queryKeys";
 
 export default async function SubletPage({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
   const sublet = await getListingOrNotFound(id);
 
-  return <ListingDetail listing={sublet} initialIsFavorited={sublet.is_favorited ?? false} />;
+  // seed the cache with the already-fetched listing (no additional fetch).
+  // We use setQueryData instead of prefetchQuery to preserve the notFound() throw above.
+  const queryClient = new QueryClient();
+  queryClient.setQueryData(queryKeys.listing(sublet.id), sublet);
+
+  return (
+    <HydrationBoundary state={dehydrate(queryClient)}>
+      <ListingDetail listingId={sublet.id} />
+    </HydrationBoundary>
+  );
 }

frontend/app/sublets/page.tsx

@@ -1,19 +1,32 @@
+import { QueryClient, dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { getCurrentUser, getSublets } from "@/lib/actions";
+import { queryKeys } from "@/lib/queryKeys";
 import { PageHeader } from "@/components/common/PageHeader";
 import { SubletFilters } from "@/components/filters/SubletFilters";
 import { ListingsGrid } from "@/components/listings/ListingsGrid";
 
 export default async function SubletsPage() {
-  const [sublets, currentUser] = await Promise.all([
-    getSublets({ pageParam: 1 }),
+  const queryClient = new QueryClient();
+
+  const [, currentUser] = await Promise.all([
+    queryClient.fetchInfiniteQuery({
+      queryKey: queryKeys.listings("sublets"),
+      queryFn: () => getSublets({ pageParam: 1 }),
+      initialPageParam: 1,
+      getNextPageParam: (lastPage, allPages) =>
+        lastPage.results.length > 0 ? allPages.length + 1 : undefined,
+      pages: 1,
+    }),
     getCurrentUser(),
   ]);
 
   return (
     <div className="container mx-auto w-full max-w-[96rem] space-y-6 px-12 pt-6">
       <PageHeader title="Browse Sublets" description="Find your perfect housing solution at Penn" />
       <SubletFilters />
-      <ListingsGrid type="sublets" listings={sublets} currentUser={currentUser} />
+      <HydrationBoundary state={dehydrate(queryClient)}>
+        <ListingsGrid type="sublets" currentUser={currentUser} />
+      </HydrationBoundary>
     </div>
   );
 }

frontend/components/listings/ListingsGrid.tsx

@@ -5,22 +5,15 @@ import { Spinner } from "@/components/ui/spinner";
 import { ListingsCard } from "@/components/listings/ListingsCard";
 import { NoListingsFound } from "@/components/listings/NoListingsFound";
 import { useListings } from "@/hooks/useListings";
-import { Item, PaginatedResponse, Sublet, User } from "@/lib/types";
+import { ListingTypes, User } from "@/lib/types";
 
-type Props =
-  | {
-      type: "items";
-      listings: PaginatedResponse<Item>;
-      currentUser: User;
-    }
-  | {
-      type: "sublets";
-      listings: PaginatedResponse<Sublet>;
-      currentUser: User;
-    };
+type Props = {
+  type: ListingTypes;
+  currentUser: User;
+};
 
-export const ListingsGrid = ({ type, listings, currentUser }: Props) => {
-  const { data, error, isFetchingNextPage, hasNextPage, ref } = useListings({ type, listings });
+export const ListingsGrid = ({ type, currentUser }: Props) => {
+  const { data, error, isFetchingNextPage, hasNextPage, ref } = useListings({ type });
 
   const totalResults = data?.pages.reduce((acc, page) => acc + page.results.length, 0) || 0;
   const isEmpty = totalResults === 0;