TF-657 Separate interactor/repository/datasource of identity

lib/features/manage_account/data/datasource/identity_data_source.dart

@@ -0,0 +1,16 @@
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
+import 'package:jmap_dart_client/jmap/identities/identity.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
+
+abstract class IdentityDataSource {
+  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties});
+
+  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest);
+
+  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId);
+
+  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest);
+}

lib/features/manage_account/data/datasource/manage_account_datasource.dart

@@ -2,28 +2,15 @@ import 'dart:ui';
 
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
-import 'package:jmap_dart_client/jmap/identities/identity.dart';
 import 'package:rule_filter/rule_filter/tmail_rule.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_email_rule_filter_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_email_rule_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_email_rule_filter_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_copy_in_forwarding_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
 
 abstract class ManageAccountDataSource {
-  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties});
-
-  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest);
-
-  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId);
-
-  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest);
-
   Future<void> persistLanguage(Locale localeCurrent);
 
   Future<List<TMailRule>> getAllTMailRule(AccountId accountId);
@@ -41,5 +28,4 @@ abstract class ManageAccountDataSource {
   Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest);
 
   Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest);
-
 }

lib/features/manage_account/data/datasource_impl/identity_data_source_impl.dart

@@ -0,0 +1,52 @@
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
+import 'package:jmap_dart_client/jmap/identities/identity.dart';
+import 'package:tmail_ui_user/features/manage_account/data/datasource/identity_data_source.dart';
+import 'package:tmail_ui_user/features/manage_account/data/network/identity_api.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
+
+class IdentityDataSourceImpl extends IdentityDataSource {
+
+  final IdentityAPI _identityAPI;
+
+  IdentityDataSourceImpl(this._identityAPI);
+
+  @override
+  Future<IdentitiesResponse> getAllIdentities(AccountId accountId,
+      {Properties? properties}) {
+    return Future.sync(() async {
+      return await _identityAPI.getAllIdentities(accountId, properties: properties);
+    }).catchError((error) {
+      throw error;
+    });
+  }
+
+  @override
+  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
+    return Future.sync(() async {
+      return await _identityAPI.createNewIdentity(accountId, identityRequest);
+    }).catchError((error) {
+      throw error;
+    });
+  }
+
+  @override
+  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) {
+    return Future.sync(() async {
+      return await _identityAPI.deleteIdentity(accountId, identityId);
+    }).catchError((error) {
+      throw error;
+    });
+  }
+
+  @override
+  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
+    return Future.sync(() async {
+      return await _identityAPI.editIdentity(accountId, editIdentityRequest);
+    }).catchError((error) {
+      throw error;
+    });
+  }
+}

lib/features/manage_account/data/datasource_impl/manage_account_datasource_impl.dart

