Added search tags filtering (#1355)

SilasMarvin · web-flow · commit 7f3e505dc0fb · 2024-03-04T14:06:45.000-08:00
diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs
@@ -625,7 +625,10 @@ impl Collection {
 
 #[get("/search?<query>", rank = 20)]
 async fn search(query: &str, site_search: &State<crate::utils::markdown::SiteSearch>) -> ResponseOk {
-    let results = site_search.search(query, None).await.expect("Error performing search");
+    let results = site_search
+        .search(query, None, None)
+        .await
+        .expect("Error performing search");
 
     let results: Vec<SearchResult> = results
         .into_iter()
diff --git a/pgml-dashboard/src/utils/markdown.rs b/pgml-dashboard/src/utils/markdown.rs
@@ -1286,7 +1286,12 @@ impl SiteSearch {
             .collect()
     }
 
-    pub async fn search(&self, query: &str, doc_type: Option<DocType>) -> anyhow::Result<Vec<Document>> {
+    pub async fn search(
+        &self,
+        query: &str,
+        doc_type: Option<DocType>,
+        doc_tags: Option<Vec<String>>,
+    ) -> anyhow::Result<Vec<Document>> {
         let mut search = serde_json::json!({
             "query": {
                 // "full_text_search": {
@@ -1317,11 +1322,17 @@ impl SiteSearch {
             },
             "limit": 10
         });
+        search["query"]["filter"]["$and"] = serde_json::json!({});
         if let Some(doc_type) = doc_type {
-            search["query"]["filter"]["doc_type"] = serde_json::json!({
+            search["query"]["filter"]["$and"]["doc_type"] = serde_json::json!({
                 "$eq": doc_type
             });
         }
+        if let Some(doc_tags) = doc_tags {
+            search["query"]["filter"]["$and"]["tags"] = serde_json::json!({
+                "$in": doc_tags
+            });
+        }
         let results = self.collection.search_local(search.into(), &self.pipeline).await?;
 
         results["results"]
