A hopefully simpler query language

An alternative to #140 that doesn't use sikula, somewhat based on the
proposal described in #9. OR and AND conditions aren't yet supported
-- all filters passed are AND'ed -- but any field of an Entity can be
used for either filtering or sorting without needing to introduce new
abstractions.

Signed-off-by: Jim Crossley <[email protected]>

Cargo.toml

@@ -74,7 +74,6 @@ serde = "1.0.183"
 serde_json = "1.0.114"
 serde_yaml = "0.9"
 sha2 = "0.10.8"
-sikula = "0.4.4"
 spdx-expression = "0.5.2"
 spdx-rs = "0.5.3"
 sqlx = "0.7"

modules/search/Cargo.toml

@@ -12,11 +12,11 @@ actix-web = { workspace = true }
 anyhow = { workspace = true }
 csaf = { workspace = true }
 log = { workspace = true }
+regex = { workspace = true }
 reqwest = { workspace = true }
 sea-orm = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-sikula = { workspace = true, features = ["sea-orm"] }
 thiserror = { workspace = true }
 time = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

modules/search/src/endpoints.rs

@@ -1,7 +1,6 @@
-use crate::model::{AdvisorySearch, SearchOptions};
+use crate::model::SearchOptions;
 use crate::service::{Error, SearchService};
 use actix_web::{get, web, Responder};
-use sikula::prelude::Search;
 use trustify_common::db::Database;
 use trustify_common::model::Paginated;
 use utoipa::OpenApi;
@@ -29,12 +28,11 @@ pub struct ApiDoc;
 #[get("/advisory")]
 /// Search for advisories
 async fn search_advisories(
-    web::Query(SearchOptions { q }): web::Query<SearchOptions>,
+    web::Query(SearchOptions { q, sort }): web::Query<SearchOptions>,
     web::Query(paginated): web::Query<Paginated>,
     service: web::Data<SearchService>,
 ) -> Result<impl Responder, Error> {
-    let search = AdvisorySearch::parse(&q)?;
     Ok(web::Json(
-        service.search_advisories(search, paginated).await?,
+        service.search_advisories(q, sort, paginated).await?,
     ))
 }

modules/search/src/lib.rs

@@ -2,3 +2,5 @@
 pub mod endpoints;
 pub mod model;
 pub mod service;
+
+pub mod query;

modules/search/src/model.rs

@@ -1,4 +1,3 @@
-use sikula::prelude::*;
 use time::OffsetDateTime;
 use trustify_common::model::PaginatedResults;
 use trustify_entity::advisory;
@@ -8,17 +7,8 @@ use trustify_entity::advisory;
 pub struct SearchOptions {
     #[serde(default)]
     pub q: String,
-}
-
-#[derive(Debug, sikula::Search)]
-pub enum AdvisorySearch<'a> {
-    #[search(scope, default)]
-    Title(Primary<'a>),
-
-    #[search(sort)]
-    Modified(Ordered<OffsetDateTime>),
-    #[search(sort)]
-    Published(Ordered<OffsetDateTime>),
+    #[serde(default)]
+    pub sort: String,
 }
 
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]