RDBC-697 More refurbished legacy tests

Author: poissoncorp

ravendb/documents/operations/time_series.py

@@ -517,7 +517,11 @@ def __init__(self, key: str, values: Dict[str, List[TimeSeriesRangeResult]]):
     @classmethod
     def from_json(cls, json_dict: Dict[str, Any]) -> TimeSeriesDetails:
         return cls(
-            json_dict["Id"], {key: TimeSeriesRangeResult.from_json(value) for key, value in json_dict["Values"].items()}
+            json_dict["Id"],
+            {
+                key: [TimeSeriesRangeResult.from_json(value) for value in values]
+                for key, values in json_dict["Values"].items()
+            },
         )
 
 

ravendb/documents/session/document_session.py

@@ -1901,7 +1901,7 @@ def _serve_from_cache(
                     # we have all the range we need
                     # or that we have all the results we need in smaller range
 
-                    return self.chop_relevant_range(ranges[to_range_index], from_date, to_date, start, page_size)
+                    return self._chop_relevant_range(ranges[to_range_index], from_date, to_date, start, page_size)
 
                 from_range_index = to_range_index
                 continue
@@ -2060,22 +2060,23 @@ def _merge_ranges_with_results(
 
     @staticmethod
     def _chop_relevant_range(
-        self,
-        range: TimeSeriesRangeResult,
+        ts_range: TimeSeriesRangeResult,
         from_date: datetime.datetime,
         to_date: datetime.datetime,
         start: int,
         page_size: int,
-    ):
-        if range.entries is None:
+    ) -> List[TimeSeriesEntry]:
+        if ts_range.entries is None:
             return []
 
-        result = []
-        for value in range.entries:
+        results = []
+        for value in ts_range.entries:
             if value.timestamp > to_date:
                 break
+
             if value.timestamp < from_date:
                 continue
+
             start -= 1
             if start + 1 > 0:
                 continue
@@ -2084,9 +2085,9 @@ def _chop_relevant_range(
             if page_size + 1 <= 0:
                 break
 
-            result.append(value)
+            results.append(value)
 
-        return result
+        return results
 
     def _get_from_cache(
         self,

ravendb/tests/session_tests/test_time_series.py

@@ -0,0 +1,67 @@
+from ravendb.tests.test_base import TestBase, User
+from datetime import datetime, timedelta
+
+
+class TestTimeSeries(TestBase):
+    def setUp(self):
+        super().setUp()
+
+        with self.store.open_session() as session:
+            session.store(User("users/1-A", "Idan"))
+            session.save_changes()
+
+    def tearDown(self):
+        super().tearDown()
+
+    def test_time_series_append(self):
+        base = datetime.now()
+        with self.store.open_session() as session:
+            tsf = session.time_series_for("users/1-A", "HeartRate")
+            tsf.append_single(base, 70, "foo/bar")
+            tsf.append_single(base - timedelta(hours=3), 86, "foo/bazz")
+            session.save_changes()
+
+            time_series = tsf.get()
+            self.assertEqual(2, len(time_series))
+            self.assertEqual(86, time_series[0].value)
+            self.assertEqual(70, time_series[1].value)
+
+    def test_time_series_removal(self):
+        base = datetime.now()
+        with self.store.open_session() as session:
+            tsf = session.time_series_for("users/1-A", "HeartRate")
+            tsf.append_single(base, 70, "foo/bar")
+            session.save_changes()
+
+            time_series = tsf.get()
+            self.assertEqual(1, len(time_series))
+
+        with self.store.open_session() as session:
+            tsf = session.time_series_for("users/1-A", "HeartRate")
+            tsf.delete(base, datetime.max)
+            session.save_changes()
+
+            time_series = tsf.get()
+            self.assertIsNone(time_series)
+
+    def test_time_series_cache(self):
+        base = datetime.now()
+        with self.store.open_session() as session:
+            tsf = session.time_series_for("users/1-A", "HeartRate")
+            tsf.append_single(base + timedelta(minutes=5), 70, "foo/bar")
+            tsf.append_single(base + timedelta(hours=3), 71, "foo/barz")
+            tsf.append_single(base + timedelta(days=5), 72, "foo/barzz")
+
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            tsf = session.time_series_for("users/1-A", "HeartRate")
+            tsf.get(base, base + timedelta(hours=1))
+            tsf.get(base + timedelta(hours=2), base + timedelta(days=3))
+            tsf.get(base + timedelta(days=4), base + timedelta(days=6))
+            tsf.get(base + timedelta(days=3), base + timedelta(days=5))
+
+            self.assertEqual(session.advanced.number_of_requests, 4)
+
+            tsf.get(base + timedelta(days=2), base + timedelta(days=6))
+            self.assertEqual(session.advanced.number_of_requests, 4)