@@ -2,66 +2,23 @@ import 'dart:ui';
 
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
-import 'package:jmap_dart_client/jmap/identities/identity.dart';
 import 'package:rule_filter/rule_filter/tmail_rule.dart';
 import 'package:tmail_ui_user/features/manage_account/data/datasource/manage_account_datasource.dart';
 import 'package:tmail_ui_user/features/manage_account/data/local/language_cache_manager.dart';
 import 'package:tmail_ui_user/features/manage_account/data/network/manage_account_api.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_email_rule_filter_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_email_rule_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_email_rule_filter_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_copy_in_forwarding_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
 
 class ManageAccountDataSourceImpl extends ManageAccountDataSource {
 
   final ManageAccountAPI manageAccountAPI;
   final LanguageCacheManager _languageCacheManager;
 
-  ManageAccountDataSourceImpl(
-      this.manageAccountAPI, this._languageCacheManager);
-
-  @override
-  Future<IdentitiesResponse> getAllIdentities(AccountId accountId,
-      {Properties? properties}) {
-    return Future.sync(() async {
-      return await manageAccountAPI.getAllIdentities(accountId, properties: properties);
-    }).catchError((error) {
-      throw error;
-    });
-  }
-
-  @override
-  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
-    return Future.sync(() async {
-      return await manageAccountAPI.createNewIdentity(accountId, identityRequest);
-    }).catchError((error) {
-      throw error;
-    });
-  }
-
-  @override
-  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) {
-    return Future.sync(() async {
-      return await manageAccountAPI.deleteIdentity(accountId, identityId);
-    }).catchError((error) {
-      throw error;
-    });
-  }
-
-  @override
-  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
-    return Future.sync(() async {
-      return await manageAccountAPI.editIdentity(accountId, editIdentityRequest);
-    }).catchError((error) {
-      throw error;
-    });
-  }
+  ManageAccountDataSourceImpl(this.manageAccountAPI, this._languageCacheManager);
 
   @override
   Future<void> persistLanguage(Locale localeCurrent) {

lib/features/manage_account/data/network/identity_api.dart

@@ -0,0 +1,101 @@
+import 'package:jmap_dart_client/http/http_client.dart';
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/patch_object.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
+import 'package:jmap_dart_client/jmap/identities/get/get_identity_method.dart';
+import 'package:jmap_dart_client/jmap/identities/get/get_identity_response.dart';
+import 'package:jmap_dart_client/jmap/identities/identity.dart';
+import 'package:jmap_dart_client/jmap/identities/set/set_identity_method.dart';
+import 'package:jmap_dart_client/jmap/identities/set/set_identity_response.dart';
+import 'package:jmap_dart_client/jmap/jmap_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
+
+class IdentityAPI {
+  final HttpClient _httpClient;
+
+  IdentityAPI(this._httpClient);
+
+  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) async {
+    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
+    final getIdentityMethod = GetIdentityMethod(accountId);
+    if (properties != null) {
+      getIdentityMethod.addProperties(properties);
+    }
+    final queryInvocation = requestBuilder.invocation(getIdentityMethod);
+
+    final result = await (requestBuilder
+        ..usings(getIdentityMethod.requiredCapabilities))
+      .build()
+      .execute();
+
+    final response = result.parse<GetIdentityResponse>(
+        queryInvocation.methodCallId,
+        GetIdentityResponse.deserialize);
+
+    return IdentitiesResponse(identities: response?.list, state: response?.state);
+  }
+
+  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) async {
+    final setIdentityMethod = SetIdentityMethod(accountId)
+      ..addCreate(identityRequest.creationId, identityRequest.newIdentity);
+
+    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
+
+    final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
+
+    final response = await (requestBuilder
+        ..usings(setIdentityMethod.requiredCapabilities))
+      .build()
+      .execute();
+
+    final setIdentityResponse = response.parse<SetIdentityResponse>(
+        setIdentityInvocation.methodCallId,
+        SetIdentityResponse.deserialize);
+
+    return setIdentityResponse!.created![identityRequest.creationId]!;
+  }
+
+  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) async {
+    final setIdentityMethod = SetIdentityMethod(accountId)
+      ..addDestroy({identityId.id});
+
+    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
+
+    final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
+
+    final response = await (requestBuilder
+        ..usings(setIdentityMethod.requiredCapabilities))
+      .build()
+      .execute();
+
+    final setIdentityResponse = response.parse<SetIdentityResponse>(
+        setIdentityInvocation.methodCallId,
+        SetIdentityResponse.deserialize);
+
+    return setIdentityResponse?.destroyed?.contains(identityId.id) == true;
+  }
+
+  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) async {
+    final setIdentityMethod = SetIdentityMethod(accountId)
+      ..addUpdates({
+        editIdentityRequest.identityId.id : PatchObject(editIdentityRequest.identityRequest.toJson())
+      });
+
+    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
+
+    final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
+
+    final response = await (requestBuilder
+        ..usings(setIdentityMethod.requiredCapabilities))
+      .build()
+      .execute();
+
+    final setIdentityResponse = response.parse<SetIdentityResponse>(
+        setIdentityInvocation.methodCallId,
+        SetIdentityResponse.deserialize);
+
+    return setIdentityResponse?.updated?.containsKey(editIdentityRequest.identityId.id) == true;
+  }
+}

lib/features/manage_account/data/network/manage_account_api.dart

@@ -8,13 +8,6 @@ import 'package:forward/forward/tmail_forward.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/core/id.dart';
-import 'package:jmap_dart_client/jmap/core/patch_object.dart';
-import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
-import 'package:jmap_dart_client/jmap/identities/get/get_identity_method.dart';
-import 'package:jmap_dart_client/jmap/identities/get/get_identity_response.dart';
-import 'package:jmap_dart_client/jmap/identities/identity.dart';
-import 'package:jmap_dart_client/jmap/identities/set/set_identity_method.dart';
-import 'package:jmap_dart_client/jmap/identities/set/set_identity_response.dart';
 import 'package:jmap_dart_client/jmap/jmap_request.dart';
 import 'package:rule_filter/rule_filter/get/get_rule_filter_method.dart';
 import 'package:rule_filter/rule_filter/get/get_rule_filter_response.dart';
