add delete_email_rule feature

2022-08-10 11:08:22 +07:00
parent a5658a6779
commit d6430bda3d
17 changed files with 187 additions and 28 deletions
@@ -5,6 +5,7 @@ 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/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/edit_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';

@@ -20,4 +21,7 @@ abstract class ManageAccountDataSource {
  Future<void> persistLanguage(Locale localeCurrent);

  Future<List<TMailRule>> getAllTMailRule(AccountId accountId);
+
+  Future<List<TMailRule>> deleteTMailRule(AccountId accountId, DeleteEmailRuleRequest deleteEmailRuleRequest);
+
 }
@@ -8,29 +8,34 @@ import 'package:tmail_ui_user/features/manage_account/data/datasource/manage_acc
 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/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/edit_identity_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);
+  ManageAccountDataSourceImpl(
+      this.manageAccountAPI, this._languageCacheManager);

  @override
-  Future<IdentitiesResponse> getAllIdentities(AccountId accountId, {Properties? properties}) {
+  Future<IdentitiesResponse> getAllIdentities(AccountId accountId,
+      {Properties? properties}) {
    return Future.sync(() async {
-      return await manageAccountAPI.getAllIdentities(accountId, properties: properties);
+      return await manageAccountAPI.getAllIdentities(accountId,
+          properties: properties);
    }).catchError((error) {
      throw error;
    });
  }

  @override
-  Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest) {
+  Future<Identity> createNewIdentity(
+      AccountId accountId, CreateNewIdentityRequest identityRequest) {
    return Future.sync(() async {
-      return await manageAccountAPI.createNewIdentity(accountId, identityRequest);
+      return await manageAccountAPI.createNewIdentity(
+          accountId, identityRequest);
    }).catchError((error) {
      throw error;
    });
@@ -46,9 +51,11 @@ class ManageAccountDataSourceImpl extends ManageAccountDataSource {
  }

  @override
-  Future<bool> editIdentity(AccountId accountId, EditIdentityRequest editIdentityRequest) {
+  Future<bool> editIdentity(
+      AccountId accountId, EditIdentityRequest editIdentityRequest) {
    return Future.sync(() async {
-      return await manageAccountAPI.editIdentity(accountId, editIdentityRequest);
+      return await manageAccountAPI.editIdentity(
+          accountId, editIdentityRequest);
    }).catchError((error) {
      throw error;
    });
@@ -71,4 +78,16 @@ class ManageAccountDataSourceImpl extends ManageAccountDataSource {
      throw error;
    });
  }
-}
+
+  @override
+  Future<List<TMailRule>> deleteTMailRule(AccountId accountId, DeleteEmailRuleRequest deleteEmailRuleRequest) {
+
+    deleteEmailRuleRequest.currentEmailRules.remove(deleteEmailRuleRequest.emailRuleDelete);
+
+    return Future.sync(() async {
+      return await manageAccountAPI.updateListTMailRule(accountId, deleteEmailRuleRequest.currentEmailRules);
+    }).catchError((error) {
+      throw error;
+    });
+  }
+}
@@ -2,6 +2,7 @@ import 'dart:async';

 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';
@@ -12,6 +13,9 @@ 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';
+import 'package:rule_filter/rule_filter/rule_filter_id.dart';
+import 'package:rule_filter/rule_filter/rule_id.dart';
+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/domain/model/create_new_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
@@ -123,8 +127,8 @@ class ManageAccountAPI {
    final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);

    final getRuleFilterMethod = GetRuleFilterMethod(
-      accountId,
-    );
+        accountId,
+    )..addIds({RuleFilterIdSingleton.ruleFilterIdSingleton.id});

    final getRuleFilterInvocation = requestBuilder.invocation(getRuleFilterMethod);
    final response = await (requestBuilder
@@ -142,4 +146,42 @@ class ManageAccountAPI {

    return result?.list.first.rules ?? <TMailRule>[];
  }
+
+  Future<List<TMailRule>> updateListTMailRule(AccountId accountId, List<TMailRule> listTMailRule) async {
+
+    final List<TMailRule> listTMailRuleWithId = listTMailRule
+        .asMap()
+        .map((key, value) => MapEntry(key, value.copyWith(id: RuleId(id: Id(key.toString())))))
+        .values
+        .toList();
+
+    final processingInvocation = ProcessingInvocation();
+    final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
+
+    final setRuleFilterMethod = SetRuleFilterMethod(accountId)
+      ..addUpdateRuleFilter({Id(RuleFilterIdType.singleton.value): listTMailRuleWithId});
+
+    requestBuilder.invocation(setRuleFilterMethod);
+
+    final getListTMailRuleUpdated = GetRuleFilterMethod(accountId)
+      ..addIds({RuleFilterIdSingleton.ruleFilterIdSingleton.id});
+
+    final getListTMailRuleUpdatedInvocation = requestBuilder.invocation(getListTMailRuleUpdated);
+
+    final response = await (requestBuilder
+        ..usings(getListTMailRuleUpdated.requiredCapabilities))
+      .build()
+      .execute();
+
+
+    final result = response.parse<GetRuleFilterResponse>(
+        getListTMailRuleUpdatedInvocation.methodCallId,
+        GetRuleFilterResponse.deserialize);
+
+    if (result?.list.isEmpty == true) {
+      return <TMailRule>[];
+    }
+
+    return result?.list.first.rules ?? <TMailRule>[];
+  }
 }
