Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix double sending notifications

Browse Source 
[MAILPOET-2864]
This commit is contained in:
Pavel Dohnal
2020-04-29 15:30:48 +02:00
committed by Veljko V
parent 36be1ce8d1
commit 945b46d9d1
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/API/MP/v1/API.php
View File

@ -303,15 +303,6 @@ class API {
'schedule_welcome_email' => $scheduleWelcomeEmail, 'schedule_welcome_email' => $scheduleWelcomeEmail,
'skip_subscriber_notification' => $skipSubscriberNotification, 'skip_subscriber_notification' => $skipSubscriberNotification,
]); ]);
// schedule welcome email(s)
if ($scheduleWelcomeEmail && $newSubscriber->status === Subscriber::STATUS_SUBSCRIBED) {
$this->_scheduleWelcomeNotification($newSubscriber, $listIds);
}
if (!$skipSubscriberNotification && ($newSubscriber->status === Subscriber::STATUS_SUBSCRIBED)) {
$this->sendSubscriberNotification($newSubscriber, $listIds);
}
} }
return $newSubscriber->withCustomFields()->withSubscriptions()->asArray(); return $newSubscriber->withCustomFields()->withSubscriptions()->asArray();
} }

15
tests/integration/API/MP/APITest.php
View File

@ -523,20 +523,27 @@ class APITest extends \MailPoetTest {
} }
public function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() { public function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() {
$segment = Segment::createOrUpdate(
[
'name' => 'Default',
'type' => Segment::TYPE_DEFAULT,
]
);
$settings = SettingsController::getInstance(); $settings = SettingsController::getInstance();
$settings->set('signup_confirmation.enabled', false); $settings->set('signup_confirmation.enabled', false);
$API = Stub::makeEmptyExcept( $API = Stub::make(
\MailPoet\API\MP\v1\API::class, \MailPoet\API\MP\v1\API::class,
'addSubscriber',
[ [
'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']), 'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']), 'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'_scheduleWelcomeNotification' => Expected::once(), '_scheduleWelcomeNotification' => Expected::once(),
], $this); ],
$this
);
$subscriber = [ $subscriber = [
'email' => 'test@example.com', 'email' => 'test@example.com',
]; ];
$segments = [1]; $segments = [$segment->id];
$API->addSubscriber($subscriber, $segments); $API->addSubscriber($subscriber, $segments);
} }