fixup! fixup! TF-4236 Misleading variable name: maxBatches represents batch size, not batch count.

2026-01-27 09:36:01 +07:00
parent 4f27dc53ce
commit 8d989c3caa
4 changed files with 282 additions and 404 deletions
@@ -48,52 +48,67 @@ mixin BatchSetEmailProcessingMixin on HandleSetErrorMixin, MailAPIMixin {
    for (int start = 0; start < totalEmails; start += batchSize) {
      int end =
          (start + batchSize < totalEmails) ? start + batchSize : totalEmails;
-
-      log('EmailAPI::$debugLabel:emails from ${start + 1} to $end');
-
      final currentListEmailIds = emailIds.sublist(start, end);

-      final setEmailMethod = SetEmailMethod(accountId)
-        ..addUpdates(onGenerateUpdates(currentListEmailIds));
+      log('BatchSetEmailProcessingMixin::$debugLabel: processing batch ${start + 1} to $end');

-      final requestBuilder = JmapRequestBuilder(
-        httpClient,
-        ProcessingInvocation(),
-      );
-      final setEmailInvocation = requestBuilder.invocation(setEmailMethod);
-
-      final capabilities = setEmailMethod.requiredCapabilities
-          .toCapabilitiesSupportTeamMailboxes(session, accountId);
-
-      final response =
-          await (requestBuilder..usings(capabilities)).build().execute();
-
-      SetEmailResponse? setEmailResponse;
      try {
-        setEmailResponse = response.parse<SetEmailResponse>(
-          setEmailInvocation.methodCallId,
-          SetEmailResponse.deserialize,
+        final response = await _executeSetEmailBatch(
+          session: session,
+          accountId: accountId,
+          httpClient: httpClient,
+          emailIds: currentListEmailIds,
+          onGenerateUpdates: onGenerateUpdates,
        );
+
+        if (response != null) {
+          final listEmailIds = response.updated?.keys.toEmailIds() ?? [];
+          updatedEmailIds.addAll(listEmailIds);
+          listSetResponse.add(response);
+        } else {
+          throw Exception('SetEmailResponse is null');
+        }
      } catch (e) {
-        log('EmailAPI::$debugLabel: Failed to parse response: $e');
-        setEmailResponse = null;
+        logWarning(
+          'BatchSetEmailProcessingMixin::$debugLabel: Error processing batch ${start + 1}-$end',
+        );
      }
-
-      if (setEmailResponse == null) {
-        log('EmailAPI::$debugLabel: Batch from ${start + 1} to $end returned null response');
-        continue;
-      }
-
-      final listEmailIds = setEmailResponse.updated?.keys.toEmailIds() ?? [];
-      updatedEmailIds.addAll(listEmailIds);
-      listSetResponse.add(setEmailResponse);
    }

-    Map<Id, SetError> mapErrors = <Id, SetError>{};
+    Map<Id, SetError> finalMapErrors = <Id, SetError>{};
    if (listSetResponse.isNotEmpty) {
-      mapErrors = handleSetResponse(listSetResponse);
+      finalMapErrors = handleSetResponse(listSetResponse);
    }

-    return (emailIdsSuccess: updatedEmailIds, mapErrors: mapErrors);
+    return (emailIdsSuccess: updatedEmailIds, mapErrors: finalMapErrors);
+  }
+
+  Future<SetEmailResponse?> _executeSetEmailBatch({
+    required Session session,
+    required AccountId accountId,
+    required HttpClient httpClient,
+    required List<EmailId> emailIds,
+    required OnGeneratePatchObjectUpdates onGenerateUpdates,
+  }) async {
+    final setEmailMethod = SetEmailMethod(accountId)
+      ..addUpdates(onGenerateUpdates(emailIds));
+
+    final requestBuilder = JmapRequestBuilder(
+      httpClient,
+      ProcessingInvocation(),
+    );
+
+    final setEmailInvocation = requestBuilder.invocation(setEmailMethod);
+
+    final capabilities = setEmailMethod.requiredCapabilities
+        .toCapabilitiesSupportTeamMailboxes(session, accountId);
+
+    final response =
+        await (requestBuilder..usings(capabilities)).build().execute();
+
+    return response.parse<SetEmailResponse>(
+      setEmailInvocation.methodCallId,
+      SetEmailResponse.deserialize,
+    );
  }
 }
@@ -5,6 +5,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/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
 import 'package:tmail_ui_user/features/email/domain/exceptions/email_exceptions.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_a_thread_state.dart';
@@ -37,7 +38,9 @@ class AddALabelToAThreadInteractor {
        ));
      } else if (result.emailIdsSuccess.isEmpty) {
        yield Left(AddALabelToAThreadFailure(
-          exception: EmailIdsSuccessIsEmptyException(),
+          exception: result.mapErrors.isNotEmpty
+              ? SetMethodException(result.mapErrors)
+              : EmailIdsSuccessIsEmptyException(),
          labelDisplay: labelDisplay,
        ));
      } else {
@@ -5,6 +5,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/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
 import 'package:tmail_ui_user/features/email/domain/exceptions/email_exceptions.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_a_thread_state.dart';
@@ -37,7 +38,9 @@ class RemoveALabelFromAThreadInteractor {
        ));
      } else if (result.emailIdsSuccess.isEmpty) {
        yield Left(RemoveALabelFromAThreadFailure(
-          exception: EmailIdsSuccessIsEmptyException(),
+          exception: result.mapErrors.isNotEmpty
+              ? SetMethodException(result.mapErrors)
+              : EmailIdsSuccessIsEmptyException(),
          labelDisplay: labelDisplay,
        ));
      } else {