Skip to content

Commit f868146

Browse files
committed
[TASK] Move query for last/first page visit inside of visitor model
This prevents sharing the same logic across multiple places. resolves: https://projekte.in2code.de/issues/83661
1 parent 5537e76 commit f868146

3 files changed

Lines changed: 42 additions & 47 deletions

File tree

‎Classes/Domain/Model/Visitor.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use In2code\Lux\Domain\Factory\CompanyFactory;
99
use In2code\Lux\Domain\Repository\CategoryscoringRepository;
1010
use In2code\Lux\Domain\Repository\FrontendUserRepository;
11+
use In2code\Lux\Domain\Repository\PagevisitRepository;
1112
use In2code\Lux\Domain\Repository\Remote\LeadfeederRepository;
1213
use In2code\Lux\Domain\Repository\VisitorRepository;
1314
use In2code\Lux\Domain\Service\GetCompanyFromIpService;
@@ -36,6 +37,7 @@
3637
use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
3738
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
3839
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
40+
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
3941

4042
class Visitor extends AbstractModel
4143
{
@@ -554,11 +556,8 @@ public function getPagevisitsOfGivenPageIdentifier(int $pageIdentifier): array
554556
public function getPagevisitLast(): ?Pagevisit
555557
{
556558
if ($this->lastPageVisit === null) {
557-
$pagevisits = $this->getPagevisits();
558-
foreach ($pagevisits as $pagevisit) {
559-
$this->lastPageVisit = $pagevisit;
560-
break;
561-
}
559+
$pagevisitRepository = GeneralUtility::makeInstance(PagevisitRepository::class);
560+
$this->lastPageVisit = $pagevisitRepository->findOneByVisitor($this, QueryInterface::ORDER_DESCENDING);
562561
}
563562
return $this->lastPageVisit;
564563
}
@@ -572,12 +571,8 @@ public function setPagevisitLast(Pagevisit $pagevisit): self
572571
public function getPagevisitFirst(): ?Pagevisit
573572
{
574573
if ($this->firstPageVisit === null) {
575-
$pagevisits = $this->getPagevisits();
576-
ksort($pagevisits);
577-
foreach ($pagevisits as $pagevisit) {
578-
$this->firstPageVisit = $pagevisit;
579-
break;
580-
}
574+
$pagevisitRepository = GeneralUtility::makeInstance(PagevisitRepository::class);
575+
$this->firstPageVisit = $pagevisitRepository->findOneByVisitor($this, QueryInterface::ORDER_ASCENDING);
581576
}
582577
return $this->firstPageVisit;
583578
}
@@ -588,6 +583,11 @@ public function setPagevisitFirst(Pagevisit $pagevisit): self
588583
return $this;
589584
}
590585

