Merge pull request #256 from map-of-pi/bug/fix-search-filtering

Self approved.

Author: swoocn

src/controllers/sellerController.ts

@@ -12,10 +12,10 @@ export const fetchSellersByCriteria = async (req: Request, res: Response) => {
     const sellers = await sellerService.getAllSellers(bounds, search_query, userId);
 
     if (!sellers || sellers.length === 0) {
-      logger.warn(`No sellers found within bounds (${bounds?.sw_lat}, ${bounds?.sw_lng}) to (${bounds?.ne_lat}, ${bounds?.ne_lng}) with "${search_query ?? 'undefined'}"`);
+      logger.warn(`No sellers found within bounds (${bounds?.sw_lat}, ${bounds?.sw_lng}) to (${bounds?.ne_lat}, ${bounds?.ne_lng}) with ${search_query}`);
       return res.status(204).json({ message: "Sellers not found" });
     }
-    logger.info(`Fetched ${sellers.length} sellers within bounds (${bounds?.sw_lat}, ${bounds?.sw_lng}) to (${bounds?.ne_lat}, ${bounds?.ne_lng}) with "${search_query ?? 'undefined'}"`);
+    logger.info(`Fetched ${sellers.length} sellers within bounds (${bounds?.sw_lat}, ${bounds?.sw_lng}) to (${bounds?.ne_lat}, ${bounds?.ne_lng}) with ${search_query}`);
     return res.status(200).json(sellers);
   } catch (error) {
     logger.error('Failed to fetch sellers by criteria:', error);

src/services/seller.service.ts

@@ -41,7 +41,7 @@ const resolveSellerSettings = async (
     if (trustLevelFilters && !trustLevelFilters.includes(trustMeterRating)) {
       return null; // Exclude this seller
     }
-
+    
     try {
       return {
         ...sellerObject,
@@ -83,15 +83,19 @@ export const getAllSellers = async (
 
     // Construct base filter criteria
     const baseCriteria: Record<string, any> = {};
+    
+    // [Seller Type Filter]
     const sellerTypeFilters: SellerType[] = [];
-
     if (searchFilters.include_active_sellers) sellerTypeFilters.push(SellerType.Active);
     if (searchFilters.include_inactive_sellers) sellerTypeFilters.push(SellerType.Inactive);
     if (searchFilters.include_test_sellers) sellerTypeFilters.push(SellerType.Test);
+
     // include filtered seller types
-    if (sellerTypeFilters.length) baseCriteria.seller_type = { $in: sellerTypeFilters };
+    if (sellerTypeFilters.length > 0) { 
+      baseCriteria.seller_type = { $in: sellerTypeFilters };
+    }
 
-    // Trust Level Filters
+    // [Trust Level Filters]
     const trustLevels = [
       { key: "include_trust_level_100", value: TrustMeterScale.HUNDRED },
       { key: "include_trust_level_80", value: TrustMeterScale.EIGHTY },
@@ -102,7 +106,7 @@ export const getAllSellers = async (
       .filter(({ key }) => searchFilters[key]) // Only include checked trust levels
       .map(({ value }) => value);
 
-    // Search Query Filter
+    // [Search Query Filter]
     const searchCriteria = search_query
       ? {
           $text: {
@@ -112,45 +116,40 @@ export const getAllSellers = async (
         }
       : {}; // default to empty object if search_query not provided
 
-    // Merge filters
-    const aggregatedCriteria = { ...baseCriteria, ...searchCriteria };
-
-    let sellers: ISeller[];
-    // If bounds are provided, use MongoDB's $geometry operator
-    if (bounds && !search_query) {
-      sellers = await Seller.find({
-        ...aggregatedCriteria,
-        sell_map_center: {
-          $geoWithin: {
-            $geometry: {
-              type: "Polygon",
-              coordinates: [ [
-                [bounds.sw_lng, bounds.sw_lat],
-                [bounds.ne_lng, bounds.sw_lat],
-                [bounds.ne_lng, bounds.ne_lat],
-                [bounds.sw_lng, bounds.ne_lat],
-                [bounds.sw_lng, bounds.sw_lat]
-              ] ]
-            }
-          }
+    // [Geo Filter]
+    const locationCriteria = bounds
+      ? {
+          sell_map_center: {
+            $geoWithin: {
+              $geometry: {
+                type: "Polygon",
+                coordinates: [[
+                  [bounds.sw_lng, bounds.sw_lat],
+                  [bounds.ne_lng, bounds.sw_lat],
+                  [bounds.ne_lng, bounds.ne_lat],
+                  [bounds.sw_lng, bounds.ne_lat],
+                  [bounds.sw_lng, bounds.sw_lat],
+                ]],
+              },
+            },
+          },
         }
-      })
-      .sort({ updatedAt: -1 }) // Sort by last updated
+      : {};
+
+    // [Final Aggregated Criteria]
+    const aggregatedCriteria = {
+      ...baseCriteria,
+      ...searchCriteria,
+      ...locationCriteria,
+    };
+
+    const sellers = await Seller.find(aggregatedCriteria)
+      .sort({ updatedAt: -1 })
       .limit(maxNumSellers)
-      .hint({ 'updatedAt': -1, 'sell_map_center.coordinates': '2dsphere' })
       .exec();
-    } else {
-      // If no bounds are provided, return all sellers (without geo-filtering)  
-      sellers = await Seller.find(aggregatedCriteria)
-        .sort({ updated_at: -1 })
-        .limit(maxNumSellers)
-        .exec();
-    }
 
     // Fetch and merge the settings for each seller
     const sellersWithSettings = await resolveSellerSettings(sellers, trustLevelFilters);
-
-    // Return sellers with their settings merged
     return sellersWithSettings;
   } catch (error) {
     logger.error('Failed to get all sellers:', error);

test/services/seller.service.spec.ts

@@ -9,7 +9,6 @@ import {
   getSellersWithinSanctionedRegion 
 } from '../../src/services/seller.service';
 import User from '../../src/models/User';
-import { SellerType } from '../../src/models/enums/sellerType';
 import { RestrictedArea, RestrictedAreaBoundaries } from '../../src/models/enums/restrictedArea';
 import { IUser, ISeller, ISellerItem, ISanctionedRegion } from '../../src/types';
 
@@ -57,7 +56,6 @@ describe('getAllSellers function', () => {
     // filter seller records to include those with sell_map_center within geospatial bounding box
     expect(sellersData).toHaveLength(
       await Seller.countDocuments({
-        seller_type: { $ne: SellerType.Inactive },
         'sell_map_center.coordinates': {
           $geoWithin: {
             $box: [
@@ -71,13 +69,26 @@ describe('getAllSellers function', () => {
   });
 
   it('should fetch all applicable sellers when all parameters are provided', async () => {
+    const searchQuery = 'Seller';
     const userData = await User.findOne({ pi_username: 'TestUser1' }) as IUser;
 
-    const sellersData = await getAllSellers(mockBoundingBox, 'Vendor', userData.pi_uid);
+    const sellersData = await getAllSellers(mockBoundingBox, searchQuery, userData.pi_uid);
 
     /* filter seller records to include those with "Vendor"
        + include those with sell_map_center within geospatial bounding box */
-    expect(sellersData).toHaveLength(3);
+    expect(sellersData).toHaveLength(
+      await Seller.countDocuments({
+        $text: { $search: searchQuery, $caseSensitive: false },
+        'sell_map_center.coordinates': {
+          $geoWithin: {
+            $box: [
+              [mockBoundingBox.sw_lng, mockBoundingBox.sw_lat],
+              [mockBoundingBox.ne_lng, mockBoundingBox.ne_lat]
+            ]
+          },
+        },
+      })
+    ); // Ensure length matches expected sellers
   });
 });