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

Use singular in entity names

Browse Source 
[MAILPOET-2439]
This commit is contained in:
Pavel Dohnal
2019-10-29 15:45:57 +01:00
committed by Jack Kitterhing
parent ac9761228a
commit b81c2497cb
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Entities/NewsletterLinkEntity.php
View File

@ -53,8 +53,9 @@ class NewsletterLinkEntity {
/**
* Extra lazy is here for `getTotalClicksCount`.
* If we didn't specify extra lazy the function would load all clicks and count them. This way it uses a single count query.
* @ORM\OneToMany(targetEntity="MailPoet\Entities\StatisticsClicksEntity", mappedBy="link", fetch="EXTRA_LAZY")
* @var StatisticsClicksEntity[]|ArrayCollection
* @ORM\OneToMany(targetEntity="StatisticsClickEntity", mappedBy="link", fetch="EXTRA_LAZY")
*
* @var StatisticsClickEntity[]|ArrayCollection
*/
private $clicks;

2
lib/Entities/StatisticsClicksEntity.php → lib/Entities/StatisticsClickEntity.php
View File

@ -11,7 +11,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
* @ORM\Entity()
* @ORM\Table(name="statistics_clicks")
*/
class StatisticsClicksEntity {
class StatisticsClickEntity {
use AutoincrementedIdTrait;
use CreatedAtTrait;
use UpdatedAtTrait;

2
lib/Entities/StatisticsOpensEntity.php → lib/Entities/StatisticsOpenEntity.php
View File

@ -11,7 +11,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
* @ORM\Entity()
* @ORM\Table(name="statistics_opens")
*/
class StatisticsOpensEntity {
class StatisticsOpenEntity {
use AutoincrementedIdTrait;
use CreatedAtTrait;
use UpdatedAtTrait;

2
lib/Entities/StatisticsUnsubscribesEntity.php → lib/Entities/StatisticsUnsubscribeEntity.php
View File

@ -11,7 +11,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
* @ORM\Entity()
* @ORM\Table(name="statistics_unsubscribes")
*/
class StatisticsUnsubscribesEntity {
class StatisticsUnsubscribeEntity {
use AutoincrementedIdTrait;
use CreatedAtTrait;
use UpdatedAtTrait;

12
lib/Newsletter/Statistics/NewsletterStatisticsRepository.php
View File

@ -5,9 +5,9 @@ namespace MailPoet\Newsletter\Statistics;
use MailPoet\Doctrine\Repository;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\StatisticsClicksEntity;
use MailPoet\Entities\StatisticsOpensEntity;
use MailPoet\Entities\StatisticsUnsubscribesEntity;
use MailPoet\Entities\StatisticsClickEntity;
use MailPoet\Entities\StatisticsOpenEntity;
use MailPoet\Entities\StatisticsUnsubscribeEntity;
use MailPoetVendor\Doctrine\Common\Collections\Criteria;
use MailPoetVendor\Doctrine\ORM\UnexpectedResultException as UnexpectedResultExceptionAlias;
@ -54,7 +54,7 @@ class NewsletterStatisticsRepository extends Repository {
* @return int
*/
function getStatisticsClickCount(NewsletterEntity $newsletter) {
return $this->getStatisticsCount($newsletter, StatisticsClicksEntity::class);
return $this->getStatisticsCount($newsletter, StatisticsClickEntity::class);
}
/**
@ -62,7 +62,7 @@ class NewsletterStatisticsRepository extends Repository {
* @return int
*/
function getStatisticsOpenCount(NewsletterEntity $newsletter) {
return $this->getStatisticsCount($newsletter, StatisticsOpensEntity::class);
return $this->getStatisticsCount($newsletter, StatisticsOpenEntity::class);
}
/**
@ -70,7 +70,7 @@ class NewsletterStatisticsRepository extends Repository {
* @return int
*/
function getStatisticsUnsubscribeCount(NewsletterEntity $newsletter) {
return $this->getStatisticsCount($newsletter, StatisticsUnsubscribesEntity::class);
return $this->getStatisticsCount($newsletter, StatisticsUnsubscribeEntity::class);
}
private function getStatisticsCount(NewsletterEntity $newsletter, $statistics_entity_name) {