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

Remove old code and comments

Browse Source 
[MAILPOET-4081]
This commit is contained in:
Brezo Cordero
2022-03-07 21:25:17 -06:00
committed by Veljko V
parent 11cd756e6d
commit 6e6720d9f1
2 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mailpoet/lib/Subscribers/InactiveSubscribersController.php
View File

@ -79,8 +79,6 @@ class InactiveSubscribersController {
return false; return false;
} }
// We take into account only emails which have at least one opening tracked
// to ensure that tracking was enabled for the particular email
$inactiveTaskIdsTable = 'inactive_task_ids'; $inactiveTaskIdsTable = 'inactive_task_ids';
if (!$this->inactiveTaskIdsTableCreated) { if (!$this->inactiveTaskIdsTableCreated) {
$inactiveTaskIdsTableSql = " $inactiveTaskIdsTableSql = "
@ -98,7 +96,7 @@ class InactiveSubscribersController {
$this->inactiveTaskIdsTableCreated = true; $this->inactiveTaskIdsTableCreated = true;
} }
// Select subscribers who received at least a number of tracked emails but didn't open any // Select subscribers who received at least a number of emails after threshold date
$startId = (int)$startId; $startId = (int)$startId;
$endId = $startId + $batchSize; $endId = $startId + $batchSize;
$inactiveSubscriberIdsTmpTable = 'inactive_subscriber_ids'; $inactiveSubscriberIdsTmpTable = 'inactive_subscriber_ids';

35
mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php
View File

@ -54,9 +54,9 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
public function testItDeactivatesOldSubscribersOnlyWhenUnopenedEmailsReachDefaultThreshold(): void { public function testItDeactivatesOldSubscribersOnlyWhenUnopenedEmailsReachDefaultThreshold(): void {
// Create three completed sending tasks // Create three completed sending tasks
[$task] = $this->createCompletedSendingTaskWithOneOpen(3); [$task] = $this->createCompletedSendingTask(3);
[$task2] = $this->createCompletedSendingTaskWithOneOpen(3); [$task2] = $this->createCompletedSendingTask(3);
[$task3] = $this->createCompletedSendingTaskWithOneOpen(3); [$task3] = $this->createCompletedSendingTask(3);
$subscriber1 = $this->createSubscriber('s1@email.com', 10); $subscriber1 = $this->createSubscriber('s1@email.com', 10);
@ -78,7 +78,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDeactivatesLimitedAmountOfSubscribers(): void { public function testItDeactivatesLimitedAmountOfSubscribers(): void {
[$task] = $this->createCompletedSendingTaskWithOneOpen(3); [$task] = $this->createCompletedSendingTask(3);
$subscriber1 = $this->createSubscriber('s1@email.com', 10); $subscriber1 = $this->createSubscriber('s1@email.com', 10);
$this->addSubscriberToTask($subscriber1, $task); $this->addSubscriberToTask($subscriber1, $task);
@ -108,7 +108,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDoesNotDeactivateNewSubscriberWithUnopenedEmail(): void { public function testItDoesNotDeactivateNewSubscriberWithUnopenedEmail(): void {
[$task] = $this->createCompletedSendingTaskWithOneOpen(3); [$task] = $this->createCompletedSendingTask(3);
$subscriber = $this->createSubscriber('s1@email.com', 3); $subscriber = $this->createSubscriber('s1@email.com', 3);
$this->addSubscriberToTask($subscriber, $task); $this->addSubscriberToTask($subscriber, $task);
@ -121,7 +121,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDoesNotDeactivateNewlyResubscribedSubscriberWithUnopenedEmail(): void { public function testItDoesNotDeactivateNewlyResubscribedSubscriberWithUnopenedEmail(): void {
[$task] = $this->createCompletedSendingTaskWithOneOpen(3); [$task] = $this->createCompletedSendingTask(3);
$subscriber = $this->createSubscriber('s1@email.com', 10); $subscriber = $this->createSubscriber('s1@email.com', 10);
$lastSubscribedAt = (new Carbon())->subDays(2); $lastSubscribedAt = (new Carbon())->subDays(2);
@ -137,7 +137,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDoesNotDeactivateSubscriberWithoutSentEmail(): void { public function testItDoesNotDeactivateSubscriberWithoutSentEmail(): void {
$this->createCompletedSendingTaskWithOneOpen(3); $this->createCompletedSendingTask(3);
$subscriber = $this->createSubscriber('s1@email.com', 10); $subscriber = $this->createSubscriber('s1@email.com', 10);
$result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE, null, self::UNOPENED_EMAILS_THRESHOLD); $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE, null, self::UNOPENED_EMAILS_THRESHOLD);
expect($result)->equals(0); expect($result)->equals(0);
@ -147,11 +147,11 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDoesNotDeactivateSubscriberWhoRecentlyOpenedEmail(): void { public function testItDoesNotDeactivateSubscriberWhoRecentlyOpenedEmail(): void {
[$task, $queue] = $this->createCompletedSendingTaskWithOneOpen(2); [$task, $queue] = $this->createCompletedSendingTask(2);
$subscriber = $this->createSubscriber('s1@email.com', 10); $subscriber = $this->createSubscriber('s1@email.com', 10);
$this->addSubscriberToTask($subscriber, $task); $this->addSubscriberToTask($subscriber, $task);
$this->addEmailOpenedRecord($subscriber, $queue, 2); $this->addEmailOpenedRecord($subscriber, $queue, 2);
[$task2] = $this->createCompletedSendingTaskWithOneOpen(2); [$task2] = $this->createCompletedSendingTask(2);
$this->addSubscriberToTask($subscriber, $task2); $this->addSubscriberToTask($subscriber, $task2);
$result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE, null, self::UNOPENED_EMAILS_THRESHOLD); $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE, null, self::UNOPENED_EMAILS_THRESHOLD);
expect($result)->equals(0); expect($result)->equals(0);
@ -161,7 +161,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDoesNotDeactivateSubscriberWhoReceivedEmailRecently(): void { public function testItDoesNotDeactivateSubscriberWhoReceivedEmailRecently(): void {
[$task] = $this->createCompletedSendingTaskWithOneOpen(0); [$task] = $this->createCompletedSendingTask(0);
$subscriber = $this->createSubscriber('s1@email.com', 10); $subscriber = $this->createSubscriber('s1@email.com', 10);
$this->addSubscriberToTask($subscriber, $task); $this->addSubscriberToTask($subscriber, $task);
$result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE, null, self::UNOPENED_EMAILS_THRESHOLD); $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE, null, self::UNOPENED_EMAILS_THRESHOLD);
@ -172,7 +172,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItDoesNotDeactivatesSubscribersWhenMP2MigrationHappenedWithinInterval(): void { public function testItDoesNotDeactivatesSubscribersWhenMP2MigrationHappenedWithinInterval(): void {
[$task] = $this->createCompletedSendingTaskWithOneOpen(3); [$task] = $this->createCompletedSendingTask(3);
$this->createSetting(MP2Migrator::MIGRATION_COMPLETE_SETTING_KEY, true, (new Carbon())->subDays(3)); $this->createSetting(MP2Migrator::MIGRATION_COMPLETE_SETTING_KEY, true, (new Carbon())->subDays(3));
@ -244,7 +244,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
} }
public function testItActivatesSubscribersWhenMP2MigrationHappenedWithinInterval(): void { public function testItActivatesSubscribersWhenMP2MigrationHappenedWithinInterval(): void {
[$task] = $this->createCompletedSendingTaskWithOneOpen(3); [$task] = $this->createCompletedSendingTask(3);
$this->createSetting(MP2Migrator::MIGRATION_COMPLETE_SETTING_KEY, true, (new Carbon())->subDays(3)); $this->createSetting(MP2Migrator::MIGRATION_COMPLETE_SETTING_KEY, true, (new Carbon())->subDays(3));
@ -305,17 +305,6 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
return [$task, $queue]; return [$task, $queue];
} }
private function createCompletedSendingTaskWithOneOpen(int $processedDaysAgo = 0): array {
[$task, $queue] = $this->createCompletedSendingTask($processedDaysAgo);
$subscriber = $this->subscribersRepository->findOneBy(['email' => 's0@email.com']);
if (!$subscriber) {
$subscriber = $this->createSubscriber('s0@email.com', 10);
}
$this->addSubscriberToTask($subscriber, $task);
$this->addEmailOpenedRecord($subscriber, $queue);
return [$task, $queue];
}
private function addSubscriberToTask( private function addSubscriberToTask(
SubscriberEntity $subscriber, SubscriberEntity $subscriber,
ScheduledTaskEntity $task, ScheduledTaskEntity $task,