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

Use new controller with subscribers counts

Browse Source 
[MAILPOET-3646]
This commit is contained in:
Jan Lysý
2021-07-08 13:40:17 +02:00
committed by Veljko V
parent ac2a70f39b
commit a6dc552cdc
10 changed files with 172 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilder.php
View File

@ -6,6 +6,7 @@ use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Segments\SegmentDependencyValidator;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Subscribers\SubscribersCountsController;
use MailPoet\WP\Functions;
class DynamicSegmentsResponseBuilder {
@ -23,16 +24,21 @@ class DynamicSegmentsResponseBuilder {
/** @var SegmentDependencyValidator */
private $segmentDependencyValidator;
/** @var SubscribersCountsController */
private $subscribersCountsController;
public function __construct(
Functions $wp,
SegmentSubscribersRepository $segmentSubscriberRepository,
SegmentsResponseBuilder $segmentsResponseBuilder,
SegmentDependencyValidator $segmentDependencyValidator
SegmentDependencyValidator $segmentDependencyValidator,
SubscribersCountsController $subscribersCountsController
) {
$this->segmentsResponseBuilder = $segmentsResponseBuilder;
$this->segmentSubscriberRepository = $segmentSubscriberRepository;
$this->wp = $wp;
$this->segmentDependencyValidator = $segmentDependencyValidator;
$this->subscribersCountsController = $subscribersCountsController;
}
public function build(SegmentEntity $segmentEntity) {
@ -80,8 +86,9 @@ class DynamicSegmentsResponseBuilder {
'admin.php?page=mailpoet-subscribers#/filter[segment=' . $segment->getId() . ']'
);
$data['count_all'] = $this->segmentSubscriberRepository->getSubscribersCount((int)$segment->getId());
$data['count_subscribed'] = $this->segmentSubscriberRepository->getSubscribersCount((int)$segment->getId(), SubscriberEntity::STATUS_SUBSCRIBED);
$segmentStatisticsCount = $this->subscribersCountsController->getSegmentStatisticsCount($segment);
$data['count_all'] = $segmentStatisticsCount['all'];
$data['count_subscribed'] = $segmentStatisticsCount[SubscriberEntity::STATUS_SUBSCRIBED];
return $data;
}
}

12
lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php
View File

@ -3,7 +3,7 @@
namespace MailPoet\API\JSON\ResponseBuilders;
use MailPoet\Entities\SegmentEntity;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Subscribers\SubscribersCountsController;
use MailPoet\WP\Functions;
class SegmentsResponseBuilder {
@ -12,15 +12,15 @@ class SegmentsResponseBuilder {
/** @var Functions */
private $wp;
/** @var SegmentSubscribersRepository */
private $segmentSubscriberRepository;
/** @var SubscribersCountsController */
private $subscribersCountsController;
public function __construct(
Functions $wp,
SegmentSubscribersRepository $segmentSubscriberRepository
SubscribersCountsController $subscribersCountsController
) {
$this->wp = $wp;
$this->segmentSubscriberRepository = $segmentSubscriberRepository;
$this->subscribersCountsController = $subscribersCountsController;
}
public function build(SegmentEntity $segment): array {
@ -48,7 +48,7 @@ class SegmentsResponseBuilder {
private function buildListingItem(SegmentEntity $segment): array {
$data = $this->build($segment);
$data['subscribers_count'] = $this->segmentSubscriberRepository->getSubscribersStatisticsCount($segment);
$data['subscribers_count'] = $this->subscribersCountsController->getSegmentStatisticsCount($segment);
$data['subscribers_url'] = $this->wp->adminUrl(
'admin.php?page=mailpoet-subscribers#/filter[segment=' . $segment->getId() . ']'
);

24
lib/API/JSON/v1/Settings.php
View File

@ -4,7 +4,6 @@ namespace MailPoet\API\JSON\v1;
use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError;
use MailPoet\Cache\TransientCache;
use MailPoet\Config\AccessControl;
use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\Workers\InactiveSubscribers;
@ -15,11 +14,11 @@ use MailPoet\Form\FormMessageController;
use MailPoet\Mailer\MailerLog;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Statistics\StatisticsOpensRepository;
use MailPoet\Subscribers\SubscribersCountsController;
use MailPoet\WooCommerce\TransactionalEmails;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
@ -57,14 +56,11 @@ class Settings extends APIEndpoint {
/** @var FormMessageController */
private $messageController;
/** @var TransientCache */
private $transientCache;
/** @var SegmentsRepository */
private $segmentsRepository;
/** @var SegmentSubscribersRepository */
private $segmentSubscribersRepository;
/** @var SubscribersCountsController */
private $subscribersCountsController;
public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS,
@ -81,9 +77,8 @@ class Settings extends APIEndpoint {
ScheduledTasksRepository $scheduledTasksRepository,
FormMessageController $messageController,
ServicesChecker $servicesChecker,
TransientCache $transientCache,
SegmentsRepository $segmentsRepository,
SegmentSubscribersRepository $segmentSubscribersRepository
SubscribersCountsController $subscribersCountsController
) {
$this->settings = $settings;
$this->bridge = $bridge;
@ -95,9 +90,8 @@ class Settings extends APIEndpoint {
$this->statisticsOpensRepository = $statisticsOpensRepository;
$this->scheduledTasksRepository = $scheduledTasksRepository;
$this->messageController = $messageController;
$this->transientCache = $transientCache;
$this->segmentsRepository = $segmentsRepository;
$this->segmentSubscribersRepository = $segmentSubscribersRepository;
$this->subscribersCountsController = $subscribersCountsController;
}
public function get() {
@ -257,12 +251,14 @@ class Settings extends APIEndpoint {
}
public function recalculateSubscribersCountsCache() {
$this->transientCache->invalidateItems(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY);
$segments = $this->segmentsRepository->findAll();
foreach ($segments as $segment) {
$this->segmentSubscribersRepository->getSubscribersStatisticsCount($segment);
$this->subscribersCountsController->recalculateSegmentStatisticsCache($segment);
if ($segment->isStatic()) {
$this->subscribersCountsController->recalculateSegmentGlobalStatusStatisticsCache($segment);
}
}
$this->segmentSubscribersRepository->getSubscribersWithoutSegmentStatisticsCount();
$this->subscribersCountsController->recalculateSubscribersWithoutSegmentStatisticsCache();
return $this->successResponse();
}
}