@@ -23,9 +16,6 @@ import 'package:rule_filter/rule_filter/set/set_rule_filter_method.dart';
 import 'package:rule_filter/rule_filter/tmail_rule.dart';
 import 'package:tmail_ui_user/features/manage_account/data/extensions/list_tmail_rule_extensions.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/exceptions/forward_exception.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
 
 class ManageAccountAPI {
 
@@ -33,101 +23,6 @@ class ManageAccountAPI {
 
   ManageAccountAPI(this._httpClient);
 
-  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) async {
-    final processingInvocation = ProcessingInvocation();
-    final jmapRequestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
-    final getIdentityMethod = GetIdentityMethod(accountId);
-    if (properties != null) {
-      getIdentityMethod.addProperties(properties);
-    }
-    final queryInvocation = jmapRequestBuilder.invocation(getIdentityMethod);
-
-    final result = await (jmapRequestBuilder
-        ..usings(getIdentityMethod.requiredCapabilities))
-      .build()
-      .execute();
-
-    final response = result.parse<GetIdentityResponse>(
-      queryInvocation.methodCallId,
-      GetIdentityResponse.deserialize);
-
-    return IdentitiesResponse(identities: response?.list, state: response?.state);
-  }
-
-  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) async {
-    final setIdentityMethod = SetIdentityMethod(accountId)
-      ..addCreate(identityRequest.creationId, identityRequest.newIdentity);
-
-    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
-
-    final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
-
-    final response = await (requestBuilder
-        ..usings(setIdentityMethod.requiredCapabilities))
-      .build()
-      .execute();
-
-    final setIdentityResponse = response.parse<SetIdentityResponse>(
-        setIdentityInvocation.methodCallId,
-        SetIdentityResponse.deserialize);
-
-    return Future.sync(() async {
-      return setIdentityResponse!.created![identityRequest.creationId]!;
-    }).catchError((error) {
-      throw error;
-    });
-  }
-
-  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) async {
-    final setIdentityMethod = SetIdentityMethod(accountId)
-      ..addDestroy({identityId.id});
-
-    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
-
-    final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
-
-    final response = await (requestBuilder
-      ..usings(setIdentityMethod.requiredCapabilities))
-        .build()
-        .execute();
-
-    final setIdentityResponse = response.parse<SetIdentityResponse>(
-        setIdentityInvocation.methodCallId,
-        SetIdentityResponse.deserialize);
-
-    return Future.sync(() async {
-      return setIdentityResponse?.destroyed?.contains(identityId.id) == true;
-    }).catchError((error) {
-      throw error;
-    });
-  }
-
-  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) async {
-    final setIdentityMethod = SetIdentityMethod(accountId)
-      ..addUpdates({
-        editIdentityRequest.identityId.id : PatchObject(editIdentityRequest.identityRequest.toJson())
-      });
-
-    final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
-
-    final setIdentityInvocation = requestBuilder.invocation(setIdentityMethod);
-
-    final response = await (requestBuilder
-          ..usings(setIdentityMethod.requiredCapabilities))
-        .build()
-        .execute();
-
-    final setIdentityResponse = response.parse<SetIdentityResponse>(
-        setIdentityInvocation.methodCallId,
-        SetIdentityResponse.deserialize);
-
-    return Future.sync(() async {
-      return setIdentityResponse?.updated?.containsKey(editIdentityRequest.identityId.id) == true;
-    }).catchError((error) {
-      throw error;
-    });
-  }
-
   Future<List<TMailRule>> getListTMailRule(AccountId accountId) async {
     final processingInvocation = ProcessingInvocation();
     final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);

lib/features/manage_account/data/repository/identity_repository_impl.dart

@@ -0,0 +1,36 @@
+
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
+import 'package:jmap_dart_client/jmap/identities/identity.dart';
+import 'package:tmail_ui_user/features/manage_account/data/datasource/identity_data_source.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/repository/identity_repository.dart';
+
+class IdentityRepositoryImpl extends IdentityRepository {
+
+  final IdentityDataSource _dataSource;
+
+  IdentityRepositoryImpl(this._dataSource);
+
+  @override
+  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) {
+    return _dataSource.getAllIdentities(accountId, properties: properties);
+  }
+
+  @override
+  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
+    return _dataSource.createNewIdentity(accountId, identityRequest);
+  }
+
+  @override
+  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) {
+    return _dataSource.deleteIdentity(accountId, identityId);
+  }
+
+  @override
+  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
+    return _dataSource.editIdentity(accountId, editIdentityRequest);
+  }
+}

lib/features/manage_account/data/repository/manage_account_repository_impl.dart

@@ -2,19 +2,14 @@ import 'dart:ui';
 
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
-import 'package:jmap_dart_client/jmap/identities/identity.dart';
 import 'package:rule_filter/rule_filter/tmail_rule.dart';
 import 'package:tmail_ui_user/features/manage_account/data/datasource/manage_account_datasource.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_email_rule_filter_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_email_rule_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_email_rule_filter_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_copy_in_forwarding_request.dart';
-import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/repository/manage_account_repository.dart';
 
 class ManageAccountRepositoryImpl extends ManageAccountRepository {
@@ -23,26 +18,6 @@ class ManageAccountRepositoryImpl extends ManageAccountRepository {
 
   ManageAccountRepositoryImpl(this.dataSource);
 
-  @override
-  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) {
-    return dataSource.getAllIdentities(accountId, properties: properties);
-  }
-
-  @override
-  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
-    return dataSource.createNewIdentity(accountId, identityRequest);
-  }
-
-  @override
-  Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId) {
-    return dataSource.deleteIdentity(accountId, identityId);
-  }
-
-  @override
-  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
-    return dataSource.editIdentity(accountId, editIdentityRequest);
-  }
-
   @override
   Future<void> persistLanguage(Locale localeCurrent) {
     return dataSource.persistLanguage(localeCurrent);