fix: include ancestors in Key.to_legacy_urlsafe (#494)

Chris Rossi · web-flow · commit f482e9c42557 · 2020-07-23T16:46:02.000-04:00
Fixes #478.
diff --git a/packages/google-cloud-ndb/google/cloud/ndb/key.py b/packages/google-cloud-ndb/google/cloud/ndb/key.py
@@ -759,10 +759,8 @@ def to_legacy_urlsafe(self, location_prefix):
             b'aglzfmV4YW1wbGVyCwsSBEtpbmQYuQoM'
         """
         return google.cloud.datastore.Key(
-            self._key.kind,
-            self._key.id or self._key.name,
-            namespace=self._key.namespace,
-            project=self._key.project,
+            *self.flat(),
+            **{"namespace": self._key.namespace, "project": self._key.project}
         ).to_legacy_urlsafe(location_prefix=location_prefix)
 
     @_options.ReadOptions.options
diff --git a/packages/google-cloud-ndb/tests/unit/test_key.py b/packages/google-cloud-ndb/tests/unit/test_key.py
@@ -586,6 +586,18 @@ def test_to_legacy_urlsafe_name():
             == b"agNzfmZyCAsSAWQiAXgM"
         )
 
+    @staticmethod
+    @pytest.mark.usefixtures("in_context")
+    def test_to_legacy_urlsafe_w_ancestor():
+        """Regression test for #478.
+
+        https://github.com/googleapis/python-ndb/issues/478
+        """
+        key = key_module.Key("d", 123, "e", 234, app="f")
+        urlsafe = key.to_legacy_urlsafe(location_prefix="s~")
+        key2 = key_module.Key(urlsafe=urlsafe)
+        assert key == key2
+
     @staticmethod
     @pytest.mark.usefixtures("in_context")
     @mock.patch("google.cloud.ndb._datastore_api")
