RDBC-768 RavenDB_13452Test::canModifyDictionaryWithPatch_Remove

Author: poissoncorp

ravendb/documents/session/document_session.py

@@ -927,6 +927,8 @@ def patch_object(
             script_map = JavaScriptMap(self.__custom_count, path_to_object)
             self.__custom_count += 1
 
+            dictionary_adder(script_map)
+
             patch_request = PatchRequest()
             patch_request.script = script_map.script
             patch_request.values = script_map.parameters

ravendb/documents/session/misc.py

@@ -4,7 +4,7 @@
 import threading
 from abc import ABC
 from enum import Enum
-from typing import Union, Optional, TYPE_CHECKING, List, Dict
+from typing import Union, Optional, TYPE_CHECKING, List, Dict, Generic, TypeVar
 
 from ravendb.http.misc import LoadBalanceBehavior
 
@@ -18,6 +18,9 @@
     from ravendb.documents import DocumentStore
 
 
+_T_Key = TypeVar("_T_Key")
+_T_Value = TypeVar("_T_Value")
+
 class TransactionMode(Enum):
     SINGLE_NODE = "single_node"
     CLUSTER_WIDE = "cluster_wide"
@@ -210,33 +213,36 @@ def remove_at(self, index: int) -> JavaScriptArray:
         return self
 
 
-class JavaScriptMap:
+class JavaScriptMap(Generic[_T_Key, _T_Value]):
     def __init__(self, suffix: int, path_to_map: str):
-        self.__suffix = suffix
-        self.__path_to_map = path_to_map
-        self.__arg_counter = 0
-        self.__script_lines = []
-        self.__parameters: Dict[str, object] = {}
+        self._suffix = suffix
+        self._path_to_map = path_to_map
+        self._arg_counter = 0
+        self._script_lines = []
+        self._parameters: Dict[str, object] = {}
 
     @property
     def script(self) -> str:
-        return "\r".join(self.__script_lines)
+        return "\r".join(self._script_lines)
 
     @property
     def parameters(self) -> Dict[str, object]:
-        return self.__parameters
+        return self._parameters
 
-    def __get_next_argument_name(self) -> str:
-        self.__arg_counter += 1
-        return f"val_{self.__arg_counter - 1}_{self.__suffix}"
+    def _get_next_argument_name(self) -> str:
+        self._arg_counter += 1
+        return f"val_{self._arg_counter - 1}_{self._suffix}"
 
-    def put(self, key, value) -> JavaScriptMap:
-        argument_name = self.__get_next_argument_name()
+    def put(self, key: _T_Key, value:_T_Value) -> JavaScriptMap[_T_Key, _T_Value]:
+        argument_name = self._get_next_argument_name()
 
-        self.__script_lines.append(f"this.{self.__path_to_map}.{key} = args.{argument_name};")
+        self._script_lines.append(f"this.{self._path_to_map}.{key} = args.{argument_name};")
         self.parameters[argument_name] = value
         return self
 
+    def remove(self, key: _T_Key) -> JavaScriptMap[_T_Key, _T_Value]:
+        self._script_lines.append(f"delete this.{self._path_to_map}.{key};")
+
 
 class MethodCall(ABC):
     def __init__(self, args: List[object] = None, access_path: str = None):

ravendb/tests/jvm_migrated_tests/issues_tests/test_ravenDB_13452.py

@@ -0,0 +1,39 @@
+from typing import Dict
+
+from ravendb.tests.test_base import TestBase
+
+class Item:
+    def __init__(self, values: Dict[str, str] = None):
+        self.values = values
+
+class TestRavenDB13452(TestBase):
+    def setUp(self):
+        super().setUp()
+
+    def test_can_modify_dictionary_with_patch_remove(self):
+        with self.store.open_session() as session:
+            item = Item()
+            values = {}
+            item.values = values
+            values["Key1"] = "Value1"
+            values["Key2"] = "Value2"
+            values["Key3"] = "Value3"
+
+            session.store(item, "items/1")
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            item = session.load("items/1", Item)
+            session.advanced.patch_object(item, "values", lambda dict_: dict_.remove("Key2"))
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            item = session.load("items/1", dict)
+            values = item.get("values")
+            self.assertIsNotNone(values)
+            self.assertEqual(2, len(values))
+
+            self.assertEqual("Value1", values.get("Key1"))
+            self.assertEqual("Value3", values.get("Key3"))
+
+