Fixed request colelctions and documents.

Author: ivanvorobei

README.md

@@ -1,9 +1,23 @@
 # Firewrap (Firebase Wrapper) 
 
-- Auth
-- Analytics
-- Remote Config ✅
+## Database
 
-## Todo
+```swift
+// Make document
+let document = FirewrapDocument("/example1/doc-example")
 
-Examples calls for modules
+
+document.get { data in
+    // Get data once
+}
+
+document.observe { data in
+    Observe data
+}
+```
+
+## Analytics
+
+## Auth
+
+## Remote Config

Sources/FirewrapAuth/FirewrapAuth.swift

@@ -8,16 +8,18 @@ import SwiftBoost
 public class FirewrapAuth {
 
     public static func configure(authDidChangedWork: (() -> Void)? = nil) {
+        
         // Logs
-        printConsole("Configure...")
-        printConsole("Current state isAuthed: " + (isAuthed ? "true" : "false"))
+        printConsole("Start configure. Current state isAuthed: " + (isAuthed ? "true" : "false"))
         if isAuthed {
-            printConsole("userID: \(userID ?? .empty), email: \(userEmail ?? "nil")")
+            printConsole("User info: userID: \(userID ?? .empty), email: \(userEmail ?? "nil")")
         }
+        
         // Observer Clean
         if let observer = shared.observer {
             Auth.auth().removeStateDidChangeListener(observer)
         }
+        
         // Configure Observer
         shared.observer = Auth.auth().addStateDidChangeListener { auth, user in
             let newState = isAuthed
@@ -27,6 +29,7 @@ public class FirewrapAuth {
                 isAuthedStored = newState
             }
         }
+        
         printConsole("Configure Complete")
     }
 

Sources/FirewrapDatabase/FirewrapCollection.swift

@@ -3,19 +3,48 @@ import FirebaseFirestore
 
 class FirewrapCollection {
 
-    func getDocument(id: String) -> FirewrapDocument? {
-        return nil
+    public let path: String
+    private var listener: ListenerRegistration?
+    
+    public init(_ path: String) {
+        self.path = path
     }
 
-    func getDocument(where field: String, equal: Any) -> FirewrapDocument? {
-        return nil
+    // MARK: - Getter
+    
+    func getDocuments(_ source: FirewrapSource = .default, completion: @escaping (([[String : Any]]?) -> Void)) {
+        let db = Firestore.firestore()
+        db.collection(path).getDocuments(source: source.firebaseValue) { snapshot, error in
+            guard error == nil, let documents = snapshot?.documents else {
+                completion(nil)
+                return
+            }
+            completion(documents.map({ $0.data() }))
+        }
     }
 
-    func getDocuments() -> [FirewrapDocument]? {
-        return nil
+    func getDocument(_ source: FirewrapSource = .default, where field: String, equal: [Any], completion: @escaping (([[String : Any]]?) -> Void)) {
+        let db = Firestore.firestore()
+        db.collection(path).whereField(field, in: equal).getDocuments(source: source.firebaseValue) { snapshot, error in
+            guard error == nil, let documents = snapshot?.documents else {
+                completion(nil)
+                return
+            }
+            completion(documents.map({ $0.data() }))
+        }
     }
 
-    func observe(_ handler: () -> Void) {
-        
+    // MARK: - Observer
+    
+    func observe(_ handler: @escaping ([[String : Any]]?) -> Void) {
+        self.listener?.remove()
+        let db = Firestore.firestore()
+        self.listener = db.collection(path).addSnapshotListener { snapshot, error in
+            guard error == nil, let documents = snapshot?.documents else {
+                handler(nil)
+                return
+            }
+            handler(documents.map({ $0.data() }))
+        }
     }
 }

Sources/FirewrapDatabase/FirewrapDocument.swift

@@ -1,53 +1,57 @@
 import Foundation
 import FirebaseFirestore
 
-public enum FWFirestoreSource {
-    
-    case `default`
-    case server
-    case cache
-    
-    var firebaseValue: FirestoreSource {
-        switch self {
-        case .default: return .default
-        case .server: return .server
-        case .cache: return .cache
-        }
-    }
-}
-
 public class FirewrapDocument {
 
     public let path: String
+    private var listener: ListenerRegistration?
 
     public init(_ path: String) {
         self.path = path
     }
 
-    public func set(_ data: [String : Any], merge: Bool) {
-        let db = Firestore.firestore()
-        db.document(path).setData(data, merge: merge)
-    }
+    // MARK: - Getter
 
-    public func get(_ source: FWFirestoreSource = .default, completion: @escaping (([String : Any]?) -> Void)) {
+    public func get(_ source: FirewrapSource = .default, completion: @escaping (([String : Any]?) -> Void)) {
         let db = Firestore.firestore()
         db.document(path).getDocument(source: source.firebaseValue) { document, error in
-            if error == nil {
+            guard error == nil else {
                 completion(nil)
                 return
             }
             completion(document?.data())
         }
     }
 
+    // MARK: - Setter
+    
+    public func set(_ data: [String : Any], merge: Bool) {
+        let db = Firestore.firestore()
+        db.document(path).setData(data, merge: merge)
+    }
+    
     public func delete(_ completion: @escaping (Bool) -> Void) {
         let db = Firestore.firestore()
         db.document(path).delete { error in
             completion(error == nil)
         }
     }
 
-    public func observe(_ handler: () -> Void) {
-        
+    // MARK: - Observer
+    
+    public func observe(_ handler: @escaping (([String : Any]?) -> Void)) {
+        self.listener?.remove()
+        let db = Firestore.firestore()
+        self.listener = db.document(path).addSnapshotListener { document, error in
+            if let document, let data = document.data() {
+                handler(data)
+            } else {
+                handler(nil)
+            }
+        }
+    }
+    
+    public func removeObserver() {
+        self.listener?.remove()
     }
 }