RDBC-685 SessionCountersTest::sessionIncludeCountersShouldRegisterMissingCounters

Author: poissoncorp

ravendb/documents/session/in_memory_document_session_operations.py

@@ -459,7 +459,7 @@ def __init__(self, store: "DocumentStore", key: uuid.UUID, options: SessionOptio
         self._included_documents_by_id = CaseInsensitiveDict()
         self._documents_by_entity: DocumentsByEntityHolder = DocumentsByEntityHolder()
 
-        self._counters_by_doc_id: Dict[str, List[Dict[str, int]]] = {}
+        self._counters_by_doc_id: Dict[str, List[Dict[str, int]]] = CaseInsensitiveDict()
         self._time_series_by_doc_id: Dict[str, Dict[str, List[TimeSeriesRangeResult]]] = {}
 
         self._deleted_entities: Union[
@@ -1367,8 +1367,8 @@ def __register_missing_counters_for_keys(self, keys: List[str], counters_to_incl
 
         for counter in counters_to_include:
             for key in keys:
-                cache = self._counters_by_doc_id.get(key)
-                if not cache:
+                cache = self._counters_by_doc_id.get(key, None)
+                if cache is None:
                     cache = [False, CaseInsensitiveDict()]
                     self._counters_by_doc_id[key] = cache
 

ravendb/documents/session/loaders/include.py

@@ -117,6 +117,10 @@ def include_counter(self, *names: str) -> IncludeBuilderBase:
         self._include_counters("", [names] if isinstance(names, str) else names)
         return self
 
+    def include_counters(self, names: List[str]) -> IncludeBuilderBase:
+        self.include_counter(*names)
+        return self
+
     def include_all_counters(self) -> IncludeBuilderBase:
         self._include_all_counters("")
         return self

ravendb/tests/jvm_migrated_tests/client_tests/counters_tests/test_session_counters.py

@@ -781,3 +781,39 @@ def test_session_include_all_counters(self):
             self.assertIn(("downloads", 300), dic.items())
 
             self.assertEqual(1, session.advanced.number_of_requests)
+
+    def test_session_include_counters_should_register_missing_counters(self):
+        with self.store.open_session() as session:
+            session.store(Company(name="HR"), "companies/1-A")
+            session.store(Order(company="companies/1-A"), "orders/1-A")
+            session.counters_for("orders/1-A").increment("likes", 100)
+            session.counters_for("orders/1-A").increment("dislikes", 200)
+            session.counters_for("orders/1-A").increment("downloads", 300)
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            order = session.load(
+                "orders/1-A",
+                Order,
+                lambda i: i.include_documents("company")
+                .include_counters(["likes", "downloads", "dances"])
+                .include_counter("dislikes")
+                .include_counter("cats"),
+            )
+
+            company = session.load(order.company, Company)
+            self.assertEqual("HR", company.name)
+
+            # should not go to server
+            dic = session.counters_for_entity(order).get_all()
+            self.assertEqual(1, session.advanced.number_of_requests)
+
+            self.assertEqual(5, len(dic))
+            self.assertIn(("likes", 100), dic.items())
+            self.assertIn(("dislikes", 200), dic.items())
+            self.assertIn(("downloads", 300), dic.items())
+            self.assertIsNone(dic.get("dances"))
+            self.assertIsNone(dic.get("cats"))
+
+            self.assertEqual(1, session.advanced.number_of_requests)
+