Fix support for array-like filter terms

finos · Aug 30, 2021 · 86b3798 · 86b3798
1 parent d65229c
commit 86b3798
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/rust/perspective-vieux/src/rust/config/view_config.rs b/rust/perspective-vieux/src/rust/config/view_config.rs
@@ -44,6 +44,9 @@ pub enum FilterOp {
     #[serde(rename = "in")]
     In,
 
+    #[serde(rename = "not in")]
+    NotIn,
+
     #[serde(rename = "begins with")]
     BeginsWith,
 
@@ -106,9 +109,17 @@ pub enum SortDir {
     ColAscAbs,
 }
 
+#[derive(Clone, Deserialize, Debug, PartialEq, Serialize)]
+#[serde(untagged)]
+pub enum FilterTerm {
+    Scalar(Scalar),
+    Array(Vec<Scalar>),
+}
+
 #[derive(Clone, Deserialize, Debug, PartialEq, Serialize)]
 #[serde()]
-pub struct Filter(String, FilterOp, Scalar);
+pub struct Filter(String, FilterOp, FilterTerm);
+
 
 #[derive(Clone, Deserialize, Debug, PartialEq, Serialize)]
 #[serde()]
@@ -379,7 +390,7 @@ mod tests {
             vec!(Filter(
                 "Test".to_owned(),
                 FilterOp::Contains,
-                Scalar::String("aaa".to_owned())
+                FilterTerm::Scalar(Scalar::String("aaa".to_owned()))
             ))
         );
     }
@@ -396,7 +407,7 @@ mod tests {
             vec!(Filter(
                 "Test".to_owned(),
                 FilterOp::LT,
-                Scalar::Float(4_f64)
+                FilterTerm::Scalar(Scalar::Float(4_f64))
             ))
         );
     }