@@ -6,6 +6,7 @@ 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/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/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/manage_account_repository.dart';
@@ -45,4 +46,9 @@ class ManageAccountRepositoryImpl extends ManageAccountRepository {
  Future<List<TMailRule>> getAllTMailRule(AccountId accountId) {
    return dataSource.getAllTMailRule(accountId);
  }
+
+  @override
+  Future<List<TMailRule>> deleteTMailRule(AccountId accountId, DeleteEmailRuleRequest deleteEmailRuleRequest) {
+    return dataSource.deleteTMailRule(accountId, deleteEmailRuleRequest);
+  }
 }
@@ -0,0 +1,15 @@
+import 'package:equatable/equatable.dart';
+import 'package:rule_filter/rule_filter/tmail_rule.dart';
+
+class DeleteEmailRuleRequest with EquatableMixin {
+  final TMailRule emailRuleDelete;
+  final List<TMailRule> currentEmailRules;
+
+  DeleteEmailRuleRequest({
+    required this.emailRuleDelete,
+    required this.currentEmailRules,
+  });
+
+  @override
+  List<Object?> get props => [emailRuleDelete, currentEmailRules];
+}
@@ -5,6 +5,7 @@ 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/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/edit_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';

@@ -20,4 +21,7 @@ abstract class ManageAccountRepository {
  Future<void> persistLanguage(Locale localeCurrent);

  Future<List<TMailRule>> getAllTMailRule(AccountId accountId);
+
+  Future<List<TMailRule>> deleteTMailRule(AccountId accountId, DeleteEmailRuleRequest deleteEmailRuleRequest);
+
 }
@@ -0,0 +1,20 @@
+import 'package:core/core.dart';
+import 'package:rule_filter/rule_filter/tmail_rule.dart';
+
+class DeleteEmailRuleSuccess extends UIState {
+  final List<TMailRule>? rules;
+
+  DeleteEmailRuleSuccess(this.rules);
+
+  @override
+  List<Object?> get props => [rules];
+}
+
+class DeleteEmailRuleFailure extends FeatureFailure {
+  final dynamic exception;
+
+  DeleteEmailRuleFailure(this.exception);
+
+  @override
+  List<Object> get props => [exception];
+}
@@ -0,0 +1,23 @@
+import 'dart:core';
+
+import 'package:core/core.dart';
+import 'package:dartz/dartz.dart';
+import 'package:jmap_dart_client/jmap/account_id.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/repository/manage_account_repository.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/delete_email_rule_state.dart';
+
+class DeleteEmailRuleInteractor {
+  final ManageAccountRepository manageAccountRepository;
+
+  DeleteEmailRuleInteractor(this.manageAccountRepository);
+
+  Stream<Either<Failure, Success>> execute(AccountId accountId, DeleteEmailRuleRequest deleteEmailRuleRequest) async* {
+    try {
+    final result = await manageAccountRepository.deleteTMailRule(accountId, deleteEmailRuleRequest);
+      yield Right(DeleteEmailRuleSuccess(result));
+    } catch (exception) {
+      yield Left(DeleteEmailRuleFailure(exception));
+    }
+  }
+}
@@ -1,6 +1,7 @@
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/base/base_bindings.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/repository/manage_account_repository.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/usecases/delete_email_rule_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_rules_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/email_rules/email_rules_controller.dart';

