danielsiepmann/tracking
1
0
mirror of https://github.com/DanielSiepmann/tracking.git synced 2024-05-17 09:14:09 +02:00
Code Issues Releases Wiki Activity

Fix broken recordview introduced with last commit

Browse source 
Relates: #86
This commit is contained in:
Daniel Siepmann 2022-09-16 14:59:54 +02:00
parent 39529be49a
commit f0bb1d03a8
9 changed files with 101 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Classes/Domain/ExpressionLanguage/Factory.php
View file

@ -24,14 +24,11 @@ declare(strict_types=1);
namespace DanielSiepmann\Tracking\Domain\ExpressionLanguage;
use DanielSiepmann\Tracking\Domain\Model\Expression;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Context\Context;
interface Factory
{
public function create(
string $expression,
ServerRequestInterface $request,
Context $context
array $variables
): Expression;
}

8
Classes/Domain/ExpressionLanguage/SymfonyExpressionLanguage.php
View file

@ -36,18 +36,14 @@ class SymfonyExpressionLanguage implements Factory
{
public function create(
string $expression,
ServerRequestInterface $request,
Context $context
array $variables
): Expression {
$language = new ExpressionLanguage();
$this->registerTraverseFunction($language);
return new SymfonyExpression(
$expression,
[
'context' => $context,
'request' => $request,
],
$variables,
$language
);
}

12
Classes/Domain/Pageview/Factory.php
View file

@ -41,13 +41,13 @@ class Factory
$this->siteFinder = $siteFinder;
}
public static function fromRequest(ServerRequestInterface $request): Pageview
public function fromRequest(ServerRequestInterface $request): Pageview
{
return new Pageview(
self::getRouting($request)->getPageId(),
self::getLanguage($request),
$this->getRouting($request)->getPageId(),
$this->getLanguage($request),
new \DateTimeImmutable(),
(int) self::getRouting($request)->getPageType(),
(int) $this->getRouting($request)->getPageType(),
(string) $request->getUri(),
$request->getHeader('User-Agent')[0] ?? ''
);
@ -66,7 +66,7 @@ class Factory
);
}
private static function getLanguage(ServerRequestInterface $request): SiteLanguage
private function getLanguage(ServerRequestInterface $request): SiteLanguage
{
$language = $request->getAttribute('language');
@ -77,7 +77,7 @@ class Factory
return $language;
}
private static function getRouting(ServerRequestInterface $request): PageArguments
private function getRouting(ServerRequestInterface $request): PageArguments
{
$routing = $request->getAttribute('routing');

19
Classes/Domain/Recordview/Factory.php
View file

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace DanielSiepmann\Tracking\Domain\Recordview;
use DanielSiepmann\Tracking\Domain\ExpressionLanguage\Factory as ExpressionFactory;
use DanielSiepmann\Tracking\Domain\Model\RecordRule;
use DanielSiepmann\Tracking\Domain\Model\Recordview;
use Psr\Http\Message\ServerRequestInterface;
@ -32,15 +33,25 @@ use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
class Factory
{
public static function fromRequest(
/**
* @var ExpressionFactory
*/
private $expressionFactory;
public function __construct(
ExpressionFactory $expressionFactory
) {
$this->expressionFactory = $expressionFactory;
}
public function fromRequest(
ServerRequestInterface $request,
RecordRule $rule
): Recordview {
// Need silent, as expression language doens't provide a way to check for array keys
$recordUid = @(new ExpressionLanguage())->evaluate(
$recordUid = $this->expressionFactory->create(
$rule->getUidExpression(),
['request' => $request]
);
)->evaluate();
if (is_numeric($recordUid) === false) {
throw new \UnexpectedValueException(

15
Classes/Middleware/Pageview.php
View file

@ -44,6 +44,11 @@ class Pageview implements MiddlewareInterface
*/
private $context;
/**
* @var Factory
*/
private $factory;
/**
* @var ExpressionFactory
*/
@ -57,11 +62,13 @@ class Pageview implements MiddlewareInterface
public function __construct(
Repository $repository,
Context $context,
Factory $factory,
ExpressionFactory $expressionFactory,
string $rule
) {
$this->repository = $repository;
$this->context = $context;
$this->factory = $factory;
$this->expressionFactory = $expressionFactory;
$this->rule = $rule;
}
@ -71,7 +78,7 @@ class Pageview implements MiddlewareInterface
RequestHandlerInterface $handler
): ResponseInterface {
if ($this->shouldTrack($request, $this->context)) {
$this->repository->add(Factory::fromRequest($request));
$this->repository->add($this->factory->fromRequest($request));
}
return $handler->handle($request);
@ -83,8 +90,10 @@ class Pageview implements MiddlewareInterface
): bool {
return (bool) $this->expressionFactory->create(
$this->rule,
$request,
$context
[
'request' => $request,
'context' => $context,
]
)->evaluate();
}
}

15
Classes/Middleware/Recordview.php
View file

@ -46,6 +46,11 @@ class Recordview implements MiddlewareInterface
*/
private $context;
/**
* @var Factory
*/
private $factory;
/**
* @var ExpressionFactory
*/
@ -59,11 +64,13 @@ class Recordview implements MiddlewareInterface
public function __construct(
Repository $repository,
Context $context,
Factory $factory,
ExpressionFactory $expressionFactory,
array $rules
) {
$this->repository = $repository;
$this->context = $context;
$this->factory = $factory;
$this->expressionFactory = $expressionFactory;
$this->rules = RecordRule::multipleFromArray($rules);
@ -75,7 +82,7 @@ class Recordview implements MiddlewareInterface
): ResponseInterface {
foreach ($this->rules as $rule) {
if ($this->shouldTrack($request, $this->context, $rule)) {
$this->repository->add(Factory::fromRequest($request, $rule));
$this->repository->add($this->factory->fromRequest($request, $rule));
}
}
@ -89,8 +96,10 @@ class Recordview implements MiddlewareInterface
): bool {
return (bool) $this->expressionFactory->create(
$rule->getMatchesExpression(),
$request,
$context
[
'request' => $request,
'context' => $context,
]
)->evaluate();
}
}

40
Tests/Unit/Domain/Recordview/FactoryTest.php → Tests/Functional/Domain/Recordview/FactoryTest.php
View file

@ -28,15 +28,19 @@ use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Routing\PageArguments;
use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
/**
* @covers DanielSiepmann\Tracking\Domain\Recordview\Factory
*/
class FactoryTest extends TestCase
class FactoryTest extends FunctionalTestCase
{
use ProphecyTrait;
protected $testExtensionsToLoad = [
'typo3conf/ext/tracking',
];
/**
* @test
*/
@ -60,7 +64,9 @@ class FactoryTest extends TestCase
'category' => 10,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertInstanceOf(Recordview::class, $result);
}
@ -87,7 +93,9 @@ class FactoryTest extends TestCase
'category' => 10,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertSame('Some User Agent', $result->getUserAgent());
}
@ -114,7 +122,9 @@ class FactoryTest extends TestCase
'category' => 10,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertSame('https://example.com', $result->getUrl());
}
@ -141,7 +151,9 @@ class FactoryTest extends TestCase
'category' => 10,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertInstanceOf(\DateTimeImmutable::class, $result->getCrdate());
}
@ -168,7 +180,9 @@ class FactoryTest extends TestCase
'category' => 10,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertSame($language->reveal(), $result->getLanguage());
}
@ -195,7 +209,9 @@ class FactoryTest extends TestCase
'category' => 10,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertSame(10, $result->getPageUid());
}
@ -222,7 +238,9 @@ class FactoryTest extends TestCase
'category' => 20,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertSame(20, $result->getRecordUid());
}
@ -249,7 +267,9 @@ class FactoryTest extends TestCase
'category' => 20,
]);
$result = Factory::fromRequest($request->reveal(), $rule->reveal());
$subject = $this->get(Factory::class);
$result = $subject->fromRequest($request->reveal(), $rule->reveal());
static::assertSame('sys_category', $result->getTableName());
}
}

