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

Remove backward compatibility code for email action filters

Browse Source 
This commit cleans up code that is no longer needed after email actions filter data migration.
[MAILPOET-3951]
This commit is contained in:
Rostislav Wolny
2022-01-14 10:54:02 +01:00
committed by Veljko V
parent dc55aaa566
commit 75ab2338d6
9 changed files with 12 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mailpoet/lib/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilder.php
View File

@ -5,7 +5,6 @@ namespace MailPoet\API\JSON\ResponseBuilders;
use MailPoet\Entities\DynamicSegmentFilterData;
use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Segments\DynamicSegments\Filters\EmailAction;
use MailPoet\Segments\SegmentDependencyValidator;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Subscribers\SubscribersCountsController;
@ -61,27 +60,8 @@ class DynamicSegmentsResponseBuilder {
// new filters are always array, they support multiple values, the old didn't convert old filters to new format
$filter['wordpressRole'] = [$filter['wordpressRole']];
}
if (($filter['segmentType'] === DynamicSegmentFilterData::TYPE_EMAIL)) {
// compatibility with older filters
if ((($filter['action'] === EmailAction::ACTION_OPENED) || ($filter['action'] === EmailAction::ACTION_NOT_OPENED) || ($filter['action'] === EmailAction::ACTION_MACHINE_OPENED))) {
if (isset($filter['newsletter_id']) && !isset($filter['newsletters'])) {
// make sure the newsletters are an array
$filter['newsletters'] = [intval($filter['newsletter_id'])];
unset($filter['newsletter_id']);
}
} else {
$filter['newsletter_id'] = intval($filter['newsletter_id']);
}
if ($filter['action'] === EmailAction::ACTION_NOT_OPENED) {
// convert not opened
$filter['action'] = EmailAction::ACTION_OPENED;
$filter['operator'] = DynamicSegmentFilterData::OPERATOR_NONE;
}
if ($filter['action'] === EmailAction::ACTION_NOT_CLICKED) {
// convert not clicked
$filter['action'] = EmailAction::ACTION_CLICKED;
$filter['operator'] = DynamicSegmentFilterData::OPERATOR_NONE;
}
if (($filter['segmentType'] === DynamicSegmentFilterData::TYPE_EMAIL) && isset($filter['newsletter_id'])) {
$filter['newsletter_id'] = intval($filter['newsletter_id']);
}
$filters[] = $filter;
}