fix: main catalog query sort when filtering by text (#355)

* fix: main catalog query sort when filtering by text

* fix: updates logic to remove default sorting from the route handler

* test: update test comments

src/adapters/handlers/catalog.ts

@@ -16,9 +16,7 @@ export function createCatalogHandler(
     const params = new Params(context.url.searchParams)
     const onlyListing = params.getBoolean('onlyListing')
     const onlyMinting = params.getBoolean('onlyMinting')
-    const sortBy =
-      params.getValue<CatalogSortBy>('sortBy', CatalogSortBy) ||
-      CatalogSortBy.CHEAPEST
+    const sortBy = params.getValue<CatalogSortBy>('sortBy', CatalogSortBy)
     const sortDirection =
       params.getValue<CatalogSortDirection>(
         'sortDirection',

src/ports/catalog/queries.ts

@@ -21,7 +21,7 @@ const WEARABLE_ITEM_TYPES = [
 const MAX_ORDER_TIMESTAMP = 253378408747000 // some orders have a timestmap that can't be cast by Postgres, this is the max possible value
 
 export function getOrderBy(filters: CatalogFilters) {
-  const { sortBy, sortDirection, isOnSale, search } = filters
+  const { sortBy, sortDirection, isOnSale, search, ids } = filters
   const sortByParam = sortBy ?? CatalogSortBy.NEWEST
   const sortDirectionParam = sortDirection ?? CatalogSortDirection.DESC
 
@@ -30,8 +30,9 @@ export function getOrderBy(filters: CatalogFilters) {
     return ''
   }
 
-  if (search) {
-    // If the filters have a search term, we need to order by the position of the item in the search results that is pre-computed and passed in the ids filter.
+  if (search && !sortBy && ids?.length) {
+    // If the filters have a search term, there's no other Sort applied and ids matching the search were returned, then
+    // we need to order by the position of the item in the search results that is pre-computed and passed in the ids filter.
     return SQL`ORDER BY array_position(${filters.ids}::text[], id) `
   }
 

src/ports/catalog/utils.ts

@@ -20,7 +20,7 @@ import {
   CatalogQueryFilters,
   CollectionsItemDBResult,
 } from './types'
-import { addQuerySort, getCollectionsItemsCatalogQuery } from './queries'
+import { getCollectionsItemsCatalogQuery, getOrderBy } from './queries'
 
 const getMultiNetworkQuery = (
   schemas: Record<string, string>,
@@ -43,7 +43,7 @@ const getMultiNetworkQuery = (
     }
   })
   unionQuery.append(SQL`\n) as temp \n`)
-  addQuerySort(unionQuery, filters)
+  unionQuery.append(getOrderBy(filters))
   if (limit !== undefined && offset !== undefined) {
     unionQuery.append(SQL`LIMIT ${limit} OFFSET ${offset}`)
   }
@@ -101,7 +101,7 @@ export function fromCollectionsItemDbResultToCatalogItem(
         loop,
         category: emoteCategory,
         has_sound,
-        has_geometry
+        has_geometry,
       } = dbItem.metadata
       ;(name = emoteName), (category = NFTCategory.EMOTE)
       data = {
@@ -112,7 +112,7 @@ export function fromCollectionsItemDbResultToCatalogItem(
           rarity: rarity as Rarity,
           loop: !!loop,
           hasSound: !!has_sound,
-          hasGeometry: !!has_geometry
+          hasGeometry: !!has_geometry,
         },
       }
       break

src/tests/ports/catalog.spec.ts

@@ -293,7 +293,6 @@ test('catalog component', function () {
         filters = {
           network,
           search,
-          // ids: ['id1', 'id2'],
         }
 
         latestSubgraphSchemaResponse = {
@@ -325,12 +324,13 @@ test('catalog component', function () {
               getSubgraphNameForNetwork(network, ChainId.ETHEREUM_SEPOLIA)
             )
           )
+          const itemIdsBySearchTextQuery = getItemIdsBySearchTextQuery(
+            latestSchema,
+            filters.search,
+            filters.category
+          )
           expect(dbClientQueryMock.mock.calls[1][0]).toEqual(
-            getItemIdsBySearchTextQuery(
-              latestSchema,
-              filters.search,
-              filters.category
-            )
+            itemIdsBySearchTextQuery
           )
           // It's repeated 4 times due to this WHERE statement: `WHERE word_wearable % $1 OR word_emote % $2 ORDER BY GREATEST(similarity(word_wearable, $3), similarity(word_emote, $4)) DESC;`
           expect(dbClientQueryMock.mock.calls[1][0].values).toEqual(
@@ -389,9 +389,11 @@ test('catalog component', function () {
           expect(dbClientQueryMock.mock.calls[1][0].values).toEqual(
             Array(4).fill(search)
           )
-          expect(dbClientQueryMock.mock.calls[2][0]).toEqual(
-            getCatalogQuery({ [network]: latestSchema }, filters)
+          const mainCatalogQuery = getCatalogQuery(
+            { [network]: latestSchema },
+            { ...filters, ids: [mockedDBItemResponse.id] } // the main query should have the ids returned by the search query
           )
+          expect(dbClientQueryMock.mock.calls[2][0]).toEqual(mainCatalogQuery)
         })
       })
     })