Update deps and add array snippets

Change-Id: I293bd04d67957b554970fecb537d064541ab141e
firebase · Sep 4, 2018 · 5ad041a · 5ad041a
1 parent c47a538
commit 5ad041a
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/firestore/extend-with-functions/package.json b/firestore/extend-with-functions/package.json
@@ -3,8 +3,8 @@
   "description": "Cloud Functions and Firestore",
   "main": "index.js",
   "dependencies": {
-    "firebase-functions": "^1.0.0",
-    "firebase-admin": "^5.13.0",
-    "@google-cloud/firestore": "^0.16.1"
+    "@google-cloud/firestore": "^0.16.1",
+    "firebase-admin": "^6.0.0",
+    "firebase-functions": "^1.0.0"
   }
 }
diff --git a/firestore/main/index.js b/firestore/main/index.js
@@ -248,6 +248,27 @@ function updateDocument(db) {
   });
 }
 
+function updateDocumentArray(db) {
+  // [START update_document_array]
+  var admin = require('firebase-admin');
+  // ...
+  var washingtonRef = db.collection('cities').doc('DC');
+
+  // Atomically add a new region to the "regions" array field.
+  var arrUnion = washingtonRef.update({
+    regions: admin.firestore.FieldValue.arrayUnion('greater_virginia')
+  });
+  // Atomically remove a region from the "regions" array field.
+  var arrRm = washingtonRef.update({
+    regions: admin.firestore.FieldValue.arrayRemove('east_coast')
+  });
+  // [END update_document_array]
+
+  return Promise.all([arrUnion, arrRm]).then(res => {
+    console.log('Update array: ', res);
+  });
+}
+
 function updateDocumentMany(db) {
   // [START update_document_many]
   var cityRef = db.collection('cities').doc('DC');
@@ -444,19 +465,24 @@ function exampleData(db) {
 
   var setSf = citiesRef.doc('SF').set({
       name: 'San Francisco', state: 'CA', country: 'USA',
-      capital: false, population: 860000 });
+      capital: false, population: 860000,
+      regions: ['west_coast', 'norcal'] });
   var setLa = citiesRef.doc('LA').set({
       name: 'Los Angeles', state: 'CA', country: 'USA',
-      capital: false, population: 3900000 });
+      capital: false, population: 3900000,
+      regions: ['west_coast', 'socal']  });
   var setDc = citiesRef.doc('DC').set({
       name: 'Washington, D.C.', state: null, country: 'USA',
-      capital: true, population: 680000 });
+      capital: true, population: 680000,
+      regions: ['east_coast'] });
   var setTok = citiesRef.doc('TOK').set({
       name: 'Tokyo', state: null, country: 'Japan',
-      capital: true, population: 9000000 });
+      capital: true, population: 9000000,
+      regions: ['kanto', 'honshu'] });
   var setBj = citiesRef.doc('BJ').set({
       name: 'Beijing', state: null, country: 'China',
-      capital: true, population: 21500000 });
+      capital: true, population: 21500000,
+      regions: ['jingjinji', 'hebei'] });
   // [END example_data]
 
   return Promise.all([setSf, setLa, setDc, setTok, setBj]);
@@ -605,6 +631,18 @@ function queryAndFilter(db) {
   });
 }
 
+function arrayFilter(db) {
+  var citiesRef = db.collection('cities');
+  // [START array_contains_filter]
+  var westCoastCities = citiesRef.where('regions', 'array-contains', 'west_coast');
+  // [END array_contains_filter]
+
+  return westCoastCities.get()
+    .then(res => {
+      console.log('West Coast get: ', res);
+    });
+}
+
 function orderAndLimit(db) {
   var citiesRef = db.collection('cities');
   // [START order_limit]
@@ -916,6 +954,10 @@ describe('Firestore Smoketests', () => {
     return updateDocument(db);
   });
 
+  it('should update array fields in a document', () => {
+    return updateDocumentArray(db);
+  });
+
   it('should update many document', () => {
     return updateDocumentMany(db);
   });
@@ -962,6 +1004,10 @@ describe('Firestore Smoketests', () => {
   it('should query and filter', () => {
     return queryAndFilter(db);
   });
+
+  it('should query and filter an array', () => {
+    return arrayFilter(db);
+  });
 
   it('should order and limit', () => {
     return orderAndLimit(db);

diff --git a/firestore/main/package.json b/firestore/main/package.json
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "@google-cloud/firestore": "^0.16.1",
-    "firebase-admin": "^5.13.1"
+    "firebase-admin": "^6.0.0"
   },
   "devDependencies": {
     "mocha": "^3.3.0"

diff --git a/firestore/solution-aggregation/functions/package.json b/firestore/solution-aggregation/functions/package.json
@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "firebase-admin": "^5.13.0",
+    "firebase-admin": "^6.0.0",
     "firebase-functions": "^1.0.1"
   },
   "private": true