[SCRUM-48] Integrate search endpoint (#44)

* Implemented basic search functionality on currently retrieved items

* Profile navigation logic

* Rename fetching profile

* Refactor for readability

* Change back to using user id for profiles

* Fix get search

* Some refactoring for readability

* Implement get search results

* revert email changes

* Removed unused imports and duplicate defn

* remove response model validation

* Remove unnecessary reponse validation

* Make it work!

* fuzzy searching

* for convenience

---------

Co-authored-by: Vallens Kho <69379333+V-X-L-U@users.noreply.github.com>
Co-authored-by: Vallens <vallens.kho@gmail.com>

Author: ziadzananiri

backend/app/main.py

@@ -127,8 +127,10 @@ async def validation_exception_handler(request, exc):
 
 @app.get(
     '/search',
-    response_model=SearchGetResponse,
-    responses={'500': {'model': ErrorResponse}},
+    response_model=None,
+    responses={
+        '200': {'model': SearchGetResponse},
+        '500': {'model': ErrorResponse}},
 )
 async def get_search(
     # Used in for full text search
@@ -153,86 +155,94 @@ async def get_search(
     """
     search listings
     """
-    price_order = 0
     limit = min(max(limit, 1), 30)
-    try:
-        if query:
-            # Full text search
-            search_stage = {
-                "$search": {
-                    "index": "Full_text_index_listings",
-                    "text": {
-                        "query": query,
-                        "path": {
-                            "wildcard": "*",
-                        },
+
+    # Selecting which order to sort by
+    # Default to most recent first
+    sort_field = {"date_posted": -1}
+    if price_type == "price-high-to-low":
+        sort_field = {"price": -1}
+    elif price_type == "price-low-to-high":
+        sort_field = {"price": 1}
+    elif price_type == "date-recent":
+        sort_field = {"date_posted": -1}
+
+    if query:
+        # Full text search
+        search_stage = {
+            "$search": {
+                "index": "full_text_index_listings_11APR2025",
+                "text": {
+                    "query": query,
+                    "path": {
+                        "wildcard": "*",
                     },
+                    "fuzzy": {
+                        "maxEdits": 2,
+                        "prefixLength": 0,
+                        "maxExpansions": 50
+                    }
                 },
-            }
-        else:
-            search_stage = {"$search": {
-                "index": "Full_text_index_listings",
+                "sort": sort_field,
+            },
+        }
+    else:
+        search_stage = {
+            "$search": {
+                "index": "full_text_index_listings_11APR2025",
                 # This is always true; essentially just gets all documents
                 "exists": {"path": "_id"},
-            }}
-
-        if next:
-            search_stage["$search"]["searchAfter"] = next
+                "sort": sort_field,
+            },
+        }
 
-        # Selecting which order to sort by
-        # Default to most recent first
-        sort_stage = {"$sort": {"date_posted": -1}}
-        if price_type == "price-high-to-low":
-            sort_stage = {"$sort": {"price": -1}}
-        elif price_type == "price-low-to-high":
-            sort_stage = {"$sort": {"price": 1}}
-        elif price_type == "date-recent":
-            sort_stage = {"$sort": {"date_posted": -1}}
+    if next:
+        search_stage["$search"]["searchAfter"] = next
 
-        pipeline = [
-            search_stage,
-            # Price filter with stable sort using _id as tiebreaker
-            {"$sort": {"price": price_order, "_id": 1}
-             } if price_order in [-1, 1] else {"$sort": {"_id": 1}},
-            # Lower and upper limits of price (0 -> +inf by default)
-            {
-                "$match": {
-                    "price": {"$gte": lower_price, "$lte": upper_price}}} if price_type is not None else None,
-            # Condition filter
-            {
-                "$match": {
-                    "condition": condition}} if condition else None,
-            # Date filter
-            {
-                "$match": {
-                    "date_posted": {"$gte": dateutil_parse(date_range).isoformat()}}}
-                if date_range is not None else None,
-            {
-                "$match": {
-                    "campus": campus}} if campus else None,
-            {"$limit": limit},
-            {"$project": {
-                "id": {"$toString": "$_id"},
-                "title": 1,
-                "price": 1,
-                "description": 1,
-                "seller_id": 1,
-                "pictures": 1,
-                "condition": 1,
-                "category": 1,
-                "date_posted": 1,
-                "campus": 1,
-                # Provide pagination tokens generated by Atlas Search
-                #   so that clients can provide this on next query
-                "paginationToken": {"$meta": "searchSequenceToken"},
-            }}
-        ]
+    pipeline = [
+        search_stage,
+        # Lower and upper limits of price (0 -> +inf by default)
+        {
+            "$match": {
+                "price": {"$gte": lower_price, "$lte": upper_price}}} if price_type is not None else None,
+        # Condition filter
+        {
+            "$match": {
+                "condition": condition}} if condition else None,
+        # Date filter
+        {
+            "$match": {
+                "date_posted": {"$gte": dateutil_parse(date_range).isoformat()}}}
+            if date_range is not None else None,
+        # Campus filter
+        {
+            "$match": {
+                "campus": campus}} if campus else None,
+        {"$limit": limit},
+        {"$project": {
+            "id": {"$toString": "$_id"},
+            "title": 1,
+            "price": 1,
+            "description": 1,
+            "seller_id": 1,
+            "pictures": 1,
+            "condition": 1,
+            "category": 1,
+            "date_posted": 1,
+            "campus": 1,
+            # Provide pagination tokens generated by Atlas Search
+            #   so that clients can provide this on next query
+            "paginationToken": {"$meta": "searchSequenceToken"},
+        }}
+    ]
+
+    # Clean the pipeline of any None values
+    pipeline = [stage for stage in pipeline if stage is not None]
 
-        # Clean the pipeline of any None values
-        pipeline = [stage for stage in pipeline if stage is not None]
+    try:
 
         cursor = listings_collection.aggregate(pipeline)
-        listings = await cursor.to_list(length=limit)
+        listings = await cursor.to_list()
 
         # Prepping to return
         response_data = [
@@ -251,17 +261,19 @@ async def get_search(
             for listing in listings
         ]
 
+        print([(listing["_id"], listing["price"]) for listing in listings])
+
         if not response_data:
             return SearchGetResponse(listings=[],
                                      total=0,
-                                     next_page_token=None)
+                                     next_page_token="")
 
         listings = ListingsGetResponseAll(
             listings=response_data,
             total=len(response_data),
             next_page_token=listings[-1].get("paginationToken")
         )
-
+        print(f"Next page token: {listings.next_page_token}")
         return SearchGetResponse(listings=listings.listings,
                                  total=listings.total,
                                  next_page_token=listings.next_page_token)
@@ -327,6 +339,7 @@ async def get_listing(listing_id: str) -> Union[ListingGetResponseItem, ErrorRes
                     "campus": 1,
                     "date_posted": 1,
                     "seller_name": "$seller_doc.display_name",
+                    "seller_email": "$seller_doc.email",
                 }
             }
         ]
@@ -346,6 +359,7 @@ async def get_listing(listing_id: str) -> Union[ListingGetResponseItem, ErrorRes
             description=listing.get("description"),
             seller_id=listing.get("seller_id"),
             seller_name=listing.get("seller_name", ""),
+            seller_email=listing.get("seller_email", ""),
             pictures=listing.get("pictures", []),
             category=listing.get("category"),
             condition=listing.get("condition"),
@@ -358,8 +372,10 @@ async def get_listing(listing_id: str) -> Union[ListingGetResponseItem, ErrorRes
 
 
 @app.get('/listings',
-         response_model=ListingsGetResponseAll,
-         responses={'500': {'model': ErrorResponse}},
+         response_model=None,
+         responses={
+             '200': {'model': ListingsGetResponseAll},
+             '500': {'model': ErrorResponse}},
          )
 async def get_listings(
     query: Optional[str] = Query(None, description="query"),
@@ -378,7 +394,7 @@ async def get_listings(
             print("GOT Query", query)
             search_stage = {
                 "$search": {
-                    "index": "Full_text_index_listings",
+                    "index": "full_text_index_listings_11APR2025",
                     "text": {
                         "query": query,
                         "path": {
@@ -391,7 +407,7 @@ async def get_listings(
             print("NO QUERY")
             search_stage = {
                 "$search": {
-                    "index": "Full_text_index_listings",
+                    "index": "full_text_index_listings_11APR2025",
                     # This is always true; essentially just gets all documents
                     "exists": {"path": "_id"},
                 }
@@ -426,7 +442,7 @@ async def get_listings(
         listings = await cursor.to_list(length=limit)
 
         if not listings:
-            return ListingsGetResponseAll(listings=[], total=0, next_page_token=None)
+            return ListingsGetResponseAll(listings=[], total=0, next_page_token="")
 
         # Convert documents to Pydantic models
         response_data = [
@@ -474,11 +490,9 @@ async def post_listings(
     Create a new listing
     """
     try:
-
         # Prepare data for MongoDB
         listing_data = body.dict()
-        listing_data["date_posted"] = datetime.now(
-            timezone.utc).isoformat()  # Ensure date is handled properly
+        listing_data["date_posted"] = datetime.now(timezone.utc)
         listing_data["seller_id"] = current_user["id"]
 
         # Insert into MongoDB
@@ -670,7 +684,6 @@ async def delete_saved_item(saved_item_id: str = Query(..., description="ID of t
         return ErrorResponse(detail="Internal Server Error. Please try again later.")
 
 
-
 ######################################## USER ENDPOINTS ########################################
 
 

backend/app/models.py

@@ -61,6 +61,7 @@ class ListingGetResponseItem(BaseModel):
     price: float
     description: Optional[str] = None
     seller_id: str
+    seller_email: Optional[str] = None
     pictures: List[str]
     category: Optional[str] = None
     condition: str
@@ -82,7 +83,6 @@ class ListingsPostRequest(BaseModel):
     title: str
     price: float
     description: Optional[str] = None
-    seller_id: str
     pictures: List[str]
     category: Optional[str] = None
     condition: str

backend/scripts/listings_help.py

@@ -3,34 +3,6 @@ import 'package:flutter/material.dart';
 class ListingLoadingComponent extends StatelessWidget {
   const ListingLoadingComponent({super.key});
 
-  // Widget _buildSearchBarSkeleton() {
-  //   return Padding(
-  //     padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
-  //     child: Row(
-  //       children: [
-  //         Expanded(
-  //           child: Container(
-  //             height: 50,
-  //             decoration: BoxDecoration(
-  //               color: Colors.grey[200],
-  //               borderRadius: BorderRadius.circular(30),
-  //             ),
-  //           ),
-  //         ),
-  //         const SizedBox(width: 8.0),
-  //         Container(
-  //           width: 50,
-  //           height: 50,
-  //           decoration: BoxDecoration(
-  //             color: Colors.grey[200],
-  //             borderRadius: BorderRadius.circular(30),
-  //           ),
-  //         ),
-  //       ],
-  //     ),
-  //   );
-  // }
-
   Widget _buildTrendingLabelSkeleton() {
     return Padding(
       padding: const EdgeInsets.only(left: 16.0, bottom: 5.0, top: 5.0),

frontend/lib/item_listing/components/listing_loading.component.dart

@@ -1,9 +1,12 @@
+import 'package:dio/dio.dart';
+import 'package:utm_marketplace/item_listing/model/filter_options.model.dart';
+import 'package:utm_marketplace/item_listing/model/listing.model.dart';
 import 'package:utm_marketplace/shared/dio/dio.dart';
 
 class ListingRepo {
   final Map<String, dynamic> _cache = {};
 
-  Future<dynamic> fetchData(
+  Future<dynamic> getListings(
       {int limit = 6, String? nextPageToken, String? query}) async {
     final cacheKey = '$limit-$nextPageToken-$query';
     if (_cache.containsKey(cacheKey)) {
@@ -36,4 +39,40 @@ class ListingRepo {
       throw Exception('Failed to load listings: $e');
     }
   }
+
+  Future<ListingModel> getSearchResults(
+      {String? searchQuery,
+      int limit = 5,
+      String? nextPageToken,
+      FilterOptions? filterOptions}) async {
+    Response response;
+    try {
+      final queryParams = <String, String>{
+        if (searchQuery != null) 'query': searchQuery,
+        'limit': limit.toString(),
+        if (nextPageToken != null) 'next': nextPageToken,
+        if (filterOptions?.priceType != null)
+          'price_type': filterOptions!.priceType!,
+        if (filterOptions?.lowerPrice != null)
+          'lower_price': filterOptions!.lowerPrice!.toString(),
+        if (filterOptions?.upperPrice != null)
+          'upper_price': filterOptions!.upperPrice!.toString(),
+        if (filterOptions?.condition != null)
+          'condition': filterOptions!.condition!,
+        if (filterOptions?.dateRange != null)
+          'date_range': filterOptions!.dateRange!.toIso8601String(),
+        if (filterOptions?.campus != null) 'campus': filterOptions!.campus!,
+      };
+
+      response = await dio.get('/search', queryParameters: queryParams);
+
+      if (response.statusCode == 200) {
+        return ListingModel.fromJson(response.data);
+      }
+    } catch (e) {
+      throw Exception("Failed to load search results: $e");
+    }
+
+    throw Exception("Request failed with status code: ${response.statusCode}");
+  }
 }