spi-search:fix query_metrics.

ideal-world · Oct 17, 2023 · 4e07a20 · 4e07a20
1 parent bde1008
commit 4e07a20
Show file tree

Hide file tree

Showing 2 changed files with 409 additions and 49 deletions.
diff --git a/spi/spi-search/src/dto/search_item_dto.rs b/spi/spi-search/src/dto/search_item_dto.rs
@@ -249,7 +249,6 @@ pub struct SearchItemSearchResp {
 #[derive(poem_openapi::Object, Serialize, Deserialize, Debug)]
 pub struct SearchQueryMetricsReq {
     pub tag: String,
-    pub kind: String,
     pub select: Vec<SearchQueryMetricsSelectReq>,
     pub ignore_distinct: Option<bool>,
     pub group: Vec<SearchQueryDimensionGroupReq>,
@@ -260,10 +259,12 @@ pub struct SearchQueryMetricsReq {
     pub group_order: Option<Vec<SearchQueryDimensionGroupOrderReq>>,
     pub group_agg: Option<bool>,
     pub having: Option<Vec<SearchQueryMetricsHavingReq>>,
-    pub start_time: DateTime<Utc>,
-    pub end_time: DateTime<Utc>,
      // Search context for record permission filtering
      pub ctx: SearchItemSearchCtxReq,
+     // Search conditions
+    pub query: SearchItemQueryReq,
+    // Advanced search
+    pub adv_query: Option<Vec<AdvSearchItemQueryReq>>,
     pub limit: Option<u32>,
 }