chore: query tests

Author: MichaelVerdon

packages/app/lib/common/index.js

@@ -234,7 +234,6 @@ const mapOfDeprecationReplacements = {
       remove: 'remove()',
       on: 'onValue()',
       once: 'get()',
-      // Query methods inherited from DatabaseQuery
       endAt: 'endAt()',
       endBefore: 'endBefore()',
       startAt: 'startAt()',
@@ -245,19 +244,11 @@ const mapOfDeprecationReplacements = {
       orderByKey: 'orderByKey()',
       orderByValue: 'orderByValue()',
       equalTo: 'equalTo()',
-    },
-    DatabaseQuery: {
-      endAt: 'endAt()',
-      endBefore: 'endBefore()',
-      startAt: 'startAt()',
-      startAfter: 'startAfter()',
-      limitToFirst: 'limitToFirst()',
-      limitToLast: 'limitToLast()',
-      orderByChild: 'orderByChild()',
-      orderByKey: 'orderByKey()',
-      orderByValue: 'orderByValue()',
-      equalTo: 'equalTo()',
-      query: 'query()',
+      setPriority: 'setPriority()',
+      push: 'push()',
+      onDisconnect: 'onDisconnect()',
+      keepSynced: 'keepSynced()',
+      transaction: 'runTransaction()',
     },
   },
 };
@@ -326,9 +317,6 @@ function getNamespace(target) {
   if (target.constructor.name === 'DatabaseReference') {
     return 'database';
   }
-  if (target.constructor.name === 'DatabaseQuery') {
-    return 'database';
-  }
   const className = target.name ? target.name : target.constructor.name;
   return Object.keys(mapOfDeprecationReplacements).find(key => {
     if (mapOfDeprecationReplacements[key][className]) {
@@ -398,14 +386,6 @@ export function createDeprecationProxy(instance) {
           // we want to capture setLogLevel function call which we do below
           return Reflect.get(target, prop, receiver);
         }
-
-        if (target.constructor.name === 'DatabaseQuery') {
-          return target.constructor.name;
-        }
-
-        if (target.constructor.name === 'DatabaseTransaction') {
-          return target.constructor.name;
-        }
       }
 
       if (typeof originalMethod === 'function') {

packages/database/__tests__/database.test.ts

@@ -299,14 +299,11 @@ describe('Database', function () {
     let databaseV9Deprecation: CheckV9DeprecationFunction;
     let staticsV9Deprecation: CheckV9DeprecationFunction;
     let referenceV9Deprecation: CheckV9DeprecationFunction;
-    let queryV9Deprecation: CheckV9DeprecationFunction;
 
     beforeEach(function () {
       databaseV9Deprecation = createCheckV9Deprecation(['database']);
       staticsV9Deprecation = createCheckV9Deprecation(['database', 'statics']);
       referenceV9Deprecation = createCheckV9Deprecation(['database', 'DatabaseReference']);
-      queryV9Deprecation = createCheckV9Deprecation(['database', 'DatabaseQuery']);
-
       // @ts-ignore test
       jest.spyOn(FirebaseModule.prototype, 'native', 'get').mockImplementation(() => {
         return new Proxy(
@@ -505,13 +502,11 @@ describe('Database', function () {
           'once',
         );
       });
-    });
 
-    describe('DatabaseQuery', function () {
       it('endAt', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, endAt('value')),
           () => testRef.endAt('value'),
           'endAt',
@@ -521,7 +516,7 @@ describe('Database', function () {
       it('startAt', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, startAt('value')),
           () => testRef.startAt('value'),
           'startAt',
@@ -531,7 +526,7 @@ describe('Database', function () {
       it('limitToFirst', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, limitToFirst(10)),
           () => testRef.limitToFirst(10),
           'limitToFirst',
@@ -541,7 +536,7 @@ describe('Database', function () {
       it('limitToLast', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, limitToLast(10)),
           () => testRef.limitToLast(10),
           'limitToLast',
@@ -551,7 +546,7 @@ describe('Database', function () {
       it('orderByChild', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, orderByChild('name')),
           () => testRef.orderByChild('name'),
           'orderByChild',
@@ -561,7 +556,7 @@ describe('Database', function () {
       it('orderByKey', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, orderByKey()),
           () => testRef.orderByKey(),
           'orderByKey',
@@ -571,7 +566,7 @@ describe('Database', function () {
       it('orderByValue', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, orderByValue()),
           () => testRef.orderByValue(),
           'orderByValue',
@@ -581,12 +576,64 @@ describe('Database', function () {
       it('equalTo', function () {
         const db = getDatabase();
         const testRef = ref(db, 'test');
-        queryV9Deprecation(
+        referenceV9Deprecation(
           () => query(testRef, equalTo('value')),
           () => testRef.equalTo('value'),
           'equalTo',
         );
       });
+
+      it('setPriority', function () {
+        const db = getDatabase();
+        const testRef = ref(db, 'test');
+        referenceV9Deprecation(
+          () => setPriority(testRef, 'value'),
+          () => testRef.setPriority('value'),
+          'setPriority',
+        );
+      });
+
+      it('push', function () {
+        const db = getDatabase();
+        const testRef = ref(db, 'test');
+        referenceV9Deprecation(
+          () => push(testRef, 'value'),
+          () => testRef.push('value'),
+          'push',
+        );
+      });
+
+      it('onDisconnect', function () {
+        const db = getDatabase();
+        const testRef = ref(db, 'test');
+        referenceV9Deprecation(
+          () => onDisconnect(testRef),
+          () => testRef.onDisconnect(),
+          'onDisconnect',
+        );
+      });
+
+      it('keepSynced', function () {
+        const db = getDatabase();
+        const testRef = ref(db, 'test');
+        referenceV9Deprecation(
+          () => keepSynced(testRef, true),
+          () => testRef.keepSynced(true),
+          'keepSynced',
+        );
+      });
+    });
+
+    describe('DatabaseTransaction', function() {
+      it('runTransaction', function () {
+        const db = getDatabase();
+        const testRef = ref(db, 'test');
+        referenceV9Deprecation(
+          () => runTransaction(testRef, (currentData) => currentData, { applyLocally: true }),
+          () => testRef.transaction((currentData) => currentData, undefined, true),
+          'transaction'
+        );
+      });
     });
   });
 });

packages/database/lib/index.js

@@ -15,7 +15,7 @@
  *
  */
 
-import { isAndroid, isBoolean, isNumber, isString } from '@react-native-firebase/app/lib/common';
+import { isAndroid, isBoolean, isNumber, isString, MODULAR_DEPRECATION_ARG } from '@react-native-firebase/app/lib/common';
 import {
   createModuleNamespace,
   FirebaseModule,
@@ -58,7 +58,7 @@ class FirebaseDatabaseModule extends FirebaseModule {
   _syncServerTimeOffset() {
     this.ref('.info/serverTimeOffset').on('value', snapshot => {
       this._serverTimeOffset = snapshot.val();
-    });
+    }, MODULAR_DEPRECATION_ARG);
   }
 
   /**