improved snapshot parsing

Author: daniel-sanche

google/cloud/firestore_v1/base_query.py

@@ -929,9 +929,8 @@ def _normalize_cursor(self, cursor, orders) -> Tuple[List, bool] | None:
 
         if isinstance(document_fields, document.DocumentSnapshot):
             snapshot = document_fields
-            document_fields = snapshot.to_dict()
-            if document_fields is not None:
-                document_fields["__name__"] = snapshot.reference
+            document_fields = copy.deepcopy(snapshot._data)
+            document_fields["__name__"] = snapshot.reference
 
         if isinstance(document_fields, dict):
             # Transform to list using orders

tests/unit/v1/test_base_query.py

@@ -1399,6 +1399,16 @@ def test_basequery__normalize_cursor_as_snapshot_hit():
 
     assert query._normalize_cursor(cursor, query._orders) == ([1], True)
 
+def test_basequery__normalize_cursor_non_existant_snapshot():
+    from google.cloud.firestore_v1 import document
+    values = {"b": 1}
+    docref = _make_docref("here", "doc_id")
+    snapshot = document.DocumentSnapshot(docref, values, False, None, None, None)
+    cursor = (snapshot, True)
+    collection = _make_collection("here")
+    query = _make_base_query(collection).order_by("b", "ASCENDING")
+
+    assert query._normalize_cursor(cursor, query._orders) == ([1], True)
 
 def test_basequery__normalize_cursor_w___name___w_reference():
     db_string = "projects/my-project/database/(default)"