TF-3333 Remove Mailbox/query & Mailbox/get when performing display spam banner

lib/features/mailbox_dashboard/data/datasource_impl/spam_report_datasource_impl.dart

@@ -1,73 +0,0 @@
-
-import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
-import 'package:jmap_dart_client/jmap/core/user_name.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/network/spam_report_api.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
-import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
-
-class SpamReportDataSourceImpl extends SpamReportDataSource {
-  final SpamReportApi _spamReportApi;
-  final ExceptionThrower _exceptionThrower;
-
-  SpamReportDataSourceImpl(this._spamReportApi, this._exceptionThrower);
-
-  @override
-  Future<bool> deleteLastTimeDismissedSpamReported() {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
-    Session session,
-    AccountId accountId,
-    {
-      MailboxFilterCondition? mailboxFilterCondition,
-      UnsignedInt? limit
-    }
-  ) {
-     return Future.sync(() async {
-      final unreadSpamEmailsResponse = await _spamReportApi.getUnreadSpamEmailbox(
-        session,
-        accountId,
-        mailboxFilterCondition: mailboxFilterCondition,
-        limit: limit);
-      return unreadSpamEmailsResponse;
-    }).catchError(_exceptionThrower.throwException);
-  }
-
-  @override
-  Future<DateTime> getLastTimeDismissedSpamReported() {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<bool> storeLastTimeDismissedSpamReported(DateTime lastTimeDismissedSpamReported) {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<void> deleteSpamReportState() {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<SpamReportState> getSpamReportState() {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<void> storeSpamReportState(SpamReportState spamReportState) {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
-    throw UnimplementedError();
-  }
-}

lib/features/mailbox_dashboard/data/network/spam_report_api.dart

@@ -1,60 +0,0 @@
-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/request/reference_path.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
-import 'package:jmap_dart_client/jmap/jmap_request.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/get/get_mailbox_method.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/get/get_mailbox_response.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/query/query_mailbox_method.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/exceptions/spam_report_exception.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
-import 'package:tmail_ui_user/main/error/capability_validator.dart';
-
-class SpamReportApi {
-  final HttpClient _httpClient;
-  static const int _deafaultLimit = 1; 
-
-  SpamReportApi(this._httpClient);
-
-  Future<UnreadSpamEmailsResponse> getUnreadSpamEmailbox(
-    Session session,
-    AccountId accountId,
-    {
-      MailboxFilterCondition? mailboxFilterCondition,
-      UnsignedInt? limit
-    }
-  ) async {
-    final processingInvocation = ProcessingInvocation();
-    final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
-    final spamReportQueryMethod = QueryMailboxMethod(accountId)..addLimit(limit ?? UnsignedInt(_deafaultLimit));
-
-    if(mailboxFilterCondition != null) spamReportQueryMethod.addFilters(mailboxFilterCondition);
-
-    final spamReportQueryMethodInvocation = requestBuilder.invocation(spamReportQueryMethod);
-    final getMailBoxMethod = GetMailboxMethod(accountId)
-        ..addReferenceIds(processingInvocation.createResultReference(
-          spamReportQueryMethodInvocation.methodCallId,
-          ReferencePath.idsPath,
-        ));
-    final getMailboxInvocation = requestBuilder.invocation(getMailBoxMethod);
-
-    final capabilities = getMailBoxMethod.requiredCapabilities
-      .toCapabilitiesSupportTeamMailboxes(session, accountId);
-
-    final result = await (requestBuilder
-            ..usings(capabilities))
-          .build()
-          .execute();
-
-    final mailboxResponse = result
-        .parse<GetMailboxResponse>(getMailboxInvocation.methodCallId, GetMailboxResponse.deserialize);
-
-    if (mailboxResponse?.list.isNotEmpty == true) {
-      return UnreadSpamEmailsResponse(unreadSpamMailbox: mailboxResponse!.list.first);
-    } else {
-      throw NotFoundSpamMailboxException();
-    }
-  }
-}

lib/features/mailbox_dashboard/data/repository/spam_report_repository_impl.dart

@@ -1,13 +1,9 @@
 import 'package:core/data/model/source_type/data_source_type.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
 
 class SpamReportRepositoryImpl extends SpamReportRepository {
@@ -30,22 +26,6 @@ class SpamReportRepositoryImpl extends SpamReportRepository {
     return mapDataSource[DataSourceType.local]!.deleteLastTimeDismissedSpamReported();
   }
 
-  @override
-  Future<UnreadSpamEmailsResponse> getUnreadSpamMailbox(
-    Session session,
-    AccountId accountId,
-    {
-      MailboxFilterCondition? mailboxFilterCondition,
-      UnsignedInt? limit
-    }
-  ) {
-    return mapDataSource[DataSourceType.network]!.findNumberOfUnreadSpamEmails(
-      session,
-      accountId,
-      mailboxFilterCondition: mailboxFilterCondition,
-      limit: limit);
-  }
-
   @override
   Future<SpamReportState> getSpamReportState() async {
     return await mapDataSource[DataSourceType.local]!.getSpamReportState();

lib/features/mailbox_dashboard/domain/repository/spam_report_repository.dart

@@ -1,11 +1,7 @@
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
 
 abstract class SpamReportRepository {
   Future<void> storeLastTimeDismissedSpamReported(DateTime lastTimeDismissedSpamReported);
@@ -14,15 +10,6 @@ abstract class SpamReportRepository {
 
   Future<void> deleteLastTimeDismissedSpamReported();
 
-  Future<UnreadSpamEmailsResponse> getUnreadSpamMailbox(
-    Session session,
-    AccountId accountId,
-    {
-      MailboxFilterCondition? mailboxFilterCondition,
-      UnsignedInt? limit
-    }
-  );
-
   Future<SpamReportState> getSpamReportState();
 
   Future<void> storeSpamReportState(SpamReportState spamReportState);

lib/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart

@@ -1,21 +0,0 @@
-import 'package:core/presentation/state/failure.dart';
-import 'package:core/presentation/state/success.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-
-class GetUnreadSpamMailboxLoading extends UIState {}
-
-class GetUnreadSpamMailboxSuccess extends UIState {
-  final Mailbox unreadSpamMailbox;
-
-  GetUnreadSpamMailboxSuccess(this.unreadSpamMailbox);
-
-  @override
-  List<Object> get props => [unreadSpamMailbox];
-}
-
-class InvalidSpamReportCondition extends FeatureFailure {}
-
-class GetUnreadSpamMailboxFailure extends FeatureFailure {
-
-  GetUnreadSpamMailboxFailure(dynamic exception) : super(exception: exception);
-}

lib/features/mailbox_dashboard/domain/state/get_spam_mailbox_cached_state.dart

@@ -18,3 +18,5 @@ class GetSpamMailboxCachedFailure extends FeatureFailure {
 
   GetSpamMailboxCachedFailure(exception) : super(exception: exception);
 }
+
+class InvalidSpamReportCondition extends FeatureFailure {}

lib/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart

@@ -6,7 +6,6 @@ import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_spam_mailbox_cached_state.dart';
 
 class GetSpamMailboxCachedInteractor {

lib/features/mailbox_dashboard/domain/usecases/get_unread_spam_mailbox_interactor.dart

@@ -1,56 +0,0 @@
-
-import 'package:core/presentation/state/failure.dart';
-import 'package:core/presentation/state/success.dart';
-import 'package:core/utils/app_logger.dart';
-import 'package:dartz/dartz.dart';
-import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart';
-
-class GetUnreadSpamMailboxInteractor {
-  final SpamReportRepository _spamReportRepository;
-
-  GetUnreadSpamMailboxInteractor(this._spamReportRepository);
-
-   Stream<Either<Failure, Success>> execute(
-    Session session,
-    AccountId accountId,
-    {
-      UnsignedInt? limit,
-      MailboxFilterCondition? mailboxFilterCondition,
-    }
-  ) async* {
-    try {
-      yield Right(GetUnreadSpamMailboxLoading());
-      if (await _validateIntervalToShowBanner()) {
-        final response =  await _spamReportRepository.getUnreadSpamMailbox(
-          session,
-          accountId,
-          mailboxFilterCondition: mailboxFilterCondition,
-          limit: limit);
-        final unreadSpamMailbox = response.unreadSpamMailbox;
-
-        if (unreadSpamMailbox!.unreadEmails!.value.value > 0) {
-          yield Right(GetUnreadSpamMailboxSuccess(unreadSpamMailbox));
-        } else {
-          yield Left(InvalidSpamReportCondition());
-        }
-      } else {
-        yield Left(InvalidSpamReportCondition());
-      }
-    } catch (e) {
-      yield Left(GetUnreadSpamMailboxFailure(e));
-    }
-  }
-
-  Future<bool> _validateIntervalToShowBanner() async {
-    final lastTimeDismissedSpamReported = await _spamReportRepository.getLastTimeDismissedSpamReported();
-    final currentTime = DateTime.now().difference(lastTimeDismissedSpamReported);
-    log('GetUnreadSpamMailboxInteractor::_compareSpamReportTime:lastTimeDismissedSpamReported: $lastTimeDismissedSpamReported | currentTime: $currentTime');
-    return currentTime.inHours > GetSpamMailboxCachedInteractor.spamReportBannerDisplayIntervalInHour;
-  }
-}

lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart

@@ -52,14 +52,11 @@ import 'package:tmail_ui_user/features/mailbox/domain/usecases/mark_as_mailbox_r
 import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_bindings.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/search_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/session_storage_composer_datasource.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/hive_spam_report_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/local_spam_report_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/search_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/session_storage_composer_datasoure_impl.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/spam_report_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/local_spam_report_manager.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/network/spam_report_api.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/search_repository_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/spam_report_repository_impl.dart';
@@ -71,7 +68,6 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_app
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_composer_cache_on_web_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_spam_report_state_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_unread_spam_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/quick_search_email_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_email_drafts_interactor.dart';
@@ -153,7 +149,6 @@ class MailboxDashBoardBindings extends BaseBindings {
 
     Get.put(SpamReportController(
       Get.find<StoreSpamReportInteractor>(),
-      Get.find<GetUnreadSpamMailboxInteractor>(),
       Get.find<StoreSpamReportStateInteractor>(),
       Get.find<GetSpamReportStateInteractor>(),
       Get.find<GetSpamMailboxCachedInteractor>()));
@@ -198,7 +193,6 @@ class MailboxDashBoardBindings extends BaseBindings {
     Get.lazyPut<PrintFileDataSource>(() => Get.find<PrintFileDataSourceImpl>());
     Get.lazyPut<MailboxDataSource>(() => Get.find<MailboxDataSourceImpl>());
     Get.lazyPut<SessionStorageComposerDatasource>(() => Get.find<SessionStorageComposerDatasourceImpl>());
-    Get.lazyPut<SpamReportDataSource>(() => Get.find<SpamReportDataSourceImpl>());
     Get.lazyPut<MailboxDataSource>(() => Get.find<MailboxDataSourceImpl>());
     Get.lazyPut<MailboxCacheDataSourceImpl>(() => Get.find<MailboxCacheDataSourceImpl>());
     Get.lazyPut<ServerSettingsDataSource>(
@@ -244,10 +238,6 @@ class MailboxDashBoardBindings extends BaseBindings {
     Get.lazyPut(() => SessionStorageComposerDatasourceImpl(
       Get.find<HtmlTransform>(),
       Get.find<CacheExceptionThrower>()));
-     Get.lazyPut(() => SpamReportDataSourceImpl(
-      Get.find<SpamReportApi>(),
-      Get.find<RemoteExceptionThrower>(),
-    ));    
     Get.lazyPut(() => LocalSpamReportDataSourceImpl(
       Get.find<LocalSpamReportManager>(),
       Get.find<CacheExceptionThrower>(),
@@ -306,8 +296,6 @@ class MailboxDashBoardBindings extends BaseBindings {
       Get.find<EmailRepository>()));
     Get.lazyPut(() => StoreSpamReportInteractor(
       Get.find<SpamReportRepository>()));
-    Get.lazyPut(() => GetUnreadSpamMailboxInteractor(
-      Get.find<SpamReportRepository>()));
     Get.lazyPut(() => StoreSpamReportStateInteractor(
       Get.find<SpamReportRepository>()));
     Get.lazyPut(() => GetSpamReportStateInteractor(
@@ -376,7 +364,6 @@ class MailboxDashBoardBindings extends BaseBindings {
     Get.lazyPut(() => ComposerCacheRepositoryImpl(Get.find<SessionStorageComposerDatasource>()));
     Get.lazyPut(() => SpamReportRepositoryImpl(
       {
-        DataSourceType.network: Get.find<SpamReportDataSource>(),
         DataSourceType.local: Get.find<LocalSpamReportDataSourceImpl>(),
         DataSourceType.hiveCache: Get.find<HiveSpamReportDataSourceImpl>()
       },

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -2112,15 +2112,25 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
   bool get enableSpamReport => spamReportController.enableSpamReport;
 
   void getSpamReportBanner() {
-    if (spamReportController.enableSpamReport &&
+    if (enableSpamReport) {
-        sessionCurrent != null &&
+      final spamId = spamMailboxId;
-        accountId.value != null) {
+      if (spamId == null) {
-      spamReportController.getSpamMailboxAction(sessionCurrent!, accountId.value!);
+        spamReportController.setSpamPresentationMailbox(null);
+        return;
+      }
+
+      final spamMailbox = mapMailboxById[spamId];
+      final unreadEmails = spamMailbox?.unreadEmails?.value.value ?? 0;
+      if (unreadEmails > 0) {
+        spamReportController.setSpamPresentationMailbox(spamMailbox);
+      } else {
+        spamReportController.setSpamPresentationMailbox(null);
+      }
     }
   }
 
   void refreshSpamReportBanner() {
-    if (spamReportController.enableSpamReport && sessionCurrent != null && accountId.value != null) {
+    if (enableSpamReport && sessionCurrent != null && accountId.value != null) {
       spamReportController.getSpamMailboxCached(accountId.value!, sessionCurrent!.username);
     }
   }

lib/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart

@@ -3,31 +3,25 @@ import 'package:core/presentation/state/success.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
 import 'package:model/extensions/mailbox_extension.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_spam_mailbox_cached_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_spam_report_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/store_last_time_dismissed_spam_reported_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/store_spam_report_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_spam_report_state_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_unread_spam_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/store_last_time_dismissed_spam_reported_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/store_spam_report_state_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 
 class SpamReportController extends BaseController {
   final StoreSpamReportInteractor _storeSpamReportInteractor;
-  final GetUnreadSpamMailboxInteractor _getNumberOfUnreadSpamEmailsInteractor;
   final StoreSpamReportStateInteractor _storeSpamReportStateInteractor;
   final GetSpamReportStateInteractor _getSpamReportStateInteractor;
   final GetSpamMailboxCachedInteractor _getSpamMailboxCachedInteractor;
@@ -37,7 +31,6 @@ class SpamReportController extends BaseController {
 
   SpamReportController(
     this._storeSpamReportInteractor,
-    this._getNumberOfUnreadSpamEmailsInteractor,
     this._storeSpamReportStateInteractor,
     this._getSpamReportStateInteractor,
     this._getSpamMailboxCachedInteractor
@@ -46,9 +39,7 @@ class SpamReportController extends BaseController {
   @override
   void handleSuccessViewState(Success success) {
     super.handleSuccessViewState(success);
-    if (success is GetUnreadSpamMailboxSuccess){
+    if (success is StoreLastTimeDismissedSpamReportSuccess) {
-      presentationSpamMailbox.value = success.unreadSpamMailbox.toPresentationMailbox();
-    } else if (success is StoreLastTimeDismissedSpamReportSuccess) {
       presentationSpamMailbox.value = null;
     } else if (success is GetSpamReportStateSuccess) {
       spamReportState.value = success.spamReportState;
@@ -62,9 +53,7 @@ class SpamReportController extends BaseController {
   @override
   void handleFailureViewState(Failure failure) {
     super.handleFailureViewState(failure);
-    if (failure is GetUnreadSpamMailboxFailure ||
+    if (failure is GetSpamMailboxCachedFailure) {
-        failure is GetSpamMailboxCachedFailure ||
-        failure is InvalidSpamReportCondition) {
       presentationSpamMailbox.value = null;
     }
   }
@@ -91,13 +80,6 @@ class SpamReportController extends BaseController {
     }
   }
 
-  void getSpamMailboxAction(Session session, AccountId accountId) {
-    consumeState(_getNumberOfUnreadSpamEmailsInteractor.execute(
-      session,
-      accountId,
-      mailboxFilterCondition: MailboxFilterCondition(role: Role('Spam'))));
-  }
-
   void getSpamMailboxCached(AccountId accountId, UserName userName) {
     consumeState(_getSpamMailboxCachedInteractor.execute(accountId, userName));
   }
@@ -121,6 +103,10 @@ class SpamReportController extends BaseController {
   }
 
   void getSpamReportStateAction() {
-   consumeState(_getSpamReportStateInteractor.execute());
+    consumeState(_getSpamReportStateInteractor.execute());
+  }
+
+  void setSpamPresentationMailbox(PresentationMailbox? spamMailbox) {
+    presentationSpamMailbox.value = spamMailbox;
   }
 }

lib/main/bindings/network/network_bindings.dart

@@ -26,7 +26,6 @@ import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_aut
 import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/local/state_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_api.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/network/spam_report_api.dart';
 import 'package:tmail_ui_user/features/manage_account/data/network/forwarding_api.dart';
 import 'package:tmail_ui_user/features/manage_account/data/network/identity_api.dart';
 import 'package:tmail_ui_user/features/manage_account/data/network/rule_filter_api.dart';
@@ -123,7 +122,6 @@ class NetworkBindings extends Bindings {
     Get.put(ForwardingAPI(Get.find<HttpClient>()));
     Get.put(QuotasAPI(Get.find<HttpClient>()));
     Get.put(FcmApi(Get.find<HttpClient>()));
-    Get.put(SpamReportApi(Get.find<HttpClient>()));
     Get.put(ServerSettingsAPI(Get.find<HttpClient>()));
     Get.put(WebSocketApi(Get.find<DioClient>()));
   }