fix: fix ambiguous id ORDER in the catalog query when filtering by te…

…xt (#354)
decentraland · Oct 3, 2023 · e075ae0 · e075ae0
1 parent c8027fa
commit e075ae0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ports/catalog/queries.ts b/src/ports/catalog/queries.ts
@@ -32,7 +32,7 @@ export function getOrderBy(filters: CatalogFilters) {
 
   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.
-    return SQL`ORDER BY array_position(${filters.ids}::text[], items.id) `
+    return SQL`ORDER BY array_position(${filters.ids}::text[], id) `
   }
 
   let sortByQuery:
@@ -316,7 +316,7 @@ const getWhereWordsJoin = (category: CatalogQueryFilters['category']) => {
 const getMetadataJoins = (schemaVersion: string) => {
   return SQL` LEFT JOIN (
     SELECT 
-    metadata.id, 
+    metadata.id as metadata_id, 
     wearable.description, 
     wearable.category, 
     wearable.body_shapes, 
@@ -331,10 +331,10 @@ JOIN `
     .append(schemaVersion)
     .append(
       `.metadata_active AS metadata ON metadata.wearable = wearable.id
-) AS metadata_wearable ON metadata_wearable.id = items.metadata AND (items.item_type = 'wearable_v1' OR items.item_type = 'wearable_v2' OR items.item_type = 'smart_wearable_v1')
+) AS metadata_wearable ON metadata_wearable.metadata_id = items.metadata AND (items.item_type = 'wearable_v1' OR items.item_type = 'wearable_v2' OR items.item_type = 'smart_wearable_v1')
 LEFT JOIN (
   SELECT 
-    metadata.id, 
+    metadata.id as metadata_id, 
     emote.description, 
     emote.category, 
     emote.body_shapes, 
@@ -353,7 +353,7 @@ JOIN `
     .append(schemaVersion)
     .append(
       `.metadata_active AS metadata ON metadata.emote = emote.id
-) AS metadata_emote ON metadata_emote.id = items.metadata AND items.item_type = 'emote_v1' `
+) AS metadata_emote ON metadata_emote.metadata_id = items.metadata AND items.item_type = 'emote_v1' `
     )
 }
 

diff --git a/src/tests/ports/catalog-queries.spec.ts b/src/tests/ports/catalog-queries.spec.ts
@@ -415,7 +415,7 @@ test('catalog utils', () => {
         it('should ORDER BY the ids order in the array', () => {
           const orderBy = getOrderBy({ search, ids }) as SQLStatement
           expect(orderBy.text).toContain(
-            `ORDER BY array_position($1::text[], items.id) `
+            `ORDER BY array_position($1::text[], id) `
           )
           expect(orderBy.values).toContain(ids)
         })