Firestore anytime soon? #507 (where.where)

EddyVerbruggen · Nov 27, 2017 · 8406397 · 8406397
1 parent 68a7887
commit 8406397
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 30 deletions.
diff --git a/demo-ng/app/item/items.component.html b/demo-ng/app/item/items.component.html
@@ -10,6 +10,7 @@
   <Button text="Set (auto id)" (tap)="firestoreSetByAutoID()" class="button"></Button>
   <Button text="Update" (tap)="firestoreUpdate()" class="button"></Button>
   <Button text="Get" (tap)="firestoreGet()" class="button"></Button>
+  <Button text="Where" (tap)="firestoreWhere()" class="button"></Button>
   <Button text="Delete" (tap)="firestoreDelete()" class="button"></Button>
 
 </StackLayout>
diff --git a/demo-ng/app/item/items.component.ts b/demo-ng/app/item/items.component.ts
@@ -62,7 +62,7 @@ export class ItemsComponent implements OnInit {
 
     citiesRef.doc("DC").set({
       name: "Washington, D.C.",
-      state: null,
+      state: "WA",
       country: "USA",
       capital: true,
       population: 680000
@@ -114,7 +114,7 @@ export class ItemsComponent implements OnInit {
         .catch(err => console.log("Get failed, error" + err));
 
     // examples from https://firebase.google.com/docs/firestore/query-data/get-data
-    const docRef: firestore.DocumentReference = firebase.firestore().collection("cities").doc("SF");
+    const docRef: firestore.DocumentReference = firebase.firestore().collection("cities").doc("BJ");
 
     docRef.get().then((doc: firestore.DocumentSnapshot) => {
       if (doc.exists) {
@@ -125,9 +125,12 @@ export class ItemsComponent implements OnInit {
     }).catch(function (error) {
       console.log("Error getting document:", error);
     });
+  }
 
+  public firestoreWhere(): void {
     const query: firestore.Query = firebase.firestore().collection("cities")
-        .where("capital", "==", true);
+        .where("state", "==", "CA")
+        .where("population", "<", 1000000);
 
     query
         .get()

diff --git a/src/firebase.android.ts b/src/firebase.android.ts
@@ -2479,28 +2479,26 @@ firebase.firestore.getDocument = (collectionPath: string, documentPath: string):
   });
 };
 
-firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: firestore.WhereFilterOp, value: any): firestore.Query => {
+firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: firestore.WhereFilterOp, value: any, query?: com.google.firebase.firestore.Query): firestore.Query => {
   try {
     if (typeof(com.google.firebase.firestore) === "undefined") {
       console.log("Make sure firebase-firestore is in the plugin's include.gradle");
       return null;
     }
 
     const db = com.google.firebase.firestore.FirebaseFirestore.getInstance();
-    const colRef: com.google.firebase.firestore.CollectionReference = db.collection(collectionPath);
-
-    let query: com.google.firebase.firestore.Query;
+    query = query || db.collection(collectionPath);
 
     if (opStr === "<") {
-      query = colRef.whereLessThan(fieldPath, firebase.toValue(value));
+      query = query.whereLessThan(fieldPath, firebase.toValue(value));
     } else if (opStr === "<=") {
-      query = colRef.whereLessThanOrEqualTo(fieldPath, firebase.toValue(value));
+      query = query.whereLessThanOrEqualTo(fieldPath, firebase.toValue(value));
     } else if (opStr === "==") {
-      query = colRef.whereEqualTo(fieldPath, firebase.toValue(value));
+      query = query.whereEqualTo(fieldPath, firebase.toValue(value));
     } else if (opStr === ">=") {
-      query = colRef.whereGreaterThanOrEqualTo(fieldPath, firebase.toValue(value));
+      query = query.whereGreaterThanOrEqualTo(fieldPath, firebase.toValue(value));
     } else if (opStr === ">") {
-      query = colRef.whereGreaterThan(fieldPath, firebase.toValue(value));
+      query = query.whereGreaterThan(fieldPath, firebase.toValue(value));
     } else {
       console.log("Illegal argument for opStr: " + opStr);
       return null;
@@ -2532,11 +2530,7 @@ firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: fi
         });
         query.get().addOnCompleteListener(onCompleteListener);
       }),
-      where: () => {
-        // TODO check web impl
-        console.log("in where....");
-        return this;
-      }
+      where: (fp: string, os: firestore.WhereFilterOp, v: any) => firebase.firestore.where(collectionPath, fp, os, v, query)
     };
 
   } catch (ex) {

diff --git a/src/firebase.ios.ts b/src/firebase.ios.ts
@@ -582,6 +582,9 @@ firebase.toJsObject = objCObj => {
         case 'NSDecimalNumber':
           node[key] = Number(String(val));
           break;
+        case 'Date':
+          node[key] = new Date(val);
+          break;
         default:
           console.log("Please report this at https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues: iOS toJsObject is missing a converter for class '" + types.getClass(val) + "'. Casting to String as a fallback.");
           node[key] = String(val);
@@ -2453,26 +2456,25 @@ firebase.firestore.getDocument = (collectionPath: string, documentPath: string):
   });
 };
 
-firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: firestore.WhereFilterOp, value: any): firestore.Query => {
+firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: firestore.WhereFilterOp, value: any, query?: FIRQuery): firestore.Query => {
   try {
     if (typeof(FIRFirestore) === "undefined") {
       console.log("Make sure 'Firebase/Firestore' is in the plugin's Podfile");
       return null;
     }
 
-    const colRef: FIRCollectionReference = FIRFirestore.firestore().collectionWithPath(collectionPath);
-    let query: FIRQuery;
+    query = query || FIRFirestore.firestore().collectionWithPath(collectionPath);
 
     if (opStr === "<") {
-      query = colRef.queryWhereFieldIsLessThan(fieldPath, value);
+      query = query.queryWhereFieldIsLessThan(fieldPath, value);
     } else if (opStr === "<=") {
-      query = colRef.queryWhereFieldIsLessThanOrEqualTo(fieldPath, value);
+      query = query.queryWhereFieldIsLessThanOrEqualTo(fieldPath, value);
     } else if (opStr === "==") {
-      query = colRef.queryWhereFieldIsEqualTo(fieldPath, value);
+      query = query.queryWhereFieldIsEqualTo(fieldPath, value);
     } else if (opStr === ">=") {
-      query = colRef.queryWhereFieldIsGreaterThanOrEqualTo(fieldPath, value);
+      query = query.queryWhereFieldIsGreaterThanOrEqualTo(fieldPath, value);
     } else if (opStr === ">") {
-      query = colRef.queryWhereFieldIsGreaterThan(fieldPath, value);
+      query = query.queryWhereFieldIsGreaterThan(fieldPath, value);
     } else {
       console.log("Illegal argument for opStr: " + opStr);
       return null;
@@ -2500,11 +2502,7 @@ firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: fi
           }
         });
       }),
-      where: () => {
-        // TODO check web impl
-        console.log("in where....");
-        return this;
-      }
+      where: (fp: string, os: firestore.WhereFilterOp, v: any) => firebase.firestore.where(collectionPath, fp, os, v, query)
     };
 
   } catch (ex) {