TF-1915 SendingState of SendingEmail updates according to the work done in WorkManager when network connectivity is restored
(cherry picked from commit 744c8bc8dc8a82cb3afb75aead5a744adaae5501)
This commit is contained in:
@@ -0,0 +1,91 @@
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:model/extensions/email_extension.dart';
|
||||
import 'package:model/extensions/email_id_extensions.dart';
|
||||
import 'package:model/extensions/identity_id_extension.dart';
|
||||
import 'package:model/extensions/mailbox_id_extension.dart';
|
||||
import 'package:model/mailbox/select_mode.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
|
||||
import 'package:tmail_ui_user/features/offline_mode/model/sending_email_hive_cache.dart';
|
||||
import 'package:tmail_ui_user/features/offline_mode/model/sending_state.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
|
||||
|
||||
extension SendingEmailExtension on SendingEmail {
|
||||
SendingEmailHiveCache toHiveCache() {
|
||||
return SendingEmailHiveCache(
|
||||
sendingId,
|
||||
email.asString(),
|
||||
emailActionType.name,
|
||||
createTime,
|
||||
sentMailboxId?.asString,
|
||||
emailIdDestroyed?.asString,
|
||||
emailIdAnsweredOrForwarded?.asString,
|
||||
identityId?.asString,
|
||||
mailboxNameRequest?.name,
|
||||
creationIdRequest?.value,
|
||||
sendingState.name,
|
||||
);
|
||||
}
|
||||
|
||||
EmailRequest toEmailRequest({Email? newEmail}) {
|
||||
return EmailRequest(
|
||||
email: newEmail ?? email,
|
||||
emailActionType: emailActionType,
|
||||
sentMailboxId: sentMailboxId,
|
||||
emailIdDestroyed: emailIdDestroyed,
|
||||
emailIdAnsweredOrForwarded: emailIdAnsweredOrForwarded,
|
||||
identityId: identityId,
|
||||
storedSendingId: sendingId
|
||||
);
|
||||
}
|
||||
|
||||
SendingEmail toggleSelection() {
|
||||
return SendingEmail(
|
||||
sendingId: sendingId,
|
||||
email: email,
|
||||
emailActionType: emailActionType,
|
||||
createTime: createTime,
|
||||
sentMailboxId: sentMailboxId,
|
||||
emailIdDestroyed: emailIdDestroyed,
|
||||
emailIdAnsweredOrForwarded: emailIdAnsweredOrForwarded,
|
||||
identityId: identityId,
|
||||
mailboxNameRequest: mailboxNameRequest,
|
||||
creationIdRequest: creationIdRequest,
|
||||
sendingState: sendingState,
|
||||
selectMode: selectMode == SelectMode.INACTIVE ? SelectMode.ACTIVE : SelectMode.INACTIVE
|
||||
);
|
||||
}
|
||||
|
||||
SendingEmail unSelected() {
|
||||
return SendingEmail(
|
||||
sendingId: sendingId,
|
||||
email: email,
|
||||
emailActionType: emailActionType,
|
||||
createTime: createTime,
|
||||
sentMailboxId: sentMailboxId,
|
||||
emailIdDestroyed: emailIdDestroyed,
|
||||
emailIdAnsweredOrForwarded: emailIdAnsweredOrForwarded,
|
||||
identityId: identityId,
|
||||
mailboxNameRequest: mailboxNameRequest,
|
||||
creationIdRequest: creationIdRequest,
|
||||
sendingState: sendingState,
|
||||
selectMode: SelectMode.INACTIVE
|
||||
);
|
||||
}
|
||||
|
||||
SendingEmail updatingSendingState(SendingState newState) {
|
||||
return SendingEmail(
|
||||
sendingId: sendingId,
|
||||
email: email,
|
||||
emailActionType: emailActionType,
|
||||
createTime: createTime,
|
||||
sentMailboxId: sentMailboxId,
|
||||
emailIdDestroyed: emailIdDestroyed,
|
||||
emailIdAnsweredOrForwarded: emailIdAnsweredOrForwarded,
|
||||
identityId: identityId,
|
||||
mailboxNameRequest: mailboxNameRequest,
|
||||
creationIdRequest: creationIdRequest,
|
||||
sendingState: newState,
|
||||
selectMode: selectMode
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
import 'dart:convert';
|
||||
import 'package:core/domain/extensions/datetime_extension.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_date_range_picker/flutter_date_range_picker.dart';
|
||||
import 'package:jmap_dart_client/http/converter/email_id_nullable_converter.dart';
|
||||
import 'package:jmap_dart_client/http/converter/id_nullable_converter.dart';
|
||||
import 'package:jmap_dart_client/http/converter/identities/identity_id_nullable_converter.dart';
|
||||
import 'package:jmap_dart_client/http/converter/mailbox_id_nullable_converter.dart';
|
||||
import 'package:jmap_dart_client/http/converter/mailbox_name_converter.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/id.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:model/email/email_action_type.dart';
|
||||
import 'package:model/email/presentation_email.dart';
|
||||
import 'package:model/extensions/email_extension.dart';
|
||||
import 'package:model/mailbox/select_mode.dart';
|
||||
import 'package:tmail_ui_user/features/offline_mode/model/sending_state.dart';
|
||||
|
||||
class SendingEmail with EquatableMixin {
|
||||
final String sendingId;
|
||||
final Email email;
|
||||
final MailboxId? sentMailboxId;
|
||||
final EmailId? emailIdDestroyed;
|
||||
final EmailId? emailIdAnsweredOrForwarded;
|
||||
final IdentityId? identityId;
|
||||
final EmailActionType emailActionType;
|
||||
final MailboxName? mailboxNameRequest;
|
||||
final Id? creationIdRequest;
|
||||
final DateTime createTime;
|
||||
final SelectMode selectMode;
|
||||
final SendingState sendingState;
|
||||
|
||||
SendingEmail({
|
||||
required this.sendingId,
|
||||
required this.email,
|
||||
required this.emailActionType,
|
||||
required this.createTime,
|
||||
this.sentMailboxId,
|
||||
this.emailIdDestroyed,
|
||||
this.emailIdAnsweredOrForwarded,
|
||||
this.identityId,
|
||||
this.mailboxNameRequest,
|
||||
this.creationIdRequest,
|
||||
this.selectMode = SelectMode.INACTIVE,
|
||||
this.sendingState = SendingState.ready
|
||||
});
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final val = <String, dynamic>{};
|
||||
|
||||
void writeNotNull(String key, dynamic value) {
|
||||
if (value != null) {
|
||||
val[key] = value;
|
||||
}
|
||||
}
|
||||
|
||||
writeNotNull('sendingId', sendingId);
|
||||
writeNotNull('email', email.asString());
|
||||
writeNotNull('emailActionType', emailActionType.name);
|
||||
writeNotNull('createTime', createTime.toIso8601String());
|
||||
writeNotNull('sentMailboxId', const MailboxIdNullableConverter().toJson(sentMailboxId));
|
||||
writeNotNull('emailIdDestroyed', const EmailIdNullableConverter().toJson(emailIdDestroyed));
|
||||
writeNotNull('emailIdAnsweredOrForwarded', const EmailIdNullableConverter().toJson(emailIdAnsweredOrForwarded));
|
||||
writeNotNull('identityId', const IdentityIdNullableConverter().toJson(identityId));
|
||||
writeNotNull('mailboxNameRequest', mailboxNameRequest?.name);
|
||||
writeNotNull('creationIdRequest', const IdNullableConverter().toJson(creationIdRequest));
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
PresentationEmail get presentationEmail => email.sendingEmailToPresentationEmail();
|
||||
|
||||
String getCreateTimeAt(String newLocale) {
|
||||
return DateFormat(createTime.toPattern(), newLocale).format(createTime);
|
||||
}
|
||||
|
||||
factory SendingEmail.fromJson(Map<String, dynamic> json) {
|
||||
return SendingEmail(
|
||||
sendingId: json['sendingId'] as String,
|
||||
email: Email.fromJson(jsonDecode(json['email'])),
|
||||
emailActionType: _getEmailActionType(json['emailActionType'] as String),
|
||||
createTime: DateTime.parse(json['createTime'] as String),
|
||||
sentMailboxId: const MailboxIdNullableConverter().fromJson(json['sentMailboxId'] as String?),
|
||||
emailIdDestroyed: const EmailIdNullableConverter().fromJson(json['emailIdDestroyed'] as String?),
|
||||
emailIdAnsweredOrForwarded: const EmailIdNullableConverter().fromJson(json['emailIdAnsweredOrForwarded'] as String?),
|
||||
identityId: const IdentityIdNullableConverter().fromJson(json['identityId'] as String?),
|
||||
mailboxNameRequest: const MailboxNameConverter().fromJson(json['mailboxNameRequest'] as String?),
|
||||
creationIdRequest: const IdNullableConverter().fromJson(json['creationIdRequest'] as String?),
|
||||
);
|
||||
}
|
||||
|
||||
static EmailActionType _getEmailActionType(String value) {
|
||||
return EmailActionType.values.firstWhere(
|
||||
(type) => type.name == value,
|
||||
orElse: () => throw ArgumentError('Invalid email action type: $value'),
|
||||
);
|
||||
}
|
||||
|
||||
bool get isSelected => selectMode == SelectMode.ACTIVE;
|
||||
|
||||
bool get isDelivering => sendingState == SendingState.delivering;
|
||||
|
||||
bool get isReady => sendingState == SendingState.ready;
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
sendingId,
|
||||
email,
|
||||
emailActionType,
|
||||
createTime,
|
||||
sentMailboxId,
|
||||
emailIdDestroyed,
|
||||
emailIdAnsweredOrForwarded,
|
||||
identityId,
|
||||
mailboxNameRequest,
|
||||
creationIdRequest,
|
||||
selectMode,
|
||||
sendingState,
|
||||
];
|
||||
}
|
||||
@@ -1,10 +1,14 @@
|
||||
|
||||
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/composer/domain/model/sending_email.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
|
||||
|
||||
abstract class SendingQueueRepository {
|
||||
Future<List<SendingEmail>> getAllSendingEmails(AccountId accountId, UserName userName, {bool needToReopen = false});
|
||||
|
||||
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId);
|
||||
Future<SendingEmail> storeSendingEmail(AccountId accountId, UserName userName, SendingEmail sendingEmail);
|
||||
|
||||
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId, {bool needToReopen = false});
|
||||
|
||||
Future<SendingEmail> updateSendingEmail(AccountId accountId, UserName userName, SendingEmail newSendingEmail, {bool needToReopen = false});
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
|
||||
class DeleteSendingEmailLoading extends UIState {}
|
||||
|
||||
class DeleteSendingEmailSuccess extends UIState {}
|
||||
|
||||
class DeleteSendingEmailFailure extends FeatureFailure {
|
||||
DeleteSendingEmailFailure(dynamic exception) : super(exception: exception);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [exception];
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/model/sending_email.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
|
||||
|
||||
class GetAllSendingEmailLoading extends UIState {}
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
|
||||
|
||||
class StoreSendingEmailLoading extends UIState {}
|
||||
|
||||
class StoreSendingEmailSuccess extends UIState {
|
||||
|
||||
final SendingEmail sendingEmail;
|
||||
|
||||
StoreSendingEmailSuccess(this.sendingEmail);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [sendingEmail];
|
||||
}
|
||||
|
||||
class StoreSendingEmailFailure extends FeatureFailure {
|
||||
StoreSendingEmailFailure(dynamic exception) : super(exception: exception);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [exception];
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
|
||||
|
||||
class UpdateSendingEmailLoading extends UIState {}
|
||||
|
||||
class UpdateSendingEmailSuccess extends UIState {
|
||||
final SendingEmail newSendingEmail;
|
||||
|
||||
UpdateSendingEmailSuccess(this.newSendingEmail);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [newSendingEmail];
|
||||
}
|
||||
|
||||
class UpdateSendingEmailFailure extends FeatureFailure {
|
||||
|
||||
UpdateSendingEmailFailure(dynamic exception) : super(exception: exception);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [exception];
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
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/email/domain/state/delete_sending_email_state.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/repository/sending_queue_repository.dart';
|
||||
|
||||
class DeleteSendingEmailInteractor {
|
||||
final SendingQueueRepository _sendingQueueRepository;
|
||||
|
||||
DeleteSendingEmailInteractor(this._sendingQueueRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId, UserName userName, String sendingId, {bool needToReopen = false}) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(DeleteSendingEmailLoading());
|
||||
await _sendingQueueRepository.deleteSendingEmail(accountId, userName, sendingId, needToReopen: needToReopen);
|
||||
yield Right<Failure, Success>(DeleteSendingEmailSuccess());
|
||||
} catch (e) {
|
||||
yield Left<Failure, Success>(DeleteSendingEmailFailure(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
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/email/domain/state/store_sending_email_state.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/repository/sending_queue_repository.dart';
|
||||
|
||||
class StoreSendingEmailInteractor {
|
||||
final SendingQueueRepository _sendingQueueRepository;
|
||||
|
||||
StoreSendingEmailInteractor(this._sendingQueueRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(
|
||||
AccountId accountId,
|
||||
UserName userName,
|
||||
SendingEmail sendingEmail,
|
||||
) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(StoreSendingEmailLoading());
|
||||
final storedSendingEmail = await _sendingQueueRepository.storeSendingEmail(accountId, userName, sendingEmail);
|
||||
yield Right<Failure, Success>(StoreSendingEmailSuccess(storedSendingEmail));
|
||||
} catch (e) {
|
||||
yield Left<Failure, Success>(StoreSendingEmailFailure(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
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/sending_queue/domain/model/sending_email.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/repository/sending_queue_repository.dart';
|
||||
import 'package:tmail_ui_user/features/sending_queue/domain/state/update_sending_email_state.dart';
|
||||
|
||||
class UpdateSendingEmailInteractor {
|
||||
final SendingQueueRepository _sendingQueueRepository;
|
||||
|
||||
UpdateSendingEmailInteractor(this._sendingQueueRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(
|
||||
AccountId accountId,
|
||||
UserName userName,
|
||||
SendingEmail newSendingEmail,
|
||||
{bool needToReopen = false}
|
||||
) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(UpdateSendingEmailLoading());
|
||||
final storedSendingEmail = await _sendingQueueRepository.updateSendingEmail(accountId, userName, newSendingEmail, needToReopen: needToReopen);
|
||||
yield Right<Failure, Success>(UpdateSendingEmailSuccess(storedSendingEmail));
|
||||
} catch (e) {
|
||||
yield Left<Failure, Success>(UpdateSendingEmailFailure(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user