status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.0.x'

This commit is contained in:
Chris Bianca 2017-11-01 17:47:15 +00:00
parent 04776c965d 270279551a
commit e6b8ce193c
9 changed files with 347 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/src/main/java/io/invertase/firebase/firestore/FirestoreSerialize.java
View File

@ -236,7 +236,7 @@ public class FirestoreSerialize {
return map;
}
private static List<Object> parseReadableArray(FirebaseFirestore firestore, ReadableArray readableArray) {
static List<Object> parseReadableArray(FirebaseFirestore firestore, ReadableArray readableArray) {
List<Object> list = new ArrayList<>();
if (readableArray != null) {
for (int i = 0; i < readableArray.size(); i++) {
@ -246,7 +246,7 @@ public class FirestoreSerialize {
return list;
}
private static Object parseTypeMap(FirebaseFirestore firestore, ReadableMap typeMap) {
static Object parseTypeMap(FirebaseFirestore firestore, ReadableMap typeMap) {
String type = typeMap.getString("type");
if ("boolean".equals(type)) {
return typeMap.getBoolean("value");

41
android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestoreCollectionReference.java
View File

@ -14,6 +14,7 @@ import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.firestore.DocumentListenOptions;
import com.google.firebase.firestore.EventListener;
import com.google.firebase.firestore.FirebaseFirestore;
import com.google.firebase.firestore.FirebaseFirestoreException;
import com.google.firebase.firestore.ListenerRegistration;
import com.google.firebase.firestore.Query;
@ -115,22 +116,22 @@ public class RNFirebaseFirestoreCollectionReference {
}
private Query buildQuery() {
Query query = RNFirebaseFirestore.getFirestoreForApp(appName).collection(path);
query = applyFilters(query);
FirebaseFirestore firestore = RNFirebaseFirestore.getFirestoreForApp(appName);
Query query = firestore.collection(path);
query = applyFilters(firestore, query);
query = applyOrders(query);
query = applyOptions(query);
query = applyOptions(firestore, query);
return query;
}
private Query applyFilters(Query query) {
List<Object> filtersList = Utils.recursivelyDeconstructReadableArray(filters);
for (Object f : filtersList) {
Map<String, Object> filter = (Map) f;
String fieldPath = (String) filter.get("fieldPath");
String operator = (String) filter.get("operator");
Object value = filter.get("value");
private Query applyFilters(FirebaseFirestore firestore, Query query) {
for (int i = 0; i < filters.size(); i++) {
ReadableMap filter = filters.getMap(i);
String fieldPath = filter.getString("fieldPath");
String operator = filter.getString("operator");
ReadableMap jsValue = filter.getMap("value");
Object value = FirestoreSerialize.parseTypeMap(firestore, jsValue);
switch (operator) {
case "EQUAL":
@ -165,14 +166,14 @@ public class RNFirebaseFirestoreCollectionReference {
return query;
}
private Query applyOptions(Query query) {
private Query applyOptions(FirebaseFirestore firestore, Query query) {
if (options.hasKey("endAt")) {
ReadableArray endAtArray = options.getArray("endAt");
query = query.endAt(Utils.recursivelyDeconstructReadableArray(endAtArray));
List<Object> endAtList = FirestoreSerialize.parseReadableArray(firestore, options.getArray("endAt"));
query = query.endAt(endAtList.toArray());
}
if (options.hasKey("endBefore")) {
ReadableArray endBeforeArray = options.getArray("endBefore");
query = query.endBefore(Utils.recursivelyDeconstructReadableArray(endBeforeArray));
List<Object> endBeforeList = FirestoreSerialize.parseReadableArray(firestore, options.getArray("endBefore"));
query = query.endBefore(endBeforeList.toArray());
}
if (options.hasKey("limit")) {
int limit = options.getInt("limit");
@ -185,12 +186,12 @@ public class RNFirebaseFirestoreCollectionReference {
// Android doesn't support selectFields
}
if (options.hasKey("startAfter")) {
ReadableArray startAfterArray = options.getArray("startAfter");
query = query.startAfter(Utils.recursivelyDeconstructReadableArray(startAfterArray));
List<Object> startAfterList= FirestoreSerialize.parseReadableArray(firestore, options.getArray("startAfter"));
query = query.startAfter(startAfterList.toArray());
}
if (options.hasKey("startAt")) {
ReadableArray startAtArray = options.getArray("startAt");
query = query.startAt(Utils.recursivelyDeconstructReadableArray(startAtArray));
List<Object> startAtList= FirestoreSerialize.parseReadableArray(firestore, options.getArray("startAt"));
query = query.startAt(startAtList.toArray());
}
return query;
}

27
ios/RNFirebase/firestore/RNFirebaseFirestoreCollectionReference.m
View File

@ -81,20 +81,22 @@ queryListenOptions:(NSDictionary *) queryListenOptions {
}
- (FIRQuery *)buildQuery {
FIRQuery *query = (FIRQuery*)[[RNFirebaseFirestore getFirestoreForApp:_app] collectionWithPath:_path];
query = [self applyFilters:query];
FIRFirestore *firestore = [RNFirebaseFirestore getFirestoreForApp:_app];
FIRQuery *query = (FIRQuery*)[firestore collectionWithPath:_path];
query = [self applyFilters:firestore query:query];
query = [self applyOrders:query];
query = [self applyOptions:query];
query = [self applyOptions:firestore query:query];
return query;
}
- (FIRQuery *)applyFilters:(FIRQuery *) query {
- (FIRQuery *)applyFilters:(FIRFirestore *) firestore
query:(FIRQuery *) query {
for (NSDictionary *filter in _filters) {
NSString *fieldPath = filter[@"fieldPath"];
NSString *operator = filter[@"operator"];
// TODO: Validate this works
id value = filter[@"value"];
NSDictionary *jsValue = filter[@"value"];
id value = [RNFirebaseFirestoreDocumentReference parseJSTypeMap:firestore jsTypeMap:jsValue];
if ([operator isEqualToString:@"EQUAL"]) {
query = [query queryWhereField:fieldPath isEqualTo:value];
@ -121,15 +123,16 @@ queryListenOptions:(NSDictionary *) queryListenOptions {
return query;
}
- (FIRQuery *)applyOptions:(FIRQuery *) query {
- (FIRQuery *)applyOptions:(FIRFirestore *) firestore
query:(FIRQuery *) query {
if (_options[@"endAt"]) {
query = [query queryEndingAtValues:_options[@"endAt"]];
query = [query queryEndingAtValues:[RNFirebaseFirestoreDocumentReference parseJSArray:firestore jsArray:_options[@"endAt"]]];
}
if (_options[@"endBefore"]) {
query = [query queryEndingBeforeValues:_options[@"endBefore"]];
query = [query queryEndingBeforeValues:[RNFirebaseFirestoreDocumentReference parseJSArray:firestore jsArray:_options[@"endBefore"]]];
}
if (_options[@"limit"]) {
query = [query queryLimitedTo:_options[@"limit"]];
query = [query queryLimitedTo:[_options[@"limit"] intValue]];
}
if (_options[@"offset"]) {
// iOS doesn't support offset
@ -138,10 +141,10 @@ queryListenOptions:(NSDictionary *) queryListenOptions {
// iOS doesn't support selectFields
}
if (_options[@"startAfter"]) {
query = [query queryStartingAfterValues:_options[@"startAfter"]];
query = [query queryStartingAfterValues:[RNFirebaseFirestoreDocumentReference parseJSArray:firestore jsArray:_options[@"startAfter"]]];
}
if (_options[@"startAt"]) {
query = [query queryStartingAtValues:_options[@"startAt"]];
query = [query queryStartingAtValues:[RNFirebaseFirestoreDocumentReference parseJSArray:firestore jsArray:_options[@"startAt"]]];
}
return query;
}

5
ios/RNFirebase/firestore/RNFirebaseFirestoreDocumentReference.h
View File

@ -26,7 +26,10 @@
- (void)update:(NSDictionary *)data resolver:(RCTPromiseResolveBlock) resolve rejecter:(RCTPromiseRejectBlock) reject;
- (BOOL)hasListeners;
+ (NSDictionary *)snapshotToDictionary:(FIRDocumentSnapshot *)documentSnapshot;
+(NSDictionary *)parseJSMap:(FIRFirestore *) firestore jsMap:(NSDictionary *) jsMap;
+ (NSDictionary *)parseJSMap:(FIRFirestore *) firestore jsMap:(NSDictionary *) jsMap;
+ (NSArray *)parseJSArray:(FIRFirestore *) firestore jsArray:(NSArray *) jsArray;
+ (id)parseJSTypeMap:(FIRFirestore *) firestore jsTypeMap:(NSDictionary *) jsTypeMap;
@end
#else

4
lib/modules/firestore/CollectionReference.js
View File

@ -83,10 +83,6 @@ export default class CollectionReference {
return this._query.orderBy(fieldPath, directionStr);
}
select(varArgs: string[]): Query {
return this._query.select(varArgs);
}
startAfter(fieldValues: any): Query {
return this._query.startAfter(fieldValues);
}

45
lib/modules/firestore/Query.js
View File

@ -5,6 +5,7 @@
import DocumentSnapshot from './DocumentSnapshot';
import Path from './Path';
import QuerySnapshot from './QuerySnapshot';
import { buildNativeArray, buildTypeMap } from './utils/serialize';
import { firestoreAutoId, isFunction, isObject } from '../../utils';
const DIRECTIONS = {
@ -77,24 +78,20 @@ export default class Query {
return this._firestore;
}
endAt(fieldValues: any): Query {
fieldValues = [].slice.call(arguments);
// TODO: Validation
endAt(...snapshotOrVarArgs: any): Query {
const options = {
...this._queryOptions,
endAt: fieldValues,
endAt: this._buildOrderByOption(snapshotOrVarArgs),
};
return new Query(this.firestore, this._referencePath, this._fieldFilters,
this._fieldOrders, options);
}
endBefore(fieldValues: any): Query {
fieldValues = [].slice.call(arguments);
// TODO: Validation
endBefore(...snapshotOrVarArgs: any): Query {
const options = {
...this._queryOptions,
endBefore: fieldValues,
endBefore: this._buildOrderByOption(snapshotOrVarArgs),
};
return new Query(this.firestore, this._referencePath, this._fieldFilters,
@ -233,24 +230,20 @@ export default class Query {
combinedOrders, this._queryOptions);
}
startAfter(fieldValues: any): Query {
fieldValues = [].slice.call(arguments);
// TODO: Validation
startAfter(...snapshotOrVarArgs: any): Query {
const options = {
...this._queryOptions,
startAfter: fieldValues,
startAfter: this._buildOrderByOption(snapshotOrVarArgs),
};
return new Query(this.firestore, this._referencePath, this._fieldFilters,
this._fieldOrders, options);
}
startAt(fieldValues: any): Query {
fieldValues = [].slice.call(arguments);
// TODO: Validation
startAt(...snapshotOrVarArgs: any): Query {
const options = {
...this._queryOptions,
startAt: fieldValues,
startAt: this._buildOrderByOption(snapshotOrVarArgs),
};
return new Query(this.firestore, this._referencePath, this._fieldFilters,
@ -261,10 +254,11 @@ export default class Query {
// TODO: Validation
// validate.isFieldPath('fieldPath', fieldPath);
// validate.isFieldFilter('fieldFilter', opStr, value);
const nativeValue = buildTypeMap(value);
const newFilter = {
fieldPath,
operator: OPERATORS[opStr],
value,
value: nativeValue,
};
const combinedFilters = this._fieldFilters.concat(newFilter);
return new Query(this.firestore, this._referencePath, combinedFilters,
@ -275,6 +269,23 @@ export default class Query {
* INTERNALS
*/
_buildOrderByOption(snapshotOrVarArgs: any[]) {
// TODO: Validation
let values;
if (snapshotOrVarArgs.length === 1 && snapshotOrVarArgs[0] instanceof DocumentSnapshot) {
const docSnapshot = snapshotOrVarArgs[0];
values = [];
for (let i = 0; i < this._fieldOrders.length; i++) {
const fieldOrder = this._fieldOrders[i];
values.push(docSnapshot.get(fieldOrder.fieldPath));
}
} else {
values = snapshotOrVarArgs;
}
return buildNativeArray(values);
}
/**
* Remove query snapshot listener
* @param listener

4
lib/modules/firestore/utils/serialize.js
View File

@ -27,7 +27,7 @@ export const buildNativeMap = (data: Object): Object => {
return nativeData;
};
const buildNativeArray = (array: Object[]): any[] => {
export const buildNativeArray = (array: Object[]): any[] => {
const nativeArray = [];
if (array) {
array.forEach((value) => {
@ -37,7 +37,7 @@ const buildNativeArray = (array: Object[]): any[] => {
return nativeArray;
};
const buildTypeMap = (value: any): any => {
export const buildTypeMap = (value: any): any => {
const typeMap = {};
const type = typeOf(value);
if (value === null || value === undefined) {

274
tests/src/tests/firestore/collectionReferenceTests.js
View File

@ -2,9 +2,9 @@ import sinon from 'sinon';
import 'should-sinon';
import should from 'should';
import { COL_1 } from './index';
import { COL_1, cleanCollection } from './index';
function collectionReferenceTests({ describe, it, context, firebase }) {
function collectionReferenceTests({ describe, it, context, firebase, before, after }) {
describe('CollectionReference', () => {
context('class', () => {
it('should return instance methods', () => {
@ -445,6 +445,26 @@ function collectionReferenceTests({ describe, it, context, firebase }) {
});
});
it('correctly handles == date values', () => {
return firebase.native.firestore()
.collection('collection-tests')
.where('timestamp', '==', COL_1.timestamp)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 1);
});
});
it('correctly handles == geopoint values', () => {
return firebase.native.firestore()
.collection('collection-tests')
.where('geopoint', '==', COL_1.geopoint)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 1);
});
});
it('correctly handles >= number values', () => {
return firebase.native.firestore()
.collection('collection-tests')
@ -458,6 +478,16 @@ function collectionReferenceTests({ describe, it, context, firebase }) {
});
});
it('correctly handles >= geopoint values', () => {
return firebase.native.firestore()
.collection('collection-tests')
.where('geopoint', '>=', new firebase.native.firestore.GeoPoint(-1, -1))
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 1);
});
});
it('correctly handles <= float values', () => {
return firebase.native.firestore()
.collection('collection-tests')
@ -470,6 +500,246 @@ function collectionReferenceTests({ describe, it, context, firebase }) {
});
});
});
it('correctly handles limit', async () => {
const collectionTests = firebase.native.firestore().collection('collection-tests2');
await Promise.all([
collectionTests.doc('col1').set(COL_1),
collectionTests.doc('col2').set({ ...COL_1, daz: 234 }),
collectionTests.doc('col3').set({ ...COL_1, daz: 234 }),
collectionTests.doc('col4').set({ ...COL_1, daz: 234 }),
collectionTests.doc('col5').set({ ...COL_1, daz: 234 }),
]);
return collectionTests.limit(3)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
return cleanCollection(collectionTests);
});
});
});
context('cursors', () => {
let collectionTests;
before(async () => {
collectionTests = firebase.native.firestore().collection('collection-tests2');
await Promise.all([
collectionTests.doc('col1').set({ ...COL_1, foo: 'bar0' }),
collectionTests.doc('col2').set({ ...COL_1, foo: 'bar1', daz: 234, timestamp: new Date(2017, 2, 11, 10, 0, 0) }),
collectionTests.doc('col3').set({ ...COL_1, foo: 'bar2', daz: 345, timestamp: new Date(2017, 2, 12, 10, 0, 0) }),
collectionTests.doc('col4').set({ ...COL_1, foo: 'bar3', daz: 456, timestamp: new Date(2017, 2, 13, 10, 0, 0) }),
collectionTests.doc('col5').set({ ...COL_1, foo: 'bar4', daz: 567, timestamp: new Date(2017, 2, 14, 10, 0, 0) }),
]);
});
context('endAt', () => {
it('handles dates', () => {
return collectionTests.orderBy('timestamp').endAt(new Date(2017, 2, 12, 10, 0, 0))
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234, 345],
);
});
});
it('handles numbers', () => {
return collectionTests.orderBy('daz').endAt(345)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234, 345],
);
});
});
it('handles strings', () => {
return collectionTests.orderBy('foo').endAt('bar2')
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234, 345],
);
});
});
it('handles snapshots', async () => {
const collectionSnapshot = await collectionTests.orderBy('foo').get();
return collectionTests.orderBy('foo').endAt(collectionSnapshot.docs[2])
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234, 345],
);
});
});
});
context('endBefore', () => {
it('handles dates', () => {
return collectionTests.orderBy('timestamp').endBefore(new Date(2017, 2, 12, 10, 0, 0))
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234],
);
});
});
it('handles numbers', () => {
return collectionTests.orderBy('daz').endBefore(345)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234],
);
});
});
it('handles strings', () => {
return collectionTests.orderBy('foo').endBefore('bar2')
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234],
);
});
});
it('handles snapshots', async () => {
const collectionSnapshot = await collectionTests.orderBy('foo').get();
return collectionTests.orderBy('foo').endBefore(collectionSnapshot.docs[2])
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[123, 234],
);
});
});
});
context('startAt', () => {
it('handles dates', () => {
return collectionTests.orderBy('timestamp').startAt(new Date(2017, 2, 12, 10, 0, 0))
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[345, 456, 567],
);
});
});
it('handles numbers', () => {
return collectionTests.orderBy('daz').startAt(345)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[345, 456, 567],
);
});
});
it('handles strings', () => {
return collectionTests.orderBy('foo').startAt('bar2')
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[345, 456, 567],
);
});
});
it('handles snapshots', async () => {
const collectionSnapshot = await collectionTests.orderBy('foo').get();
return collectionTests.orderBy('foo').startAt(collectionSnapshot.docs[2])
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 3);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[345, 456, 567],
);
});
});
});
context('startAfter', () => {
it('handles dates', () => {
return collectionTests.orderBy('timestamp').startAfter(new Date(2017, 2, 12, 10, 0, 0))
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[456, 567],
);
});
});
it('handles numbers', () => {
return collectionTests.orderBy('daz').startAfter(345)
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[456, 567],
);
});
});
it('handles strings', () => {
return collectionTests.orderBy('foo').startAfter('bar2')
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[456, 567],
);
});
});
it('handles snapshot', async () => {
const collectionSnapshot = await collectionTests.orderBy('foo').get();
return collectionTests.orderBy('foo').startAfter(collectionSnapshot.docs[2])
.get()
.then((querySnapshot) => {
should.equal(querySnapshot.size, 2);
should.deepEqual(
querySnapshot.docs.map(doc => doc.data().daz),
[456, 567],
);
});
});
});
after(() => {
return cleanCollection(collectionTests);
});
});
});
}

4
tests/src/tests/firestore/index.js
View File

@ -14,7 +14,9 @@ export const COL_1 = {
daz: 123,
foo: 'bar',
gaz: 12.1234567,
geopoint: new firebase.native.firestore.GeoPoint(0, 0),
naz: null,
timestamp: new Date(2017, 2, 10, 10, 0, 0),
};
export const DOC_1 = { name: 'doc1' };
@ -65,7 +67,7 @@ suite.addTests(firestoreTestSuite);
export default suite;
/* HELPER FUNCTIONS */
async function cleanCollection(collection) {
export async function cleanCollection(collection) {
const collectionTestsDocs = await collection.get();
const tasks = [];
collectionTestsDocs.forEach(doc => tasks.push(doc.ref.delete()));