TF-548 Create abstract AutoCompleteDataSource common to all
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
|
||||
import 'package:contact/contact/model/contact.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
|
||||
part 'tmail_contact.g.dart';
|
||||
@@ -33,4 +34,15 @@ class TMailContact extends Contact {
|
||||
firstname,
|
||||
surname,
|
||||
emailAddress];
|
||||
}
|
||||
|
||||
extension TMailContactExtension on TMailContact {
|
||||
|
||||
String get fullName {
|
||||
return '${firstname ?? ''} ${surname ?? ''}'.trim();
|
||||
}
|
||||
|
||||
EmailAddress toEmailAddress() {
|
||||
return EmailAddress(fullName, emailAddress);
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,12 @@
|
||||
library contact_module;
|
||||
|
||||
export 'package:contact/contact/model/contact.dart';
|
||||
export 'package:contact/contact/model/contact_filter.dart';
|
||||
export 'package:contact/contact/model/tmail_contact.dart';
|
||||
export 'contact/model/contact.dart';
|
||||
export 'contact/model/contact_filter.dart';
|
||||
export 'contact/model/tmail_contact.dart';
|
||||
|
||||
export 'package:contact/contact/autocomplete/autocomplete_tmail_contact_method.dart';
|
||||
export 'package:contact/contact/autocomplete/autocomplete_tmail_contact_response.dart';
|
||||
export 'data/network/contact_api.dart';
|
||||
export 'data/datasource/auto_complete_datasource.dart';
|
||||
export 'data/datasource_impl/tmail_contact_datasource_impl.dart';
|
||||
|
||||
export 'contact/autocomplete/autocomplete_tmail_contact_method.dart';
|
||||
export 'contact/autocomplete/autocomplete_tmail_contact_response.dart';
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import 'package:contact/contact/model/tmail_contact.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/model.dart';
|
||||
|
||||
abstract class AutoCompleteDataSource {
|
||||
Future<List<TMailContact>> getAutoComplete(AccountId accountId, String word, {int? limit});
|
||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
||||
}
|
||||
@@ -2,7 +2,8 @@
|
||||
import 'package:contact/contact/model/tmail_contact.dart';
|
||||
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||
import 'package:contact/data/network/contact_api.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
class TMailContactDataSourceImpl extends AutoCompleteDataSource {
|
||||
|
||||
@@ -11,9 +12,10 @@ class TMailContactDataSourceImpl extends AutoCompleteDataSource {
|
||||
TMailContactDataSourceImpl(this._contactAPI);
|
||||
|
||||
@override
|
||||
Future<List<TMailContact>> getAutoComplete(AccountId accountId, String word, {int? limit}) {
|
||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
||||
return Future.sync(() async {
|
||||
return _contactAPI.getAutoComplete(accountId, word, limit: limit);
|
||||
final listContacts = await _contactAPI.getAutoComplete(autoCompletePattern);
|
||||
return listContacts.map((contact) => contact.toEmailAddress()).toList();
|
||||
}).catchError((error) {
|
||||
throw error;
|
||||
});
|
||||
|
||||
@@ -4,8 +4,8 @@ import 'package:contact/contact/autocomplete/autocomplete_tmail_contact_response
|
||||
import 'package:contact/contact/model/contact_filter.dart';
|
||||
import 'package:contact/contact/model/tmail_contact.dart';
|
||||
import 'package:jmap_dart_client/http/http_client.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
class ContactAPI {
|
||||
|
||||
@@ -13,11 +13,13 @@ class ContactAPI {
|
||||
|
||||
ContactAPI(this._httpClient);
|
||||
|
||||
Future<List<TMailContact>> getAutoComplete(AccountId accountId, String word, {int? limit}) async {
|
||||
Future<List<TMailContact>> getAutoComplete(AutoCompletePattern autoCompletePattern) async {
|
||||
final processingInvocation = ProcessingInvocation();
|
||||
final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
|
||||
|
||||
final autoCompleteMethod = AutoCompleteTMailContactMethod(accountId, ContactFilter(word));
|
||||
final autoCompleteMethod = AutoCompleteTMailContactMethod(
|
||||
autoCompletePattern.accountId!,
|
||||
ContactFilter(autoCompletePattern.word));
|
||||
|
||||
final autoCompleteInvocation = requestBuilder.invocation(autoCompleteMethod);
|
||||
final response = await (requestBuilder
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: contact
|
||||
description: A module implement request
|
||||
description: Contact Module
|
||||
publish_to: 'none'
|
||||
version: 0.0.1
|
||||
|
||||
@@ -11,6 +11,9 @@ dependencies:
|
||||
flutter:
|
||||
sdk: flutter
|
||||
|
||||
model:
|
||||
path: ../model
|
||||
|
||||
equatable: 2.0.3
|
||||
|
||||
json_annotation: 4.4.0
|
||||
@@ -38,6 +41,7 @@ dev_dependencies:
|
||||
# The following section is specific to Flutter.
|
||||
flutter:
|
||||
|
||||
uses-material-design: true
|
||||
# To add assets to your package, add an assets section, like this:
|
||||
# assets:
|
||||
# - images/a_dot_burr.jpeg
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/id.dart';
|
||||
import 'package:mockito/mockito.dart';
|
||||
import 'package:mockito/annotations.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
import 'tmail_contact_datasource_impl_test.mocks.dart';
|
||||
|
||||
@@ -37,15 +38,17 @@ void main() {
|
||||
|
||||
test('getAutoComplete should return success with valid data', () async {
|
||||
when(_contactAPI.getAutoComplete(
|
||||
AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
|
||||
'marie'
|
||||
AutoCompletePattern(
|
||||
word: 'marie',
|
||||
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
|
||||
)).thenAnswer((_) async => [contact1, contact2]);
|
||||
|
||||
final result = await _tmailContactDataSourceImpl.getAutoComplete(
|
||||
AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
|
||||
'marie'
|
||||
AutoCompletePattern(
|
||||
word: 'marie',
|
||||
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
|
||||
);
|
||||
expect(result, [contact1, contact2]);
|
||||
expect(result, [contact1.toEmailAddress(), contact2.toEmailAddress()]);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -6,8 +6,8 @@ import 'dart:async' as _i3;
|
||||
|
||||
import 'package:contact/contact/model/tmail_contact.dart' as _i4;
|
||||
import 'package:contact/data/network/contact_api.dart' as _i2;
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart' as _i5;
|
||||
import 'package:mockito/mockito.dart' as _i1;
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart' as _i5;
|
||||
|
||||
// ignore_for_file: avoid_redundant_argument_values
|
||||
// ignore_for_file: avoid_setters_without_getters
|
||||
@@ -28,10 +28,9 @@ class MockContactAPI extends _i1.Mock implements _i2.ContactAPI {
|
||||
|
||||
@override
|
||||
_i3.Future<List<_i4.TMailContact>> getAutoComplete(
|
||||
_i5.AccountId? accountId, String? word, {int? limit}) =>
|
||||
_i5.AutoCompletePattern? autoCompletePattern) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#getAutoComplete, [accountId, word], {#limit: limit}),
|
||||
Invocation.method(#getAutoComplete, [autoCompletePattern]),
|
||||
returnValue:
|
||||
Future<List<_i4.TMailContact>>.value(<_i4.TMailContact>[]))
|
||||
as _i3.Future<List<_i4.TMailContact>>);
|
||||
|
||||
Reference in New Issue
Block a user