fix error retrieving values for properties with different stored name (#187)

Author: cguardia

packages/google-cloud-ndb/google/cloud/ndb/model.py

@@ -547,6 +547,10 @@ def _entity_from_ds_entity(ds_entity, model_class=None):
         entity._key = key_module.Key._from_ds_key(ds_entity.key)
 
     for name, value in ds_entity.items():
+        # If ``name`` was used to define the property, ds_entity name will not
+        # match model property name.
+        name = model_class._code_name_from_stored_name(name)
+
         prop = getattr(model_class, name, None)
 
         # Backwards compatibility shim. NDB previously stored structured
@@ -5678,6 +5682,15 @@ def _to_dict(self, include=None, *, exclude=None):
 
     to_dict = _to_dict
 
+    @classmethod
+    def _code_name_from_stored_name(cls, name):
+        """Return the code name from a property when it's different from the
+        stored name. Used in deserialization from datastore."""
+        if name in cls._properties:
+            if name != cls._properties[name]._code_name:
+                name = cls._properties[name]._code_name
+        return name
+
     @classmethod
     def _pre_allocate_ids_hook(cls, size, max, parent):
         pass

packages/google-cloud-ndb/tests/system/test_crud.py

@@ -228,6 +228,25 @@ class SomeKind(ndb.Model):
     dispose_of(key._key)
 
 
+@pytest.mark.usefixtures("client_context")
+def test_insert_entity_with_stored_name_property(dispose_of, ds_client):
+    class SomeKind(ndb.Model):
+        foo = ndb.StringProperty()
+        bar = ndb.StringProperty(name="notbar")
+
+    entity = SomeKind(foo="something", bar="or other")
+    key = entity.put()
+
+    retrieved = key.get()
+    assert retrieved.foo == "something"
+    assert retrieved.bar == "or other"
+
+    ds_entity = ds_client.get(key._key)
+    assert ds_entity["notbar"] == "or other"
+
+    dispose_of(key._key)
+
+
 @pytest.mark.usefixtures("client_context")
 def test_insert_roundtrip_naive_datetime(dispose_of, ds_client):
     class SomeKind(ndb.Model):

packages/google-cloud-ndb/tests/unit/test_model.py

@@ -4717,6 +4717,15 @@ class Simple(model.Model):
         entity = Simple(foo=3, bar="baz", projection=("foo",))
         assert entity.to_dict() == {"foo": 3}
 
+    @staticmethod
+    def test__code_name_from_stored_name():
+        class Simple(model.Model):
+            foo = model.StringProperty()
+            bar = model.StringProperty(name="notbar")
+
+        assert Simple._code_name_from_stored_name("foo") == "foo"
+        assert Simple._code_name_from_stored_name("notbar") == "bar"
+
 
 class Test_entity_from_protobuf:
     @staticmethod