feat: cell reader writer test and improv

Author: speed2exe

collab-database/src/fields/type_option/number_type_option.rs

@@ -68,7 +68,7 @@ impl From<NumberTypeOption> for TypeOptionData {
 impl TypeOptionCellReader for NumberTypeOption {
   fn json_cell(&self, cell: &Cell) -> Value {
     // Returns the formated number string.
-    Value::String(self.stringify_cell(cell))
+    self.stringify_cell(cell).into()
   }
 
   fn numeric_cell(&self, cell: &Cell) -> Option<f64> {
@@ -763,6 +763,10 @@ impl NumberFormat {
 
 #[cfg(test)]
 mod tests {
+  use collab::util::AnyMapExt;
+
+  use crate::template::entity::CELL_DATA;
+
   use super::*;
   /// Testing when the input is not a number.
   #[test]
@@ -831,4 +835,34 @@ mod tests {
     let output = type_option.convert_raw_cell_data(input_str);
     assert_eq!(output, expected_str.to_owned());
   }
+
+  #[test]
+  fn number_cell_to_serde() {
+    let number_type_option = NumberTypeOption::default();
+    let cell_writer: Box<dyn TypeOptionCellReader> = Box::new(number_type_option);
+    {
+      let mut cell: Cell = new_cell_builder(FieldType::RichText);
+      cell.insert(CELL_DATA.into(), "42".into());
+      let serde_val = cell_writer.json_cell(&cell);
+      assert_eq!(serde_val, Value::String("42".into()));
+    }
+  }
+
+  #[test]
+  fn number_serde_to_cell() {
+    let number_type_option = NumberTypeOption::default();
+    let cell_writer: Box<dyn TypeOptionCellWriter> = Box::new(number_type_option);
+    {
+      // js string
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::String("42.195".to_string()));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, "42.195");
+    }
+    {
+      // js number
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::Number(10.into()));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, "10");
+    }
+  }
 }

collab-database/src/fields/type_option/select_type_option.rs

@@ -614,7 +614,7 @@ mod tests {
   }
 
   #[test]
