Ensure a snapshot exists before returning it (#11)

* We need to ensure a snapshot exists * Remove errant change in function signature * Addressing PR feedback
compnerd · Nov 27, 2023 · a960f53 · a960f53
1 parent 5cef2f9
commit a960f53
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Sources/FirebaseFirestore/DocumentReference+Swift.swift b/Sources/FirebaseFirestore/DocumentReference+Swift.swift
@@ -48,6 +48,7 @@ extension DocumentReference {
       future.Wait(firebase.FutureBase.kWaitTimeoutInfinite)
     }
 
+    guard snapshot.pointee.exists else { return nil }
     return snapshot.pointee.is_valid() ? snapshot.pointee : nil
   }
 

diff --git a/Sources/FirebaseFirestore/DocumentSnapshot+Swift.swift b/Sources/FirebaseFirestore/DocumentSnapshot+Swift.swift
@@ -21,6 +21,10 @@ extension DocumentSnapshot {
     swift_firebase.swift_cxx_shims.firebase.firestore.snapshot_reference(self)
   }
 
+  public var exists: Bool {
+    swift_firebase.swift_cxx_shims.firebase.firestore.snapshot_exists(self)
+  }
+
   public func data(with behavior: ServerTimestampBehavior) -> [String: Any]? {
     let data = swift_firebase.swift_cxx_shims.firebase.firestore.snapshot_get_data_workaround(self, behavior)
     return FirestoreDataConverter.value(workaround: data)

diff --git a/Sources/firebase/include/FirebaseFirestore.hh b/Sources/firebase/include/FirebaseFirestore.hh
@@ -64,6 +64,11 @@ snapshot_reference(const ::firebase::firestore::DocumentSnapshot snapshot) {
   return snapshot.reference();
 }
 
+inline bool
+snapshot_exists(const ::firebase::firestore::DocumentSnapshot &snapshot) {
+  return snapshot.exists();
+}
+
 #if SR69711
 struct MapFieldValue_Workaround {
   std::vector<std::string> keys;