feat: support must query condition

futrime · Nov 2, 2024 · 04e1bbf · 04e1bbf
1 parent d7d8821
commit 04e1bbf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/apps/api/redis-client.ts b/apps/api/redis-client.ts
@@ -89,21 +89,47 @@ export class RedisClient implements DatabaseClient {
     if (q.length > 1) {
       const qList = q.replaceAll('*', ' ').split(' ').filter(item => item.length > 0)
 
-      for (const qItem of qList) {
+      // If the query starts with a plus, it is an exact match
+      const optionalQList = qList.filter(item => !item.startsWith('+'))
+      const exactQList = qList.filter(item => item.startsWith('+')).map(item => item.slice(1))
+
+      for (const qItem of exactQList) {
         if (/^[a-z0-9-]+:[a-z0-9-]+$/.test(qItem)) {
-          query = query.and(search => search
+          query = query.and(subQuery => subQuery
             .or('tags').contains(qItem)
           )
         } else {
           const pattern = `*${qItem}*`
-          query = query.and(search => search
+          query = query.and(subQuery => subQuery
             .or('name').matches(pattern)
             .or('description').matches(pattern)
             .or('author').matches(pattern)
             .or('tags').contains(pattern)
           )
         }
       }
+
+      if (optionalQList.length > 0) {
+        query = query.and(subQuery => {
+          for (const qItem of optionalQList) {
+            if (/^[a-z0-9-]+:[a-z0-9-]+$/.test(qItem)) {
+              subQuery = subQuery.or(sub2Query => sub2Query
+                .or('tags').contains(qItem)
+              )
+            } else {
+              const pattern = `*${qItem}*`
+              subQuery = subQuery.or(sub2Query => sub2Query
+                .or('name').matches(pattern)
+                .or('description').matches(pattern)
+                .or('author').matches(pattern)
+                .or('tags').contains(pattern)
+              )
+            }
+          }
+
+          return subQuery
+        })
+      }
     }
 
     const pageCount = Math.ceil(await query.count() / perPage)