RDBC-766 TimeSeriesDocumentQueryTest

Author: poissoncorp

ravendb/documents/queries/time_series.py

@@ -25,6 +25,7 @@ def __init__(self, count: Optional[int] = None, results: Optional[List[TimeSerie
 
     @classmethod
     def from_json(cls, json_dict: Dict[str, Any]) -> TimeSeriesQueryResult:
+        json_dict = json_dict["__timeSeriesQueryFunction"]
         return cls(
             json_dict["Count"],
             [TimeSeriesEntry.from_json(time_series_entry_json) for time_series_entry_json in json_dict["Results"]],

ravendb/documents/session/query.py

@@ -1749,10 +1749,10 @@ def __init__(
         )
 
     def select_time_series(
-        self, ts_bindable_object_type: Type[_T_TS_Bindable], time_series_query: Callable[[TimeSeriesQueryBuilder], None]
+        self, projection_class: Type[_T_TS_Bindable], time_series_query: Callable[[TimeSeriesQueryBuilder], None]
     ) -> DocumentQuery[_T_TS_Bindable]:
         query_data = self._create_time_series_query_data(time_series_query)
-        return self.select_fields_query_data(ts_bindable_object_type, query_data)
+        return self.select_fields_query_data(projection_class, query_data)
 
     def distinct(self) -> DocumentQuery[_T]:
         self._distinct()

ravendb/tests/jvm_migrated_tests/client_tests/time_series_tests/test_time_series_document_query.py

@@ -0,0 +1,111 @@
+from datetime import timedelta
+
+from ravendb.documents.queries.time_series import TimeSeriesAggregationResult, TimeSeriesRawResult
+from ravendb.infrastructure.entities import User
+from ravendb.tests.test_base import TestBase
+from ravendb.tools.raven_test_helper import RavenTestHelper
+
+
+class TestTimeSeriesDocumentQuery(TestBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_can_query_time_series_using_document_query(self):
+        base_line = RavenTestHelper.utc_today()
+
+        with self.store.open_session() as session:
+            user = User(name="Oren", age=35)
+            session.store(user, "users/ayende")
+
+            tsf = session.time_series_for("users/ayende", "Heartrate")
+            tsf.append_single(base_line + timedelta(minutes=61), 59, "watches/fitbit")
+            tsf.append_single(base_line + timedelta(minutes=62), 79, "watches/apple")
+            tsf.append_single(base_line + timedelta(minutes=63), 69, "watches/fitbit")
+
+            tsf.append(base_line + timedelta(days=31, minutes=61), [159], "watches/apple")
+            tsf.append(base_line + timedelta(days=31, minutes=62), [179], "watches/apple")
+            tsf.append(base_line + timedelta(days=31, minutes=63), [169], "watches/fitbit")
+
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            ts_query_text = (
+                "from Heartrate between $start and $end\n"
+                "where Tag = 'watches/fitbit'\n"
+                "group by '1 month'\n"
+                "select min(), max(), avg()"
+            )
+
+            query = (
+                session.advanced.document_query(object_type=User)
+                .where_greater_than("age", 21)
+                .select_time_series(TimeSeriesAggregationResult, lambda b: b.raw(ts_query_text))
+                .add_parameter("start", base_line)
+                .add_parameter("end", base_line + timedelta(days=92))
+            )
+
+            result = list(query)
+
+            self.assertEqual(1, len(result))
+            self.assertEqual(3, result[0].count)
+
+            agg = result[0].results
+            self.assertEqual(2, len(agg))
+
+            self.assertEqual(69, agg[0].max[0])
+            self.assertEqual(59, agg[0].min[0])
+            self.assertEqual(64, agg[0].average[0])
+
+            self.assertEqual(169, agg[1].max[0])
+            self.assertEqual(169, agg[1].min[0])
+            self.assertEqual(169, agg[1].average[0])
+
+    def test_can_query_time_series_raw_values_using_document_query(self):
+        base_line = RavenTestHelper.utc_today()
+
+        with self.store.open_session() as session:
+            user = User(name="Oren", age=35)
+            session.store(user, "users/ayende")
+
+            tsf = session.time_series_for("users/ayende", "Heartrate")
+            tsf.append_single(base_line + timedelta(minutes=61), 59, "watches/fitbit")
+            tsf.append_single(base_line + timedelta(minutes=62), 79, "watches/apple")
+            tsf.append_single(base_line + timedelta(minutes=63), 69, "watches/fitbit")
+
+            tsf.append(base_line + timedelta(days=31, minutes=61), [159], "watches/apple")
+            tsf.append(base_line + timedelta(days=31, minutes=62), [179], "watches/apple")
+            tsf.append(base_line + timedelta(days=31, minutes=63), [169], "watches/fitbit")
+
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            ts_query_text = "from Heartrate between $start and $end\n" "where Tag = 'watches/fitbit'"
+
+            query = (
+                session.advanced.document_query(object_type=User)
+                .where_greater_than("age", 21)
+                .select_time_series(TimeSeriesRawResult, lambda b: b.raw(ts_query_text))
+                .add_parameter("start", base_line)
+                .add_parameter("end", base_line + timedelta(days=92))
+            )
+
+            result = list(query)
+
+            self.assertEqual(1, len(result))
+            self.assertEqual(3, result[0].count)
+
+            values = result[0].results
+
+            self.assertEqual(3, len(values))
+
+            self.assertEqual([59], values[0].values)
+            self.assertEqual("watches/fitbit", values[0].tag)
+            self.assertEqual(base_line + timedelta(minutes=61), values[0].timestamp)
+
+            self.assertEqual([69], values[1].values)
+            self.assertEqual("watches/fitbit", values[1].tag)
+            self.assertEqual(base_line + timedelta(minutes=63), values[1].timestamp)
+
+            self.assertEqual([169], values[2].values)
+            self.assertEqual("watches/fitbit", values[2].tag)
+            self.assertEqual(base_line + timedelta(minutes=63, days=31), values[2].timestamp)