Merge branch 'master' into anthony/backend-geocoords

Author: alisx255

.github/workflows/build.yml

@@ -1,6 +1,8 @@
 name: Build Marketplace
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   backend-check:

backend/market/serializers.py

@@ -147,6 +147,7 @@ class ListingSerializer(ListingTypeMixin, ModelSerializer):
     seller = UserSerializer(read_only=True)
     listing_type = SerializerMethodField()
     additional_data = SerializerMethodField()
+    is_favorited = SerializerMethodField()
     external_link = URLField(required=False, allow_blank=True, allow_null=True)
     negotiable = BooleanField(required=False, default=True)
     expires_at = DateTimeField(required=False, allow_null=True)
@@ -169,6 +170,7 @@ class Meta:
             "images",
             "listing_type",
             "additional_data",
+            "is_favorited",
         ]
         read_only_fields = [
             "id",
@@ -210,6 +212,12 @@ def validate(self, attrs):
 
         return super().validate(attrs)
 
+    def get_is_favorited(self, obj):
+        request = self.context.get("request")
+        if not request or not request.user or not request.user.is_authenticated:
+            return False
+        return request.user.listings_favorited.filter(id=obj.id).exists()
+
     def validate_title(self, value):
         if self.contains_profanity(value):
             raise ValidationError("The title contains inappropriate language.")
@@ -358,6 +366,7 @@ def _update_sublet(self, instance, additional_data):
 class ListingSerializerPublic(ListingTypeMixin, ModelSerializer):
     buyer_count = SerializerMethodField()
     favorite_count = SerializerMethodField()
+    is_favorited = SerializerMethodField()
     tags = SlugRelatedField(many=True, slug_field="name", queryset=Tag.objects.all())
     images = ListingImageURLSerializer(many=True)
     seller = UserSerializer(read_only=True)
@@ -381,6 +390,7 @@ class Meta:
             "favorite_count",
             "listing_type",
             "additional_data",
+            "is_favorited",
         ]
         read_only_fields = fields
 
@@ -390,6 +400,12 @@ def get_buyer_count(self, obj):
     def get_favorite_count(self, obj):
         return obj.favorites.count()
 
+    def get_is_favorited(self, obj):
+        request = self.context.get("request")
+        if not request or not request.user or not request.user.is_authenticated:
+            return False
+        return request.user.listings_favorited.filter(id=obj.id).exists()
+
 
 # Read-only serializer for use when pulling all listings /etc
 class ListingSerializerList(ListingTypeMixin, ModelSerializer):

backend/market/views.py

@@ -55,7 +55,7 @@ class UserFavorites(ListAPIView, DefaultOrderMixin):
 
     def get_queryset(self):
         user = self.request.user
-        return user.listings_favorited
+        return user.listings_favorited.all()
 
 
 # TODO: Can add feature to filter for active offers only
