Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-02-28 12:13:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Split spec to join ApiKey spec with short URLs, into inlined and regular versions

Browse Source
This commit is contained in:
Alejandro Celaya
2022-01-18 20:14:24 +01:00
parent 9e9621e7b2
commit d0546a2ea2
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/Rest/src/ApiKey/Spec/WithApiKeySpecsEnsuringJoin.php
View File

@@ -11,11 +11,8 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
class WithApiKeySpecsEnsuringJoin extends BaseSpecification
{
public function __construct(
private ?ApiKey $apiKey,
private string $fieldToJoin = 'shortUrls',
private bool $inlined = false,
) {
public function __construct(private ?ApiKey $apiKey, private string $fieldToJoin = 'shortUrls')
{
parent::__construct();
}
@@ -23,7 +20,7 @@ class WithApiKeySpecsEnsuringJoin extends BaseSpecification
{
return $this->apiKey === null || $this->apiKey->isAdmin() ? Spec::andX() : Spec::andX(
Spec::join($this->fieldToJoin, 's'),
$this->inlined ? $this->apiKey->inlinedSpec() : $this->apiKey->spec($this->fieldToJoin),
$this->apiKey->spec($this->fieldToJoin),
);
}
}

26
module/Rest/src/ApiKey/Spec/WithInlinedApiKeySpecsEnsuringJoin.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
namespace Shlinkio\Shlink\Rest\ApiKey\Spec;
use Happyr\DoctrineSpecification\Spec;
use Happyr\DoctrineSpecification\Specification\BaseSpecification;
use Happyr\DoctrineSpecification\Specification\Specification;
use Shlinkio\Shlink\Rest\Entity\ApiKey;
class WithInlinedApiKeySpecsEnsuringJoin extends BaseSpecification
{
public function __construct(private ?ApiKey $apiKey, private string $fieldToJoin = 'shortUrls')
{
parent::__construct();
}
protected function getSpec(): Specification
{
return $this->apiKey === null || $this->apiKey->isAdmin() ? Spec::andX() : Spec::andX(
Spec::join($this->fieldToJoin, 's'),
$this->apiKey->inlinedSpec(),
);
}
}