Datastore: id from googleapis#3832 pull request with unit test (googleapis#4640)

chemelnucfin · web-flow · commit ff818ba91e00 · 2017-12-20T15:12:29.000-08:00
diff --git a/datastore/google/cloud/datastore/entity.py b/datastore/google/cloud/datastore/entity.py
@@ -183,6 +183,22 @@ def kind(self):
         if self.key:
             return self.key.kind
 
+    @property
+    def id(self):
+        """Get the ID of the current entity.
+
+        .. note::
+
+            This relies entirely on the :class:`google.cloud.datastore.key.Key`
+            set on the entity.  That means that we're not storing the ID
+            of the entity at all, just the properties and a pointer to a
+            Key which knows its ID.
+        """
+        if self.key is None:
+            return None
+        else:
+            return self.key.id
+
     def __repr__(self):
         if self.key:
             return '<Entity%s %s>' % (self.key._flat_path,
diff --git a/datastore/tests/unit/test_entity.py b/datastore/tests/unit/test_entity.py
@@ -192,6 +192,19 @@ def test__eq__same_value_different_meanings(self):
 
         self.assertFalse(entity1 == entity2)
 
+    def test_id(self):
+        from google.cloud.datastore.key import Key
+
+        key = Key(_KIND, _ID, project=_PROJECT)
+        entity = self._make_one(key=key)
+        self.assertEqual(entity.id,  _ID)
+
+    def test_id_none(self):
+        from google.cloud.datastore.key import Key
+
+        entity = self._make_one(key=None)
+        self.assertEqual(entity.id,  None)
+
     def test___repr___no_key_empty(self):
         entity = self._make_one()
         self.assertEqual(repr(entity), '<Entity {}>')
