feat: Use tags in lowercase to filter without case sensitivity issues

decentraland · Oct 6, 2022 · 11f8f2b · 11f8f2b
1 parent 85ec5ef
commit 11f8f2b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Collection/Collection.model.ts b/src/Collection/Collection.model.ts
@@ -109,7 +109,7 @@ export class Collection extends Model<CollectionAttributes> {
           : SQL``
         : undefined,
       itemTags
-        ? SQL`(items.data::json->'tags')::jsonb ? ANY(${itemTags})`
+        ? SQL`LOWER(items.data::json->>'tags')::jsonb ? ANY(${itemTags})`
         : undefined,
     ].filter(Boolean)
 

diff --git a/src/Collection/Collection.router.spec.ts b/src/Collection/Collection.router.spec.ts
@@ -1006,7 +1006,7 @@ describe('Collection router', () => {
               limit,
               thirdPartyIds: [],
               remoteIds: [],
-              itemTags: [itemTag, itemTag2],
+              itemTags: [itemTag.toLowerCase(), itemTag2.toLowerCase()],
             })
           })
       })
@@ -2705,7 +2705,7 @@ describe('Collection router', () => {
               limit,
               thirdPartyIds: [],
               remoteIds: [],
-              itemTags: [itemTag],
+              itemTags: [itemTag.toLowerCase()],
             })
           })
       })
@@ -2765,7 +2765,7 @@ describe('Collection router', () => {
               limit,
               thirdPartyIds: [],
               remoteIds: [],
-              itemTags: [itemTag, itemTag2],
+              itemTags: [itemTag.toLowerCase(), itemTag2.toLowerCase()],
             })
           })
       })

diff --git a/src/Collection/Collection.router.ts b/src/Collection/Collection.router.ts
@@ -263,8 +263,8 @@ export class CollectionRouter extends Router {
           remoteCollections.filter((r) => !r.isApproved).map((c) => c.id),
       itemTags: tag
         ? Array.isArray(tag)
-          ? (tag as string[])
-          : [tag as string]
+          ? (tag as string[]).map((t) => t.toLowerCase())
+          : [(tag as string).toLowerCase()]
         : undefined,
     })
 
@@ -624,8 +624,8 @@ export class CollectionRouter extends Router {
           remoteCollections.filter((r) => !r.isApproved).map((c) => c.id),
       itemTags: tag
         ? Array.isArray(tag)
-          ? (tag as string[])
-          : [tag as string]
+          ? (tag as string[]).map((t) => t.toLowerCase())
+          : [(tag as string).toLowerCase()]
         : undefined,
     })