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

Differentiate machine and humans opens on subscriber stats API

Browse Source 
[MAILPOET-3741]
This commit is contained in:
Rostislav Wolny
2021-08-26 15:15:34 +02:00
committed by Veljko V
parent bbf19d07c8
commit 14ff48c7fa
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Subscribers/Statistics/SubscriberStatisticsRepository.php
View File

@@ -8,9 +8,11 @@ use MailPoet\Entities\StatisticsNewsletterEntity;
use MailPoet\Entities\StatisticsOpenEntity;
use MailPoet\Entities\StatisticsWooCommercePurchaseEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Entities\UserAgentEntity;
use MailPoet\Newsletter\Statistics\WooCommerceRevenue;
use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use MailPoetVendor\Doctrine\ORM\QueryBuilder;
/**
* @extends Repository<SubscriberEntity>
@@ -33,31 +35,46 @@ class SubscriberStatisticsRepository extends Repository {
return new SubscriberStatistics(
$this->getStatisticsClickCount($subscriber),
$this->getStatisticsOpenCount($subscriber),
$this->getStatisticsMachineOpenCount($subscriber),
$this->getTotalSentCount($subscriber),
$this->getWooCommerceRevenue($subscriber)
);
}
private function getStatisticsClickCount(SubscriberEntity $subscriber): int {
return $this->getStatisticsCount(StatisticsClickEntity::class, $subscriber);
return (int)$this->getStatisticsCountQuery(StatisticsClickEntity::class, $subscriber)
->getQuery()
->getSingleScalarResult();
}
private function getStatisticsOpenCount(SubscriberEntity $subscriber): int {
return $this->getStatisticsCount(StatisticsOpenEntity::class, $subscriber);
return (int)$this->getStatisticsCountQuery(StatisticsOpenEntity::class, $subscriber)
->andWhere('(stats.userAgentType = :userAgentType) OR (stats.userAgentType IS NULL)')
->setParameter('userAgentType', UserAgentEntity::USER_AGENT_TYPE_HUMAN)
->getQuery()
->getSingleScalarResult();
}
private function getStatisticsMachineOpenCount(SubscriberEntity $subscriber): int {
return (int)$this->getStatisticsCountQuery(StatisticsOpenEntity::class, $subscriber)
->andWhere('(stats.userAgentType = :userAgentType)')
->setParameter('userAgentType', UserAgentEntity::USER_AGENT_TYPE_MACHINE)
->getQuery()
->getSingleScalarResult();
}
private function getTotalSentCount(SubscriberEntity $subscriber): int {
return $this->getStatisticsCount(StatisticsNewsletterEntity::class, $subscriber);
return $this->getStatisticsCountQuery(StatisticsNewsletterEntity::class, $subscriber)
->getQuery()
->getSingleScalarResult();
}
private function getStatisticsCount($entityName, SubscriberEntity $subscriber): int {
return (int)$this->entityManager->createQueryBuilder()
private function getStatisticsCountQuery(string $entityName, SubscriberEntity $subscriber): QueryBuilder {
return $this->entityManager->createQueryBuilder()
->select('COUNT(DISTINCT stats.newsletter) as cnt')
->from($entityName, 'stats')
->where('stats.subscriber = :subscriber')
->setParameter('subscriber', $subscriber)
->getQuery()
->getSingleScalarResult();
->setParameter('subscriber', $subscriber);
}
private function getWooCommerceRevenue(SubscriberEntity $subscriber) {