Merge pull request #12 from mongoosejs/vkarpov15/version

use single `$search` pipeline stage rather than separate `$match`
mongoosejs · Apr 28, 2023 · 050e9a4 · 050e9a4
2 parents f15dfe4 + ae10ab7
commit 050e9a4
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/search/index.js b/search/index.js
@@ -9,7 +9,8 @@ const contentSchema = new mongoose.Schema({
   title: { type: String, required: true },
   body: { type: String, required: true },
   url: { type: String, required: true },
-  version: { type: String }
+  version: { type: String },
+  versionNumber: { type: Number }
 });
 
 module.exports = async function search(context, req) {
@@ -22,27 +23,24 @@ module.exports = async function search(context, req) {
   Content = conn.model('Content', contentSchema, 'Content');
 
   const query = req.query.search.toString();
-  const version = req.query.version;
+  const version = req.query.version ? +req.query.version.replace(/\.x$/, '') : null;
   let results = await Content.aggregate([
     {
       $search: {
         index: 'mongoose-content',
-        text: {
-          query,
-          path: { wildcard: '*' },
-          fuzzy: {}
+        compound: {
+          must: [
+            ...(version ? [{
+              equals: {
+                path: 'versionNumber',
+                value: version
+              }
+            }] : []),
+            { text: { query, path: { wildcard: '*' }, fuzzy: {} } }
+          ]
         }
       }
     },
-    { $match: { version } },
-    {
-      $addFields: {
-        score: {
-          $meta: 'searchScore'
-        }
-      }
-    },
-    { $sort: { score: -1 } },
     { $limit: 10 }
   ]);