586+
public function getFirstPageVisit(): ?Pagevisit
587+
{
588+
return $this->getPagevisitFirst();
589+
}
590+
591591
/**
592592
* Always return a date object
593593
*

‎Classes/Domain/Service/Email/SendSummaryService.php‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace In2code\Lux\Domain\Service\Email;
66

7-
use In2code\Lux\Domain\Model\Visitor;
8-
use In2code\Lux\Domain\Repository\PagevisitRepository;
97
use In2code\Lux\Domain\Service\ConfigurationService;
108
use In2code\Lux\Exception\ConfigurationException;
119
use In2code\Lux\Exception\EmailValidationException;
@@ -17,7 +15,6 @@
1715
use TYPO3\CMS\Core\View\ViewFactoryData;
1816
use TYPO3\CMS\Core\View\ViewFactoryInterface;
1917
use TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException;
20-
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
2118

2219
class SendSummaryService
2320
{
@@ -95,30 +92,13 @@ protected function getSummaryMailConfiguration(): array
9592
protected function getMailTemplate(array $assignment = []): string
9693
{
9794
$mailTemplatePath = $this->getSummaryMailConfiguration()['mailTemplate'] ?? '';
98-
$this->setPagevisitsOfVisitors();
9995
$view = GeneralUtility::makeInstance(ViewFactoryInterface::class)->create(new ViewFactoryData(
10096
templatePathAndFilename: GeneralUtility::getFileAbsFileName($mailTemplatePath),
10197
));
10298
$view->assignMultiple(['visitors' => $this->visitors] + $assignment);
10399
return $view->render();
104100
}
105101

106-
protected function setPagevisitsOfVisitors(): void
107-
{
108-
$pagevisitRepository = GeneralUtility::makeInstance(PagevisitRepository::class);
109-
/** @var Visitor $visitor */
110-
foreach ($this->visitors as $visitor) {
111-
$firstPagevisit = $pagevisitRepository->findOneByVisitor($visitor, QueryInterface::ORDER_ASCENDING);
112-
if ($firstPagevisit !== null) {
113-
$visitor->setPagevisitFirst($firstPagevisit);
114-
}
115-
$lastPagevisit = $pagevisitRepository->findOneByVisitor($visitor, QueryInterface::ORDER_DESCENDING);
116-
if ($lastPagevisit !== null) {
117-
$visitor->setPagevisitLast($lastPagevisit);
118-
}
119-
}
120-
}
121-
122102
/**
123103
* @throws EmailValidationException
124104
* @throws ConfigurationException

‎Tests/Unit/Domain/Model/VisitorTest.php‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
use In2code\Lux\Domain\Model\Categoryscoring;
88
use In2code\Lux\Domain\Model\Pagevisit;
99
use In2code\Lux\Domain\Model\Visitor;
10+
use In2code\Lux\Domain\Repository\PagevisitRepository;
1011
use In2code\Lux\Tests\Helper\TestingHelper;
1112
use PHPUnit\Framework\Attributes\CoversClass;
1213
use PHPUnit\Framework\Attributes\CoversMethod;
1314
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\Attributes\Test;
16+
use TYPO3\CMS\Core\Utility\GeneralUtility;
1517
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
1618
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
1719

@@ -133,22 +135,6 @@ public function testGetCategoryscoringsSortedByScoring(array $sortings, array $e
133135
self::assertSame($expectedSortings, $newScoringArray);
134136
}
135137

136-
#[Test]
137-
public function getLastPagevisitReturnsLastVisit(): void
138-
{
139-
$visitor = new Visitor();
140-
$pagevisit = new Pagevisit();
141-
142-
$pagevisit->setCrdate(new DateTime('2026-01-01 10:00:00'));
143-
$visitor->addPagevisit($pagevisit);
144-
145-
$newerPagevisit = new Pagevisit();
146-
$newerPagevisit->setCrdate(new DateTime('2026-01-02 10:00:00'));
147-
$visitor->addPagevisit($newerPagevisit);
148-
149-
self::assertSame($newerPagevisit, $visitor->getLastPagevisit());
150-
}
151-
152138
#[Test]
153139
public function setPagevisitLastPreventsLoadingOfTheRelation(): void
154140
{
@@ -192,6 +178,18 @@ public function pagevisitsAreNotSharedBetweenVisitors(): void
192178
$secondPagevisit->setCrdate(new DateTime('2026-01-01 10:00:00'));
193179
$secondVisitor->addPagevisit($secondPagevisit);
194180

181+
$pagevisitRepository = $this->createMock(PagevisitRepository::class);
182+
$pagevisitRepository->method('findOneByVisitor')
183+
->willReturnCallback(function (Visitor $visitor) use ($firstVisitor, $firstPagevisit, $secondPagevisit) {
184+
if ($visitor === $firstVisitor) {
185+
return $firstPagevisit;
186+
}
187+
188+
return $secondPagevisit;
189+
});
190+
191+
GeneralUtility::setSingletonInstance(PagevisitRepository::class, $pagevisitRepository);
192+
195193
self::assertSame($firstPagevisit, $firstVisitor->getPagevisitLast());
196194
self::assertSame($secondPagevisit, $secondVisitor->getPagevisitLast());
197195
}
@@ -204,6 +202,11 @@ public function getLastPagevisitCachesResultPerVisitor(): void
204202
$pagevisit->setCrdate(new DateTime('2026-01-01 10:00:00'));
205203
$visitor->addPagevisit($pagevisit);
206204

205+
$pagevisitRepository = $this->createMock(PagevisitRepository::class);
206+
$pagevisitRepository->method('findOneByVisitor')
207+
->willReturn($pagevisit);
208+
GeneralUtility::setSingletonInstance(PagevisitRepository::class, $pagevisitRepository);
209+
207210
self::assertSame($pagevisit, $visitor->getLastPagevisit());
208211

209212
$newerPagevisit = new Pagevisit();
@@ -224,6 +227,18 @@ public function getLastPagevisitIsNotSharedBetweenVisitors(): void
224227
$secondVisitor = new Visitor();
225228
$secondVisitor->addPagevisit($secondPagevisit);
226229

230+
$pagevisitRepository = $this->createMock(PagevisitRepository::class);
231+
$pagevisitRepository->method('findOneByVisitor')
232+
->willReturnCallback(function (Visitor $visitor) use ($firstVisitor, $firstPagevisit, $secondPagevisit) {
233+
if ($visitor === $firstVisitor) {
234+
return $firstPagevisit;
235+
}
236+
237+
return $secondPagevisit;
238+
});
239+
240+
GeneralUtility::setSingletonInstance(PagevisitRepository::class, $pagevisitRepository);
241+
227242
self::assertSame($firstPagevisit, $firstVisitor->getLastPagevisit());
228243
self::assertSame($secondPagevisit, $secondVisitor->getLastPagevisit());
229244
}

0 commit comments

Comments
 (0)