feat: Add support for short request format

Signed-off-by: Darkheir <[email protected]>

Author: Darkheir

quickwit/quickwit-query/src/elastic_query_dsl/prefix_query.rs

@@ -14,23 +14,29 @@
 
 use serde::Deserialize;
 
-use crate::elastic_query_dsl::ConvertibleToQueryAst;
+use crate::elastic_query_dsl::{ConvertibleToQueryAst, StringOrStructForSerialization};
 use crate::elastic_query_dsl::one_field_map::OneFieldMap;
 use crate::query_ast::{QueryAst, WildcardQuery as AstWildcardQuery};
 
+#[derive(Deserialize, Clone, Eq, PartialEq, Debug)]
+#[serde(from = "OneFieldMap<StringOrStructForSerialization<PrefixQueryParams>>")]
+pub(crate) struct PrefixQuery {
+    pub(crate) field: String,
+    pub(crate) params: PrefixQueryParams,
+}
+
 #[derive(Deserialize, Debug, Default, Eq, PartialEq, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct PrefixQueryParams {
     value: String,
 }
 
-pub type PrefixQuery = OneFieldMap<PrefixQueryParams>;
 
 impl ConvertibleToQueryAst for PrefixQuery {
     fn convert_to_query_ast(self) -> anyhow::Result<QueryAst> {
         let wildcard = format!(
             "{}*",
-            self.value
+            self.params
                 .value
                 .replace("\\", "\\\\")
                 .replace("*", "\\*")
@@ -45,6 +51,28 @@ impl ConvertibleToQueryAst for PrefixQuery {
     }
 }
 
+impl From<OneFieldMap<StringOrStructForSerialization<PrefixQueryParams>>>
+    for PrefixQuery
+{
+    fn from(
+        match_query_params: OneFieldMap<StringOrStructForSerialization<PrefixQueryParams>>,
+    ) -> Self {
+        let OneFieldMap { field, value } = match_query_params;
+        PrefixQuery {
+            field,
+            params: value.inner,
+        }
+    }
+}
+
+impl From<String> for PrefixQueryParams {
+    fn from(value: String) -> PrefixQueryParams {
+        PrefixQueryParams {
+            value,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

quickwit/quickwit-query/src/elastic_query_dsl/wildcard_query.rs

@@ -14,29 +14,58 @@
 
 use serde::Deserialize;
 
-use crate::elastic_query_dsl::ConvertibleToQueryAst;
+use crate::elastic_query_dsl::{
+    ConvertibleToQueryAst, StringOrStructForSerialization,
+};
 use crate::elastic_query_dsl::one_field_map::OneFieldMap;
 use crate::query_ast::{QueryAst, WildcardQuery as AstWildcardQuery};
 
+#[derive(Deserialize, Clone, Eq, PartialEq, Debug)]
+#[serde(from = "OneFieldMap<StringOrStructForSerialization<WildcardQueryParams>>")]
+pub(crate) struct WildcardQuery {
+    pub(crate) field: String,
+    pub(crate) params: WildcardQueryParams,
+}
+
 #[derive(Deserialize, Debug, Default, Eq, PartialEq, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct WildcardQueryParams {
     value: String,
 }
 
-pub type WildcardQuery = OneFieldMap<WildcardQueryParams>;
-
 impl ConvertibleToQueryAst for WildcardQuery {
     fn convert_to_query_ast(self) -> anyhow::Result<QueryAst> {
         Ok(AstWildcardQuery {
             field: self.field,
-            value: self.value.value,
+            value: self.params.value,
             lenient: true,
         }
         .into())
     }
 }
 
+impl From<OneFieldMap<StringOrStructForSerialization<WildcardQueryParams>>>
+    for WildcardQuery
+{
+    fn from(
+        match_query_params: OneFieldMap<StringOrStructForSerialization<WildcardQueryParams>>,
+    ) -> Self {
+        let OneFieldMap { field, value } = match_query_params;
+        WildcardQuery {
+            field,
+            params: value.inner,
+        }
+    }
+}
+
+impl From<String> for WildcardQueryParams {
+    fn from(value: String) -> WildcardQueryParams {
+        WildcardQueryParams {
+            value,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

quickwit/rest-api-tests/scenarii/es_compatibility/0029-wildcard.yaml

@@ -17,3 +17,12 @@ expected:
   hits:
     total:
       value: 2
+---
+json:
+  query:
+    wildcard:
+      actor.login: jad?nk
+expected:
+  hits:
+    total:
+      value: 2

quickwit/rest-api-tests/scenarii/es_compatibility/0030-prefix.yaml

@@ -17,3 +17,12 @@ expected:
   hits:
     total:
       value: 10
+---
+json:
+  query:
+    prefix:
+      actor.login: jado
+expected:
+  hits:
+    total:
+      value: 2