@@ -255,26 +255,32 @@ class Favorites(
 
     def get_queryset(self):
         user = self.request.user
-        return user.listings_favorited
+        return user.listings_favorited.all()
 
     def create(self, request, *args, **kwargs):
         listing_id = int(self.kwargs["listing_id"])
-        queryset = self.get_queryset()
-        if queryset.filter(id=listing_id).exists():
-            raise exceptions.ValidationError("Favorite already exists")
+        favorites = request.user.listings_favorited
+        if favorites.filter(id=listing_id).exists():
+            return Response(
+                {"liked": True, "detail": "User has already liked the listing"},
+                status=status.HTTP_409_CONFLICT,
+            )
         listing = get_object_or_404(Listing, id=listing_id)
-        self.get_queryset().add(listing)
-        return Response(status=status.HTTP_201_CREATED)
+        favorites.add(listing)
+        return Response({"liked": True}, status=status.HTTP_201_CREATED)
 
     def destroy(self, request, *args, **kwargs):
         listing_id = int(self.kwargs["listing_id"])
         listing = get_object_or_404(Listing, id=listing_id)
 
         if listing not in request.user.listings_favorited.all():
-            raise exceptions.NotFound("Favorite does not exist.")
+            return Response(
+                {"liked": False, "detail": "User hasn't liked the listing yet"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
 
-        self.get_queryset().remove(listing)
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        request.user.listings_favorited.remove(listing)
+        return Response({"liked": False}, status=status.HTTP_200_OK)
 
 
 class Offers(viewsets.ModelViewSet):

frontend/app/api/geocode/route.ts

@@ -0,0 +1,71 @@
+import { NextRequest, NextResponse } from "next/server";
+import type { PhotonReponse, AddressResult, PhotonFeature } from "@/lib/types";
+
+function photonFeatureToAddressResult(feature: PhotonFeature): AddressResult {
+  const props = feature.properties;
+  const [lon, lat] = feature.geometry.coordinates;
+
+  const addressParts = [
+    props.housenumber && props.street
+      ? `${props.housenumber} ${props.street}`
+      : (props.street ?? props.name),
+    props.city,
+    [props.state, props.postcode].filter(Boolean).join(" "),
+  ].filter(Boolean);
+
+  const displayName = addressParts.join(", ");
+
+  return {
+    placeId: props.osm_id,
+    lat: lat.toString(),
+    lon: lon.toString(),
+    displayName,
+    address: {
+      housenumber: props.housenumber,
+      road: props.street,
+      city: props.city,
+      state: props.state,
+      postCode: props.postcode,
+      country: props.country,
+      countryCode: props.countrycode,
+    },
+  };
+}
+
+export async function GET(request: NextRequest) {
+  const query = request.nextUrl.searchParams.get("q");
+
+  if (!query || query.trim().length < 3) {
+    return NextResponse.json([]);
+  }
+
+  try {
+    // Philadelphia bounding box
+    const bbox = "-75.28,39.87,-75.0,40.14";
+
+    const params = new URLSearchParams({
+      q: query,
+      limit: "5", // maximum number of results returned
+      lang: "en",
+      bbox: bbox,
+    });
+
+    const response = await fetch(`https://photon.komoot.io/api/?${params.toString()}`, {
+      headers: {
+        Accept: "application/json",
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+
+    const data: PhotonReponse = await response.json();
+    const results = data.features.map(photonFeatureToAddressResult);
+
+    return NextResponse.json(results);
+  } catch (error) {
+    console.error("Geocode API error:", error);
+    return NextResponse.json({ error: "Failed to fetch addresses" }, { status: 500 });
+  }
+}

frontend/app/error.tsx

@@ -0,0 +1,31 @@
+"use client";
+
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  return (
+    <div className="flex w-full flex-col items-center space-y-4 py-24">
+      <h2 className="text-lg font-semibold">Something went wrong</h2>
+      <p className="text-muted-foreground text-sm">An unexpected error occurred.</p>
+      <button
+        onClick={reset}
+        className="bg-brand hover:bg-brand-hover rounded-md px-4 py-2 text-sm text-white"
+      >
+        Try again
+      </button>
+      {process.env.NODE_ENV === "development" && (
+        <details className="text-muted-foreground mt-4 max-w-lg text-xs">
+          <summary className="cursor-pointer">Error details</summary>
+          <pre className="mt-2 overflow-auto rounded bg-gray-100 p-3 dark:bg-gray-900">
+            {error.message}
+            {error.digest && `\nDigest: ${error.digest}`}
+          </pre>
+        </details>
+      )}
+    </div>
+  );
+}

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

@@ -0,0 +1,38 @@
+"use client";
+
+import Link from "next/link";
+
+export default function ItemError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  return (
+    <div className="flex w-full flex-col items-center space-y-4 py-24">
+      <h2 className="text-lg font-semibold">Something went wrong</h2>
+      <p className="text-muted-foreground text-sm">Failed to load this listing.</p>
+      <div className="flex gap-3">
+        <button
+          onClick={reset}
+          className="bg-brand hover:bg-brand-hover rounded-md px-4 py-2 text-sm text-white"
+        >
+          Try again
+        </button>
+        <Link href="/items" className="rounded-md border px-4 py-2 text-sm">
+          Back to items
+        </Link>
+      </div>
+      {process.env.NODE_ENV === "development" && (
+        <details className="text-muted-foreground mt-4 max-w-lg text-xs">
+          <summary className="cursor-pointer">Error details</summary>
+          <pre className="mt-2 overflow-auto rounded bg-gray-100 p-3 dark:bg-gray-900">
+            {error.message}
+            {error.digest && `\nDigest: ${error.digest}`}
+          </pre>
+        </details>
+      )}
+    </div>
+  );
+}

frontend/app/items/[id]/not-found.tsx

@@ -0,0 +1,18 @@
+import Link from "next/link";
+
+export default function ItemNotFound() {
+  return (
+    <div className="flex w-full flex-col items-center space-y-4 py-24 text-center">
+      <h2 className="text-lg font-semibold">Listing not found</h2>
+      <p className="text-muted-foreground text-sm">
+        This listing may have been removed or doesn&apos;t exist.
+      </p>
+      <Link
+        href="/items"
+        className="bg-brand hover:bg-brand-hover rounded-md px-4 py-2 text-sm text-white"
+      >
+        Back to items
+      </Link>
+    </div>
+  );
+}

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

@@ -1,9 +1,9 @@
 import { ListingDetail } from "@/components/listings/detail/ListingDetail";
-import { getListing } from "@/lib/actions";
+import { getListingOrNotFound } from "@/lib/actions";
 
 export default async function ItemPage({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
-  const item = await getListing(id);
+  const item = await getListingOrNotFound(id);
 
-  return <ListingDetail listing={item} />;
+  return <ListingDetail listing={item} initialIsFavorited={item.is_favorited ?? false} />;
 }

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

@@ -0,0 +1,38 @@
+"use client";
+
+import Link from "next/link";
+
+export default function SubletError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  return (
+    <div className="flex w-full flex-col items-center space-y-4 py-24">
+      <h2 className="text-lg font-semibold">Something went wrong</h2>
+      <p className="text-muted-foreground text-sm">Failed to load this listing.</p>
+      <div className="flex gap-3">
+        <button
+          onClick={reset}
+          className="bg-brand hover:bg-brand-hover rounded-md px-4 py-2 text-sm text-white"
+        >
+          Try again
+        </button>
+        <Link href="/sublets" className="rounded-md border px-4 py-2 text-sm">
+          Back to sublets
+        </Link>
+      </div>
+      {process.env.NODE_ENV === "development" && (
+        <details className="text-muted-foreground mt-4 max-w-lg text-xs">
+          <summary className="cursor-pointer">Error details</summary>
+          <pre className="mt-2 overflow-auto rounded bg-gray-100 p-3 dark:bg-gray-900">
+            {error.message}
+            {error.digest && `\nDigest: ${error.digest}`}
+          </pre>
+        </details>
+      )}
+    </div>
+  );
+}

frontend/app/sublets/[id]/not-found.tsx

@@ -0,0 +1,18 @@
+import Link from "next/link";
+
+export default function SubletNotFound() {
+  return (
+    <div className="flex w-full flex-col items-center space-y-4 py-24 text-center">
+      <h2 className="text-lg font-semibold">Listing not found</h2>
+      <p className="text-muted-foreground text-sm">
+        This listing may have been removed or doesn&apos;t exist.
+      </p>
+      <Link
+        href="/sublets"
+        className="bg-brand hover:bg-brand-hover rounded-md px-4 py-2 text-sm text-white"
+      >
+        Back to sublets
+      </Link>
+    </div>
+  );
+}