-
Notifications
You must be signed in to change notification settings - Fork 4k
feat(firestore): count()
feature for counting documents without retrieving documents.
#9699
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
1f2ffc0
feat(firestore): count feature. Dart implementation
russellwheatley bb0a9f5
feat(firestore): count feature. Dart implementation.
russellwheatley 0e23ec0
feat(firestore): reverted iOS firestore change
russellwheatley 7735485
feat(firestore): count(). Wire up user facing code
russellwheatley 4dc2547
feat(firestore): count(). Wire up web implementation
russellwheatley 1d130f7
feat(firestore): count(). clean up method channel & PI
russellwheatley e58846e
feat(firestore): count(). e2e test.
russellwheatley 926cf58
feat(firestore): remove static.
russellwheatley 1f25a58
feat(firestore): correct init of data
russellwheatley 371ed9d
feat(firestore): count() API. licenses and inline documentation
russellwheatley 467ce69
feat(firestore): expose Query on AggregateQuery
russellwheatley d25bca7
feat(firestore): count(). add unit test for user code
russellwheatley 0a4f218
feat(firestore): count(). universal code unit test
russellwheatley 36a1c99
feat(firestore): count(). unit tests
russellwheatley 4c71036
feat(firestore): update code comment
russellwheatley 93f612f
feat(firestore): count() API. iOS implementation
russellwheatley e5a860e
feat(firestore): count() API. format.
russellwheatley 68c2137
feat(firestore): count() API e2e skip android
russellwheatley 3fe511d
feat(firestore): count() API. expose query on snapshot
russellwheatley 585c82a
feat(firestore): count() API. format
russellwheatley 2893c80
feat(firestore): count() API. wording
russellwheatley bdc6889
feat(firestore): count() API. remove Firestore from test project
russellwheatley 3c87ec5
feat(ios): update swiftformat and add back curly brace
russellwheatley b312ec8
fix(firestore): add nanopb pod to example
russellwheatley 0a90db2
feat(firestore): implement android
russellwheatley 6343092
feat(firestore): update iOS count()
russellwheatley 4723bc7
test(firestore): update unit test
russellwheatley 958db10
Merge branch 'master' into @russell/firestore-count
russellwheatley dd93f0f
chore: rm nanopb from example app
russellwheatley 8f36e58
chore: rm foundation import
russellwheatley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
packages/cloud_firestore/cloud_firestore/lib/src/aggregate_query.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Copyright 2022, the Chromium project authors. Please see the AUTHORS file | ||
// for details. All rights reserved. Use of this source code is governed by a | ||
// BSD-style license that can be found in the LICENSE file. | ||
|
||
part of cloud_firestore; | ||
|
||
/// [AggregateQuery] represents the data at a particular location for retrieving metadata | ||
/// without retrieving the actual documents. | ||
class AggregateQuery { | ||
AggregateQuery._(this._delegate, this.query) { | ||
AggregateQueryPlatform.verifyExtends(_delegate); | ||
} | ||
|
||
/// [Query] represents the query over the data at a particular location used by the [AggregateQuery] to | ||
/// retrieve the metadata. | ||
final Query query; | ||
|
||
final AggregateQueryPlatform _delegate; | ||
|
||
/// Returns an [AggregateQuerySnapshot] with the count of the documents that match the query. | ||
Future<AggregateQuerySnapshot> get({ | ||
AggregateSource source = AggregateSource.server, | ||
}) async { | ||
return AggregateQuerySnapshot._(await _delegate.get(source: source), query); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
packages/cloud_firestore/cloud_firestore/lib/src/aggregate_query_snapshot.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// Copyright 2022, the Chromium project authors. Please see the AUTHORS file | ||
// for details. All rights reserved. Use of this source code is governed by a | ||
// BSD-style license that can be found in the LICENSE file. | ||
|
||
part of cloud_firestore; | ||
|
||
/// [AggregateQuerySnapshot] represents a response to an [AggregateQuery] request. | ||
class AggregateQuerySnapshot { | ||
russellwheatley marked this conversation as resolved.
Show resolved
Hide resolved
|
||
AggregateQuerySnapshot._(this._delegate, this.query) { | ||
AggregateQuerySnapshotPlatform.verifyExtends(_delegate); | ||
} | ||
final AggregateQuerySnapshotPlatform _delegate; | ||
|
||
/// [Query] represents the query over the data at a particular location used by the [AggregateQuery] to | ||
/// retrieve the metadata. | ||
final Query query; | ||
|
||
/// Returns the count of the documents that match the query. | ||
int get count => _delegate.count; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
packages/cloud_firestore/cloud_firestore/test/aggregate_query_test.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
// Copyright 2022 The Chromium Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
import 'package:cloud_firestore/cloud_firestore.dart'; | ||
import 'package:cloud_firestore_platform_interface/src/method_channel/method_channel_firestore.dart'; | ||
import 'package:cloud_firestore_platform_interface/src/method_channel/method_channel_query.dart'; | ||
import 'package:cloud_firestore_platform_interface/src/method_channel/utils/firestore_message_codec.dart'; | ||
import 'package:firebase_core/firebase_core.dart'; | ||
import 'package:flutter_test/flutter_test.dart'; | ||
import 'package:flutter/services.dart'; | ||
|
||
import './mock.dart'; | ||
|
||
int kCount = 4; | ||
|
||
void main() { | ||
setupCloudFirestoreMocks(); | ||
MethodChannelFirebaseFirestore.channel = const MethodChannel( | ||
'plugins.flutter.io/firebase_firestore', | ||
StandardMethodCodec(AggregateQueryMessageCodec()), | ||
); | ||
|
||
MethodChannelFirebaseFirestore.channel.setMockMethodCallHandler((call) async { | ||
if (call.method == 'AggregateQuery#count') { | ||
return { | ||
'count': kCount, | ||
}; | ||
} | ||
|
||
return null; | ||
}); | ||
|
||
FirebaseFirestore? firestore; | ||
|
||
group('$AggregateQuery', () { | ||
setUpAll(() async { | ||
await Firebase.initializeApp(); | ||
firestore = FirebaseFirestore.instance; | ||
}); | ||
|
||
test('returns the correct `AggregateQuerySnapshot` with correct `count`', | ||
() async { | ||
Query query = firestore!.collection('flutter-tests'); | ||
AggregateQuery aggregateQuery = query.count(); | ||
|
||
expect(query, aggregateQuery.query); | ||
AggregateQuerySnapshot snapshot = await aggregateQuery.get(); | ||
|
||
expect(snapshot.count, equals(kCount)); | ||
}); | ||
}); | ||
} | ||
|
||
class AggregateQueryMessageCodec extends FirestoreMessageCodec { | ||
/// Constructor. | ||
const AggregateQueryMessageCodec(); | ||
static const int _kFirestoreInstance = 144; | ||
static const int _kFirestoreQuery = 145; | ||
static const int _kFirestoreSettings = 146; | ||
|
||
@override | ||
Object? readValueOfType(int type, ReadBuffer buffer) { | ||
switch (type) { | ||
// The following cases are only used by unit tests, and not by actual application | ||
// code paths. | ||
case _kFirestoreInstance: | ||
String appName = readValue(buffer)! as String; | ||
readValue(buffer); | ||
final FirebaseApp app = Firebase.app(appName); | ||
return MethodChannelFirebaseFirestore(app: app); | ||
case _kFirestoreQuery: | ||
Map<dynamic, dynamic> values = | ||
readValue(buffer)! as Map<dynamic, dynamic>; | ||
final FirebaseApp app = Firebase.app(); | ||
return MethodChannelQuery( | ||
MethodChannelFirebaseFirestore(app: app), | ||
values['path'], | ||
); | ||
case _kFirestoreSettings: | ||
readValue(buffer); | ||
return const Settings(); | ||
default: | ||
return super.readValueOfType(type, buffer); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/aggregate_source.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// Copyright 2022, the Chromium project authors. Please see the AUTHORS file | ||
// for details. All rights reserved. Use of this source code is governed by a | ||
// BSD-style license that can be found in the LICENSE file. | ||
|
||
/// [AggregateSource] represents the source of data for an [AggregateQuery]. | ||
enum AggregateSource { | ||
russellwheatley marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/// Indicates that the data should be retrieved from the server. | ||
server, | ||
} |
33 changes: 33 additions & 0 deletions
33
...d_firestore_platform_interface/lib/src/method_channel/method_channel_aggregate_query.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
// Copyright 2022, the Chromium project authors. Please see the AUTHORS file | ||
// for details. All rights reserved. Use of this source code is governed by a | ||
// BSD-style license that can be found in the LICENSE file. | ||
|
||
import 'package:cloud_firestore_platform_interface/src/method_channel/utils/source.dart'; | ||
russellwheatley marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
import 'method_channel_firestore.dart'; | ||
import '../../cloud_firestore_platform_interface.dart'; | ||
|
||
/// An implementation of [AggregateQueryPlatform] for the [MethodChannel] | ||
class MethodChannelAggregateQuery extends AggregateQueryPlatform { | ||
MethodChannelAggregateQuery(QueryPlatform query) : super(query); | ||
|
||
@override | ||
Future<AggregateQuerySnapshotPlatform> get({ | ||
required AggregateSource source, | ||
}) async { | ||
final Map<String, dynamic>? data = await MethodChannelFirebaseFirestore | ||
.channel | ||
.invokeMapMethod<String, dynamic>( | ||
'AggregateQuery#count', | ||
<String, dynamic>{ | ||
'query': query, | ||
'firestore': query.firestore, | ||
'source': getAggregateSourceString(source), | ||
}, | ||
); | ||
|
||
return AggregateQuerySnapshotPlatform( | ||
count: data!['count'] as int, | ||
); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ import 'package:cloud_firestore_platform_interface/src/internal/pointer.dart'; | |
import 'package:collection/collection.dart'; | ||
import 'package:flutter/services.dart'; | ||
|
||
import 'method_channel_aggregate_query.dart'; | ||
import 'method_channel_firestore.dart'; | ||
import 'method_channel_query_snapshot.dart'; | ||
import 'utils/source.dart'; | ||
|
@@ -212,6 +213,13 @@ class MethodChannelQuery extends QueryPlatform { | |
}); | ||
} | ||
|
||
@override | ||
AggregateQueryPlatform count() { | ||
return MethodChannelAggregateQuery( | ||
this, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we have a styleguide for this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't AFAIK, it just follows the same implementation style as the rest of the plugins. |
||
); | ||
} | ||
|
||
@override | ||
bool operator ==(Object other) { | ||
return runtimeType == other.runtimeType && | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.