Add snippets for OR queries (#364)

* update firebase-admin to version that supports OR

* use Filter.where instead of citiesRef.where

I'm not really sure why, TS is fine with it, but tests don't pass if I use citiesRef.where in the OR query

Author: jhuleatt

auth/functions/package.json

@@ -8,7 +8,7 @@
     "compile": "cp ../../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0"
   }
 }

auth/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "express": "^4.18.2",
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0"
   }
 }

config/package.json

@@ -7,7 +7,7 @@
     "compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0"
+    "firebase-admin": "^11.9.0"
   },
   "author": "",
   "license": "ISC"

database/package.json

@@ -9,6 +9,6 @@
     "compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0"
+    "firebase-admin": "^11.9.0"
   }
 }

firebaseapp/package.json

@@ -9,6 +9,6 @@
     "compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0"
+    "firebase-admin": "^11.9.0"
   }
 }

firestore/extend-with-functions/functions/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@google-cloud/firestore": "^6.6.0",
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0"
   }
 }

firestore/main/index.js

@@ -2,7 +2,7 @@ const debug = require('debug')('firestore-snippets-node');
 
 // [START firestore_deps]
 const { initializeApp, applicationDefault, cert } = require('firebase-admin/app');
-const { getFirestore, Timestamp, FieldValue } = require('firebase-admin/firestore');
+const { getFirestore, Timestamp, FieldValue, Filter } = require('firebase-admin/firestore');
 // [END firestore_deps]
 
 
@@ -647,6 +647,41 @@ async function inQueries(db) {
   console.log('Exactly One Coast get: ', exactlyOneCoast);
 }
 
+/**
+ * Demonstrate OR queries
+ * 
+ * @param {FirebaseFirestore.Firestore} db 
+ */
+async function orQueries(db) {
+  const citiesRef = db.collection('cities');
+
+  // [START firestore_query_or]
+  const bigCities = await citiesRef
+    .where(
+      Filter.or(
+        Filter.where('capital', '==', true),
+        Filter.where('population', '>=', 1000000)
+      )
+    )
+    .get();
+  // [END firestore_query_or]
+
+  // [START firestore_query_or_compound]
+  const bigCitiesInCalifornia = await citiesRef
+    .where('state', '==', 'CA')
+    .where(
+      Filter.or(
+        Filter.where('capital', '==', true),
+        Filter.where('population', '>=', 1000000)
+      )
+    )
+    .get();
+  // [END firestore_query_or_compound]
+  
+    console.log('Big cities get: ', bigCities);
+    console.log('Big cities in California get: ', bigCitiesInCalifornia);
+}
+
 async function orderAndLimit(db) {
   const citiesRef = db.collection('cities');
   // [START firestore_query_order_limit]
@@ -1071,6 +1106,10 @@ describe('Firestore Smoketests', () => {
     return inQueries(db);
   });
 
+  it('should support or queries', () => {
+    return orQueries(db);
+  });
+
   it('should order and limit', () => {
     return orderAndLimit(db);
   });

firestore/main/package.json

@@ -12,7 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "@google-cloud/firestore": "^6.6.0",
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0"
   },
   "devDependencies": {

firestore/solution-aggregation/functions/package.json

@@ -10,7 +10,7 @@
     "compile": "cp ../../../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0"
   },
   "private": true

firestore/solution-deletes/functions/package.json

@@ -12,7 +12,7 @@
     "compile": "cp ../../../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0",
     "firebase-tools": "^12.2.1"
   }

firestore/solution-sharded-timestamp/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@google-cloud/firestore": "^6.6.0",
-    "firebase-admin": "^11.8.0"
+    "firebase-admin": "^11.9.0"
   }
 }

functions/firestore-export/package.json

@@ -9,7 +9,7 @@
         "compile": "cp ../../tsconfig.template.json ./tsconfig.json && tsc"
     },
     "dependencies": {
-        "firebase-admin": "^11.8.0",
+        "firebase-admin": "^11.9.0",
         "firebase-functions": "^4.4.0"
     }
 }

functions/stackdriver-logging/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@google-cloud/logging": "^10.4.1",
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "firebase-functions": "^4.4.0"
   }
 }

management/package.json

@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "firebase-admin": "^11.8.0",
+    "firebase-admin": "^11.9.0",
     "request-promise": "^4.2.6"
   }
 }

messaging/package.json

@@ -9,6 +9,6 @@
     "compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
   },
   "dependencies": {
-    "firebase-admin": "^11.8.0"
+    "firebase-admin": "^11.9.0"
   }
 }