fix: removing wrong route from knowledge api (#237)

Author: sagoez

api/src/helper/shape_mongo_filter.rs

@@ -1,7 +1,7 @@
 use axum::extract::Query;
 use entities::{
-    event_access::EventAccess, DELETED_FILTER, DUAL_ENVIRONMENT_HEADER, ENVIRONMENT_FILTER,
-    LIMIT_FILTER, OWNERSHIP_FILTER, SKIP_FILTER,
+    event_access::EventAccess, CONTAINS_FILTER, DELETED_FILTER, DUAL_ENVIRONMENT_HEADER,
+    ENVIRONMENT_FILTER, LIMIT_FILTER, OWNERSHIP_FILTER, SKIP_FILTER,
 };
 use http::HeaderMap;
 use mongodb::bson::{doc, Document};
@@ -19,14 +19,28 @@ pub fn shape_mongo_filter(
     event_access: Option<Arc<EventAccess>>,
     headers: Option<HeaderMap>,
 ) -> MongoQuery {
-    let mut filter = doc! {};
+    let mut filter = doc! {
+        // "tags" : {
+        //     "$in" : ["featured"]
+        // }
+    };
     let mut skip = 0;
     let mut limit = 20;
 
     if let Some(q) = query {
         for (key, value) in q.0.iter() {
             if key == LIMIT_FILTER {
                 limit = value.parse().unwrap_or(20);
+            } else if key == CONTAINS_FILTER {
+                let values = string_to_vec(value);
+                let splitted = values.split_first();
+
+                let target = splitted.map(|a| a.0);
+                let rest = splitted.map(|a| a.1);
+
+                if let (Some(target), Some(rest)) = (target, rest) {
+                    filter.insert(target, doc! { CONTAINS_FILTER: rest.to_vec() });
+                }
             } else if key == SKIP_FILTER {
                 skip = value.parse().unwrap_or(0);
             } else {
@@ -67,6 +81,10 @@ pub fn shape_mongo_filter(
     }
 }
 
+fn string_to_vec(s: &str) -> Vec<String> {
+    s.split(',').map(|s| s.to_string()).collect::<Vec<String>>()
+}
+
 #[cfg(test)]
 mod test {
     use super::shape_mongo_filter;

api/src/logic/knowledge.rs

@@ -1,15 +1,23 @@
-use super::{read_without_key, HookExt, PublicExt, RequestExt};
-use crate::server::{AppState, AppStores};
-use axum::{routing::get, Router};
-use entities::{Id, MongoStore};
+use super::{read_without_key, HookExt, PublicExt, ReadResponse, RequestExt};
+use crate::{
+    router::ServerResponse,
+    server::{AppState, AppStores},
+};
+use axum::{
+    extract::{Query, State},
+    routing::get,
+    Json, Router,
+};
+use bson::doc;
+use entities::{record_metadata::RecordMetadata, Id, MongoStore, PicaError};
 use fake::Dummy;
+use http::HeaderMap;
 use serde::{Deserialize, Serialize};
-use std::sync::Arc;
+use serde_json::Value;
+use std::{collections::BTreeMap, sync::Arc};
 
 pub fn get_router() -> Router<Arc<AppState>> {
-    Router::new()
-        .route("/", get(read_without_key::<ReadRequest, Knowledge>))
-        .route("/:id", get(read_without_key::<ReadRequest, Knowledge>))
+    Router::new().route("/", get(read_without_key::<ReadRequest, Knowledge>))
 }
 
 struct ReadRequest;
@@ -23,6 +31,8 @@ pub struct Knowledge {
     pub title: String,
     pub path: String,
     pub knowledge: Option<String>,
+    #[serde(flatten)]
+    pub metadata: RecordMetadata,
 }
 
 impl HookExt<Knowledge> for ReadRequest {}

api/src/logic/mod.rs

@@ -382,7 +382,7 @@ async fn get_connection(
     Ok(Arc::new(connection))
 }
 
-pub async fn read_common<T, U>(
+async fn read_common<T, U>(
     headers: HeaderMap,
     access: Option<Extension<Arc<EventAccess>>>,
     query: Option<Query<BTreeMap<String, String>>>,

entities/src/domain/constant/mod.rs

@@ -13,6 +13,7 @@ pub const OWNERSHIP_FILTER: &str = "ownership.buildableId";
 pub const ENVIRONMENT_FILTER: &str = "environment";
 pub const DUAL_ENVIRONMENT_HEADER: &str = "x-pica-show-all-environments";
 pub const LIMIT_FILTER: &str = "limit";
+pub const CONTAINS_FILTER: &str = "$in";
 pub const SKIP_FILTER: &str = "skip";
 pub const QUERY_BY_ID_PASSTHROUGH: &str = "x-pica-action-id";