-  fn test_single_select_option_serialization() {
+  fn single_select_cell_to_serde() {
     let options = vec![SelectOption::new("Option 1"), SelectOption::new("Option 2")];
     let option_1_id = options[0].id.clone();
     let select_type_option = SelectTypeOption {
@@ -630,7 +630,7 @@ mod tests {
   }
 
   #[test]
-  fn test_multi_select_option_serialization() {
+  fn multi_select_cell_to_serde() {
     let options = vec![SelectOption::new("Option 1"), SelectOption::new("Option 2")];
     let option_1_id = options[0].id.clone();
     let option_2_id = options[1].id.clone();
@@ -640,13 +640,13 @@ mod tests {
     };
 
     let multi_selection_type_option = MultiSelectTypeOption(select_type_option);
-    let single_select_cell_reader: Box<dyn TypeOptionCellReader> =
+    let multi_select_cell_reader: Box<dyn TypeOptionCellReader> =
       Box::new(multi_selection_type_option);
     {
       // single select
       let mut cell: Cell = new_cell_builder(FieldType::MultiSelect);
       cell.insert(CELL_DATA.into(), option_1_id.clone().into());
-      let serde_val = single_select_cell_reader.json_cell(&cell);
+      let serde_val = multi_select_cell_reader.json_cell(&cell);
       assert_eq!(
         serde_val,
         Value::Array(vec![Value::String("Option 1".to_string())])
@@ -656,7 +656,7 @@ mod tests {
       // double select
       let mut cell: Cell = new_cell_builder(FieldType::MultiSelect);
       cell.insert(CELL_DATA.into(), (option_1_id + "," + &option_2_id).into());
-      let serde_val = single_select_cell_reader.json_cell(&cell);
+      let serde_val = multi_select_cell_reader.json_cell(&cell);
       assert_eq!(
         serde_val,
         Value::Array(vec![
@@ -668,8 +668,62 @@ mod tests {
     {
       // no select
       let cell: Cell = new_cell_builder(FieldType::MultiSelect);
-      let serde_val = single_select_cell_reader.json_cell(&cell);
+      let serde_val = multi_select_cell_reader.json_cell(&cell);
       assert_eq!(serde_val, Value::Array(vec![]));
     }
   }
+
+  #[test]
+  fn single_select_serde_to_cell() {
+    let options = vec![SelectOption::new("Option 1"), SelectOption::new("Option 2")];
+    let option_1_id = options[0].id.clone();
+    let select_type_option = SelectTypeOption {
+      options,
+      disable_color: false,
+    };
+    let single_select = SingleSelectTypeOption(select_type_option);
+
+    let cell_writer: Box<dyn TypeOptionCellWriter> = Box::new(single_select);
+    {
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::String("Option 1".to_string()));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, option_1_id);
+    }
+  }
+
+  #[test]
+  fn multi_select_serde_to_cell() {
+    let options = vec![SelectOption::new("Option 1"), SelectOption::new("Option 2")];
+    let option_1_id = options[0].id.clone();
+    let option_2_id = options[1].id.clone();
+    let select_type_option = SelectTypeOption {
+      options,
+      disable_color: false,
+    };
+    let single_select = SingleSelectTypeOption(select_type_option);
+
+    let cell_writer: Box<dyn TypeOptionCellWriter> = Box::new(single_select);
+    {
+      // No select
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::Array(vec![]));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, "");
+    }
+    {
+      // 1 select
+      let cell: Cell =
+        cell_writer.convert_json_to_cell(Value::Array(vec![Value::String("Option 1".to_string())]));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, option_1_id);
+    }
+    {
+      // 2 select
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::Array(vec![
+        Value::String("Option 1".to_string()),
+        Value::String("Option 2".to_string()),
+      ]));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, option_1_id + "," + &option_2_id);
+    }
+  }
 }

collab-database/src/fields/type_option/text_type_option.rs

@@ -27,7 +27,14 @@ impl TypeOptionCellReader for RichTextTypeOption {
 impl TypeOptionCellWriter for RichTextTypeOption {
   fn convert_json_to_cell(&self, json_value: Value) -> Cell {
     let mut cell = new_cell_builder(FieldType::RichText);
-    cell.insert(CELL_DATA.into(), json_value.to_string().into());
+    match json_value {
+      Value::String(value_str) => {
+        cell.insert(CELL_DATA.into(), value_str.into());
+      },
+      _ => {
+        cell.insert(CELL_DATA.into(), json_value.to_string().into());
+      },
+    }
     cell
   }
 }
@@ -43,3 +50,40 @@ impl From<RichTextTypeOption> for TypeOptionData {
     TypeOptionDataBuilder::new()
   }
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use collab::util::AnyMapExt;
+  use serde_json::Value;
+
+  #[test]
+  fn rich_text_cell_to_serde() {
+    let rich_text_type_option = RichTextTypeOption {};
+    let cell_writer: Box<dyn TypeOptionCellReader> = Box::new(rich_text_type_option);
+    {
+      let mut cell: Cell = new_cell_builder(FieldType::RichText);
+      cell.insert(CELL_DATA.into(), "helloworld".into());
+      let serde_val = cell_writer.json_cell(&cell);
+      assert_eq!(serde_val, Value::String("helloworld".to_string()));
+    }
+  }
+
+  #[test]
+  fn rich_text_serde_to_cell() {
+    let rich_text_type_option = RichTextTypeOption {};
+    let cell_writer: Box<dyn TypeOptionCellWriter> = Box::new(rich_text_type_option);
+    {
+      // js string
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::String("helloworld".to_string()));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, "helloworld");
+    }
+    {
+      // js number
+      let cell: Cell = cell_writer.convert_json_to_cell(Value::Number(10.into()));
+      let data = cell.get_as::<String>(CELL_DATA).unwrap();
+      assert_eq!(data, "10");
+    }
+  }
+}