Merge pull request #1194 from gchq/feature/improve-search

gchq · Apr 2, 2024 · b582d3f · b582d3f
2 parents b0117ee + d203c07
commit b582d3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/backend/src/models/Model.ts b/backend/src/models/Model.ts
@@ -93,7 +93,7 @@ const ModelSchema = new Schema<ModelInterface>(
 )
 
 ModelSchema.plugin(MongooseDelete, { overrideMethods: 'all', deletedBy: true, deletedByType: Schema.Types.ObjectId })
-ModelSchema.index({ '$**': 'text' })
+ModelSchema.index({ '$**': 'text' }, { weights: { name: 10, description: 5 } })
 
 const ModelModel = model<ModelInterface>('v2_Model', ModelSchema)
 

diff --git a/backend/src/services/model.ts b/backend/src/services/model.ts
@@ -115,12 +115,19 @@ export async function searchModels(
     }
   }
 
-  const results = await ModelModel
+  let cursor = ModelModel
     // Find only matching documents
     .find(query)
+
+  if (!search) {
     // Sort by last updated
-    .sort({ updatedAt: -1 })
+    cursor = cursor.sort({ updatedAt: -1 })
+  } else {
+    // Sort by text search
+    cursor = cursor.sort({ score: { $meta: 'textScore' } })
+  }
 
+  const results = await cursor
   const auths = await authorisation.models(user, results, ModelAction.View)
   return results.filter((_, i) => auths[i].success)
 }