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

Don't cache if subscribers count is below minimum value

Browse Source 
[MAILPOET-5180]
This commit is contained in:
alex-mailpoet
2023-05-12 19:17:46 +03:00
committed by Aschepikov
parent 4f1afa388f
commit 5203eb5268
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mailpoet/lib/Subscribers/SubscribersCountsController.php
View File

@@ -10,6 +10,7 @@ use MailPoet\Segments\SegmentsRepository;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Tags\TagRepository;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
@@ -29,6 +30,9 @@ class SubscribersCountsController {
/** @var TransientCache */
private $transientCache;
/** @var SubscribersFeature */
private $subscribersFeature;
/** @var WPFunctions */
private $wp;
@@ -38,6 +42,7 @@ class SubscribersCountsController {
SubscribersRepository $subscribersRepository,
TagRepository $subscriberTagRepository,
TransientCache $transientCache,
SubscribersFeature $subscribersFeature,
WPFunctions $wp
) {
@@ -46,11 +51,12 @@ class SubscribersCountsController {
$this->segmentsRepository = $segmentsRepository;
$this->subscribersRepository = $subscribersRepository;
$this->tagRepository = $subscriberTagRepository;
$this->subscribersFeature = $subscribersFeature;
$this->wp = $wp;
}
public function getSubscribersWithoutSegmentStatisticsCount(): array {
$result = $this->transientCache->getItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, 0)['item'] ?? null;
$result = $this->getCacheItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, 0)['item'] ?? null;
if (!$result) {
$result = $this->recalculateSubscribersWithoutSegmentStatisticsCache();
}
@@ -58,7 +64,7 @@ class SubscribersCountsController {
}
public function getSegmentStatisticsCount(SegmentEntity $segment): array {
$result = $this->transientCache->getItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, (int)$segment->getId())['item'] ?? null;
$result = $this->getCacheItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, (int)$segment->getId())['item'] ?? null;
if (!$result) {
$result = $this->recalculateSegmentStatisticsCache($segment);
}
@@ -66,7 +72,7 @@ class SubscribersCountsController {
}
public function getSegmentGlobalStatusStatisticsCount(SegmentEntity $segment): array {
$result = $this->transientCache->getItem(TransientCache::SUBSCRIBERS_GLOBAL_STATUS_STATISTICS_COUNT_KEY, (int)$segment->getId())['item'] ?? null;
$result = $this->getCacheItem(TransientCache::SUBSCRIBERS_GLOBAL_STATUS_STATISTICS_COUNT_KEY, (int)$segment->getId())['item'] ?? null;
if (!$result) {
$result = $this->recalculateSegmentGlobalStatusStatisticsCache($segment);
}
@@ -74,7 +80,7 @@ class SubscribersCountsController {
}
public function getSegmentStatisticsCountById(int $segmentId): array {
$result = $this->transientCache->getItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, $segmentId)['item'] ?? null;
$result = $this->getCacheItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, $segmentId)['item'] ?? null;
if (!$result) {
$segment = $this->segmentsRepository->findOneById($segmentId);
if (!$segment) {
@@ -86,7 +92,7 @@ class SubscribersCountsController {
}
public function getHomepageStatistics(): array {
$result = $this->transientCache->getItem(TransientCache::SUBSCRIBERS_HOMEPAGE_STATISTICS_COUNT_KEY, 0) ?? [];
$result = $this->getCacheItem(TransientCache::SUBSCRIBERS_HOMEPAGE_STATISTICS_COUNT_KEY, 0) ?? [];
if (!$result) {
$result = $this->recalculateHomepageStatisticsCache();
}
@@ -95,7 +101,7 @@ class SubscribersCountsController {
public function recalculateSegmentGlobalStatusStatisticsCache(SegmentEntity $segment): array {
$result = $this->segmentSubscribersRepository->getSubscribersGlobalStatusStatisticsCount($segment);
$this->transientCache->setItem(
$this->setCacheItem(
TransientCache::SUBSCRIBERS_GLOBAL_STATUS_STATISTICS_COUNT_KEY,
$result,
(int)$segment->getId()
@@ -105,7 +111,7 @@ class SubscribersCountsController {
public function recalculateSegmentStatisticsCache(SegmentEntity $segment): array {
$result = $this->segmentSubscribersRepository->getSubscribersStatisticsCount($segment);
$this->transientCache->setItem(
$this->setCacheItem(
TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY,
$result,
(int)$segment->getId()
@@ -115,7 +121,7 @@ class SubscribersCountsController {
public function recalculateSubscribersWithoutSegmentStatisticsCache(): array {
$result = $this->segmentSubscribersRepository->getSubscribersWithoutSegmentStatisticsCount();
$this->transientCache->setItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, $result, 0);
$this->setCacheItem(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY, $result, 0);
return $result;
}
@@ -127,7 +133,7 @@ class SubscribersCountsController {
$result['subscribedCount'] = $this->subscribersRepository->getCountOfLastSubscribedAfter($thirtyDaysAgo);
$result['unsubscribedCount'] = $this->subscribersRepository->getCountOfUnsubscribedAfter($thirtyDaysAgo);
$result['subscribedSubscribersCount'] = $this->subscribersRepository->getCountOfSubscribersForStates([SubscriberEntity::STATUS_SUBSCRIBED]);
$this->transientCache->setItem(
$this->setCacheItem(
TransientCache::SUBSCRIBERS_HOMEPAGE_STATISTICS_COUNT_KEY,
$result,
0
@@ -152,6 +158,22 @@ class SubscribersCountsController {
}
}
/**
* Use cache only if subscribers count is above minimum
*/
private function getCacheItem(string $key, int $id): ?array {
if ($this->subscribersFeature->isSubscribersCountEnoughForCache()) {
return $this->transientCache->getItem($key, $id);
}
return [];
}
private function setCacheItem(string $key, array $item, int $id): void {
if ($this->subscribersFeature->isSubscribersCountEnoughForCache()) {
$this->transientCache->setItem($key, $item, $id);
}
}
/**
* @return array<int, array{id: int, name: string, subscribersCount: int}>
*/

11
mailpoet/lib/Util/License/Features/Subscribers.php
View File

@@ -21,7 +21,7 @@ class Subscribers {
const PREMIUM_SUPPORT_SETTING_KEY = 'premium.premium_key_state.data.support_tier';
const SUBSCRIBERS_COUNT_CACHE_KEY = 'mailpoet_subscribers_count';
const SUBSCRIBERS_COUNT_CACHE_EXPIRATION_MINUTES = 60;
const SUBSCRIBERS_COUNT_CACHE_MIN_VALUE = 1000;
const SUBSCRIBERS_COUNT_CACHE_MIN_VALUE = 2000;
/** @var SettingsController */
private $settings;
@@ -75,12 +75,19 @@ class Subscribers {
$count = $this->subscribersRepository->getTotalSubscribers();
// cache only when number of subscribers exceeds minimum value
if ($count > self::SUBSCRIBERS_COUNT_CACHE_MIN_VALUE) {
if ($this->isSubscribersCountEnoughForCache($count)) {
$this->wp->setTransient(self::SUBSCRIBERS_COUNT_CACHE_KEY, $count, self::SUBSCRIBERS_COUNT_CACHE_EXPIRATION_MINUTES * 60);
}
return $count;
}
public function isSubscribersCountEnoughForCache(int $count = null): bool {
if (is_null($count)) {
$count = $this->getSubscribersCount();
}
return $count > self::SUBSCRIBERS_COUNT_CACHE_MIN_VALUE;
}
/**
* Returns true if key is valid or valid but underprivileged
* Do not use the method to check if key is valid for sending emails or premium