RDBC-812 Adjustments and test for docs loaded as dicts

Author: poissoncorp

ravendb/documents/identity/hilo.py

@@ -46,7 +46,7 @@ def try_set_identity(self, entity: object, key: str, is_projection: bool = False
         self.__try_set_identity_internal(entity, key, is_projection)
 
     def __try_set_identity_internal(self, entity: Union[object, dict], key: str, is_projection: bool = False) -> None:
-        identity_property = "Id"  # todo: make sure it's ok, create get_identity_property...
+        identity_property = "Id"  # todo: get_identity_property...
 
         if identity_property is None:
             return
@@ -55,7 +55,7 @@ def __try_set_identity_internal(self, entity: Union[object, dict], key: str, is_
             # identity property was already set
             return
 
-        if type(entity) == dict:
+        if isinstance(entity, dict):
             entity[identity_property] = key
             return
         entity.__setattr__(identity_property, key)

ravendb/documents/session/entity_to_json.py

@@ -192,9 +192,10 @@ def convert_to_entity_static(
                 BeforeConversionToEntityEventArgs(session_hook, key, object_type, document_deepcopy)
             )
 
-        # 1.1 Check if passed object type (or extracted from metadata) is a dictionary
-        if object_type == dict or type_from_metadata == "builtins.dict":
+        # 1.1 Check if passed object type (or extracted from metadata) is a dictionary and if document isn't a dict
+        if object_type == dict or (object_type is None and type_from_metadata == "builtins.dict"):
             EntityToJson._invoke_after_conversion_to_entity_event(session_hook, key, object_type, document_deepcopy)
+            # todo: document_deepcopy["Id"] = metadata.get("@id", None) - consider adding id property
             return document_deepcopy
 
         # 1.2 If there's no object type in metadata
@@ -211,8 +212,12 @@ def convert_to_entity_static(
         # 2. There was a type in the metadata
         else:
             object_from_metadata = Utils.import_class(type_from_metadata)
+
+            # 2.0 Check if the user wants to cast dict to type
+            if object_from_metadata == dict and object_type != dict:
+                pass
             # 2.1 Import was successful
-            if object_from_metadata is not None:
+            elif object_from_metadata is not None:
                 # 2.1.1 Set object_type to successfully imported type/ from metadata inherits from passed object_type
                 if object_type is None or Utils.is_inherit(object_type, object_from_metadata):
                     object_type = object_from_metadata

ravendb/tests/issue_tests/test_issue_198.py

@@ -80,3 +80,29 @@ def test_preserve_id_field(self):
             company = session.load("companies/222", Company)
             self.assertEqual("companies/222", company.Id)
             self.assertEqual("Apple Inc.", company.name)
+
+    def test_docs_loaded_as_dictionary_dont_have_id_entry_and_its_id_is_available_via_metadata(self):
+        with self.store.open_session() as session:
+            company = Company(Id="companies/1", name="A Inc.")
+            company_dict = {"Id": "companies/dict", "name": "Dict Inc."}
+            session.store(company)
+            session.store(company_dict)
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            company = session.load("companies/1", Company)
+            company_dict = session.load("companies/dict", dict)
+
+            self.assertNotIn("Id", company_dict)
+            self.assertEqual("companies/dict", session.advanced.get_document_id(company_dict))
+            self.assertEqual("companies/dict", session.advanced.get_metadata_for(company_dict)["@id"])
+
+            self.assertEqual("companies/1", company.Id)
+            self.assertEqual("companies/1", session.advanced.get_document_id(company))
+            self.assertEqual("companies/1", session.advanced.get_metadata_for(company)["@id"])
+
+        with self.store.open_session() as session:
+            company_dict_as_company_object = session.load("companies/dict", Company)
+            self.assertEqual("companies/dict", company_dict_as_company_object.Id)
+            self.assertEqual("companies/dict", session.advanced.get_document_id(company_dict_as_company_object))
+            self.assertEqual("companies/dict", session.advanced.get_metadata_for(company_dict_as_company_object)["@id"])