4
Tests/Functional/Fixtures/Extensions/recordview/Configuration/Services.yaml
View file

@ -9,6 +9,6 @@ services:
arguments:
$rules:
topics:
matches: 'request.getQueryParams()["topic_id"] > 0'
recordUid: 'request.getQueryParams()["topic_id"]'
matches: 'traverse(request.getQueryParams(), "topic_id") > 0'
recordUid: 'traverse(request.getQueryParams(), "topic_id")'
tableName: 'sys_category'

28
Tests/Unit/Domain/Pageview/FactoryTest.php
View file

@ -56,7 +56,9 @@ class FactoryTest extends TestCase
$request->getUri()->willReturn('');
$request->getHeader('User-Agent')->willReturn([]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertInstanceOf(Pageview::class, $result);
}
@ -79,7 +81,9 @@ class FactoryTest extends TestCase
'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0'
]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertSame(
'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0',
$result->getUserAgent()
@ -103,7 +107,9 @@ class FactoryTest extends TestCase
$request->getUri()->willReturn('https://example.com/path?query=params&some=more#anchor');
$request->getHeader('User-Agent')->willReturn([]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertSame(
'https://example.com/path?query=params&some=more#anchor',
$result->getUrl()
@ -127,7 +133,9 @@ class FactoryTest extends TestCase
$request->getUri()->willReturn('');
$request->getHeader('User-Agent')->willReturn([]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertSame(
50,
$result->getPageType()
@ -151,7 +159,9 @@ class FactoryTest extends TestCase
$request->getUri()->willReturn('');
$request->getHeader('User-Agent')->willReturn([]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertInstanceOf(\DateTimeImmutable::class, $result->getCrdate());
}
@ -172,7 +182,9 @@ class FactoryTest extends TestCase
$request->getUri()->willReturn('');
$request->getHeader('User-Agent')->willReturn([]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertInstanceOf(SiteLanguage::class, $result->getLanguage());
}
@ -193,7 +205,9 @@ class FactoryTest extends TestCase
$request->getUri()->willReturn('');
$request->getHeader('User-Agent')->willReturn([]);
$result = Factory::fromRequest($request->reveal());
$subject = new Factory($this->prophesize(SiteFinder::class)->reveal());
$result = $subject->fromRequest($request->reveal());
static::assertSame(
10,
$result->getPageUid()