@@ -10,6 +11,7 @@ class EmailRulesBindings extends BaseBindings {
  void bindingsController() {
    Get.lazyPut(() => EmailRulesController(
      Get.find<GetAllRulesInteractor>(),
+      Get.find<DeleteEmailRuleInteractor>(),
    ));
  }

@@ -22,6 +24,7 @@ class EmailRulesBindings extends BaseBindings {
  @override
  void bindingsInteractor() {
    Get.lazyPut(() => GetAllRulesInteractor(Get.find<ManageAccountRepository>()));
+    Get.lazyPut(() => DeleteEmailRuleInteractor(Get.find<ManageAccountRepository>()));
  }

  @override
@@ -3,23 +3,27 @@ import 'package:core/presentation/resources/image_paths.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
-import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:rule_filter/rule_filter/tmail_rule.dart';
 import 'package:tmail_ui_user/features/base/base_controller.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/state/delete_email_rule_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_rules_state.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/usecases/delete_email_rule_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_rules_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/email_rules/widgets/email_rule_bottom_sheet_action_tile_builder.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
+import 'package:tmail_ui_user/main/routes/route_navigation.dart';

 class EmailRulesController extends BaseController {
  final listEmailRule = <TMailRule>[].obs;
  final _accountDashBoardController =
      Get.find<ManageAccountDashBoardController>();
  final GetAllRulesInteractor _getAllRulesInteractor;
+  final DeleteEmailRuleInteractor _deleteEmailRuleInteractor;
  final _imagePaths = Get.find<ImagePaths>();

-  EmailRulesController(this._getAllRulesInteractor);
+  EmailRulesController(this._getAllRulesInteractor, this._deleteEmailRuleInteractor);

  @override
  void onDone() {
@@ -29,6 +33,12 @@ class EmailRulesController extends BaseController {
          listEmailRule.addAll(success.rules!);
        }
      }
+      if (success is DeleteEmailRuleSuccess) {
+        if (success.rules?.isNotEmpty == true) {
+          listEmailRule.clear();
+          listEmailRule.addAll(success.rules!);
+        }
+      }
    });
  }

@@ -37,7 +47,7 @@ class EmailRulesController extends BaseController {

  @override
  void onInit() {
-    _getAllRules(_accountDashBoardController.accountId.value!);
+    _getAllRules();
    super.onInit();
  }

@@ -49,12 +59,16 @@ class EmailRulesController extends BaseController {
    //TODO: editEmailRule
  }

-  void deleteEmailRule(TMailRule rule) {
-    //TODO: deleteEmailRule
+  void deleteEmailRule(TMailRule emailRule) {
+    final deleteEmailRuleRequest = DeleteEmailRuleRequest(
+      emailRuleDelete : emailRule,
+      currentEmailRules: listEmailRule,
+    );
+    consumeState(_deleteEmailRuleInteractor.execute(_accountDashBoardController.accountId.value!, deleteEmailRuleRequest));
  }

-  void _getAllRules(AccountId accountId) {
-    consumeState(_getAllRulesInteractor.execute(accountId));
+  void _getAllRules() {
+    consumeState(_getAllRulesInteractor.execute(_accountDashBoardController.accountId.value!));
  }

  void openEditRuleMenuAction(BuildContext context, TMailRule rule) {
@@ -78,8 +92,10 @@ class EmailRulesController extends BaseController {
      iconRightPadding: const EdgeInsets.only(right: 12),
      textStyleAction: const TextStyle(
          fontSize: 17, color: AppColor.colorActionDeleteConfirmDialog),
-    )..onActionClick((rule) => deleteEmailRule(rule)))
-        .build();
+    )..onActionClick((rule) {
+      deleteEmailRule(rule);
+      popBack();
+    })).build();
  }

  Widget _editEmailRuleActionTile(BuildContext context, TMailRule rule) {
@@ -42,9 +42,7 @@ class ListEmailRulesWidget extends GetWidget<EmailRulesController> {
                  itemCount: controller.listEmailRule.length,
                  itemBuilder: (context, index) {
                    final rule = controller.listEmailRule[index];
-                    return EmailRulesItemWidget(
-                      rule: rule,
-                    );
+                    return EmailRulesItemWidget(rule: rule);
                  },
                  separatorBuilder: (BuildContext context, int index) =>
                      const Divider(
@@ -1,5 +1,4 @@
 import 'package:jmap_dart_client/jmap/core/id.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:rule_filter/rule_filter/rule_id.dart';

@@ -9,7 +9,6 @@ import 'package:jmap_dart_client/jmap/core/request/result_reference.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:rule_filter/rule_filter/capability_rule_filter.dart';
 import 'package:rule_filter/rule_filter/converter/rule_id_converter.dart';
-import 'package:rule_filter/rule_filter/rule_id.dart';

 part 'get_rule_filter_method.g.dart';

@@ -7,7 +7,6 @@ import 'package:jmap_dart_client/jmap/core/method/response/get_response.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:rule_filter/rule_filter/rule_filter.dart';
-import 'package:rule_filter/rule_filter/tmail_rule.dart';

 part 'get_rule_filter_response.g.dart';

@@ -1,7 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
-import 'package:json_annotation/json_annotation.dart';
 import 'package:rule_filter/rule_filter/converter/rule_filter_id_coverter.dart';

 enum RuleFilterIdType {
@@ -1,7 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
-import 'package:json_annotation/json_annotation.dart';

@IdConverter()
 class RuleId with EquatableMixin {
@@ -35,4 +35,18 @@ class TMailRule extends Rule {
        condition,
        action,
      ];
+
+  TMailRule copyWith({
+    RuleId? id,
+    String? name,
+    RuleCondition? condition,
+    RuleAction? action,
+  }) {
+    return TMailRule(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      condition: condition ?? this.condition,
+      action: action ?? this.action,
+    );
+  }
 }