fix: use correct name when reading legacy structured properties with names (#347)

Refs #345.

Author: cguardia

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

@@ -578,6 +578,9 @@ def new_entity(key):
 
         if prop is None and "." in name:
             supername, subname = name.split(".", 1)
+            # Code name for structured property could be different than stored
+            # name if ``name`` was set when defined.
+            supername = model_class._code_name_from_stored_name(supername)
             structprop = getattr(model_class, supername, None)
             if isinstance(structprop, StructuredProperty):
                 subvalue = value

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

@@ -1444,6 +1444,38 @@ class SomeKind(ndb.Model):
     assert results[0].foo == 1
 
 
+@pytest.mark.usefixtures("client_context")
+def test_query_legacy_repeated_structured_property_with_name(ds_entity):
+    class OtherKind(ndb.Model):
+        one = ndb.StringProperty()
+        two = ndb.StringProperty()
+        three = ndb.StringProperty()
+
+    class SomeKind(ndb.Model):
+        foo = ndb.IntegerProperty()
+        bar = ndb.StructuredProperty(OtherKind, "b", repeated=True)
+
+    entity_id = test_utils.system.unique_resource_id()
+    ds_entity(
+        KIND,
+        entity_id,
+        **{
+            "foo": 1,
+            "b.one": [u"pish", u"bish"],
+            "b.two": [u"posh", u"bosh"],
+            "b.three": [u"pash", u"bash"],
+        }
+    )
+
+    eventually(SomeKind.query().fetch, _length_equals(1))
+
+    query = SomeKind.query()
+
+    results = query.fetch()
+    assert len(results) == 1
+    assert results[0].bar[0].one == u"pish"
+
+
 @pytest.mark.usefixtures("client_context")
 def test_fetch_page_with_repeated_structured_property(dispose_of):
     """Regression test for Issue #254.

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

@@ -5321,6 +5321,38 @@ class ThisKind(model.Model):
         assert entity.baz[2].bar == "iminjail"
         assert entity.copacetic is True
 
+    @staticmethod
+    @pytest.mark.usefixtures("in_context")
+    def test_legacy_repeated_structured_property_with_name():
+        class OtherKind(model.Model):
+            foo = model.IntegerProperty()
+            bar = model.StringProperty()
+
+        class ThisKind(model.Model):
+            baz = model.StructuredProperty(OtherKind, "b", repeated=True)
+            copacetic = model.BooleanProperty()
+
+        key = datastore.Key("ThisKind", 123, project="testing")
+        datastore_entity = datastore.Entity(key=key)
+        datastore_entity.items = mock.Mock(
+            return_value=(
+                # Order counts for coverage
+                ("b.foo", [42, 144]),
+                ("b.bar", ["himom", "hellodad", "iminjail"]),
+                ("copacetic", True),
+            )
+        )
+
+        entity = model._entity_from_ds_entity(datastore_entity)
+        assert isinstance(entity, ThisKind)
+        assert entity.baz[0].foo == 42
+        assert entity.baz[0].bar == "himom"
+        assert entity.baz[1].foo == 144
+        assert entity.baz[1].bar == "hellodad"
+        assert entity.baz[2].foo is None
+        assert entity.baz[2].bar == "iminjail"
+        assert entity.copacetic is True
+
     @staticmethod
     @pytest.mark.usefixtures("in_context")
     def test_polymodel():