TF-3649 Fix reply to own sent email
This commit is contained in:
@@ -6,6 +6,7 @@ import 'package:model/email/email_action_type.dart';
|
|||||||
import 'package:model/email/presentation_email.dart';
|
import 'package:model/email/presentation_email.dart';
|
||||||
import 'package:model/extensions/email_address_extension.dart';
|
import 'package:model/extensions/email_address_extension.dart';
|
||||||
import 'package:model/extensions/list_email_address_extension.dart';
|
import 'package:model/extensions/list_email_address_extension.dart';
|
||||||
|
import 'package:model/extensions/presentation_mailbox_extension.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
|
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
|
||||||
|
|
||||||
extension PresentationEmailExtension on PresentationEmail {
|
extension PresentationEmailExtension on PresentationEmail {
|
||||||
@@ -29,6 +30,7 @@ extension PresentationEmailExtension on PresentationEmail {
|
|||||||
newFromAddress: newFromAddress,
|
newFromAddress: newFromAddress,
|
||||||
newBccAddress: newBccAddress,
|
newBccAddress: newBccAddress,
|
||||||
newReplyToAddress: newReplyToAddress,
|
newReplyToAddress: newReplyToAddress,
|
||||||
|
replyOwnSentEmail: mailboxContain?.isSent == true,
|
||||||
userName: userName,
|
userName: userName,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -57,9 +59,13 @@ extension PresentationEmailExtension on PresentationEmail {
|
|||||||
required List<EmailAddress> newFromAddress,
|
required List<EmailAddress> newFromAddress,
|
||||||
required List<EmailAddress> newBccAddress,
|
required List<EmailAddress> newBccAddress,
|
||||||
required List<EmailAddress> newReplyToAddress,
|
required List<EmailAddress> newReplyToAddress,
|
||||||
|
required replyOwnSentEmail,
|
||||||
String? userName,
|
String? userName,
|
||||||
}) {
|
}) {
|
||||||
if (isSender) {
|
if (isSender) {
|
||||||
|
if (replyOwnSentEmail) {
|
||||||
|
return Tuple4(newToAddress, [], [], []);
|
||||||
|
}
|
||||||
if (newBccAddress.isNotEmpty) {
|
if (newBccAddress.isNotEmpty) {
|
||||||
return Tuple4(newToAddress, [], [], newReplyToAddress);
|
return Tuple4(newToAddress, [], [], newReplyToAddress);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
import 'package:model/email/email_action_type.dart';
|
import 'package:model/email/email_action_type.dart';
|
||||||
import 'package:model/email/presentation_email.dart';
|
import 'package:model/email/presentation_email.dart';
|
||||||
import 'package:model/extensions/email_address_extension.dart';
|
import 'package:model/extensions/email_address_extension.dart';
|
||||||
|
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/extensions/presentation_email_extension.dart';
|
import 'package:tmail_ui_user/features/email/presentation/extensions/presentation_email_extension.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@@ -254,6 +257,35 @@ void main() {
|
|||||||
expect(result.value4, containsAll(expectedResult.value4));
|
expect(result.value4, containsAll(expectedResult.value4));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'Email has Reply To'
|
||||||
|
'AND user is replying to own sent email'
|
||||||
|
'THEN user A clicks reply, generateRecipientsEmailAddressForComposer\n'
|
||||||
|
'SHOULD return all email address in To field in To tuple',
|
||||||
|
() {
|
||||||
|
final emailToReply = PresentationEmail(
|
||||||
|
from: {userAEmailAddress},
|
||||||
|
to: {userBEmailAddress, userAEmailAddress},
|
||||||
|
cc: {userCEmailAddress},
|
||||||
|
replyTo: {replyToEmailAddress},
|
||||||
|
mailboxContain: PresentationMailbox(
|
||||||
|
MailboxId(Id('value')),
|
||||||
|
role: PresentationMailbox.roleSent,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
final result = emailToReply.generateRecipientsEmailAddressForComposer(
|
||||||
|
emailActionType: EmailActionType.reply,
|
||||||
|
isSender: true,
|
||||||
|
listPost: listPost,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(result.value1, equals([userBEmailAddress, userAEmailAddress]));
|
||||||
|
expect(result.value2, isEmpty);
|
||||||
|
expect(result.value3, isEmpty);
|
||||||
|
expect(result.value4, isEmpty);
|
||||||
|
});
|
||||||
|
|
||||||
test(
|
test(
|
||||||
'Email has Reply To and not List-Post'
|
'Email has Reply To and not List-Post'
|
||||||
'THEN user A clicks reply, generateRecipientsEmailAddressForComposer\n'
|
'THEN user A clicks reply, generateRecipientsEmailAddressForComposer\n'
|
||||||
|
|||||||
Reference in New Issue
Block a user