#901 Ensured only domains in use are returned to lists

This commit is contained in:
Alejandro Celaya
2020-11-21 08:44:28 +01:00
parent bb6c5de697
commit 8d3ceaf462
3 changed files with 69 additions and 5 deletions

View File

@@ -6,11 +6,15 @@ namespace ShlinkioTest\Shlink\Core\Domain\Repository;
use Shlinkio\Shlink\Core\Domain\Repository\DomainRepository;
use Shlinkio\Shlink\Core\Entity\Domain;
use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
use Shlinkio\Shlink\Core\ShortUrl\Resolver\ShortUrlRelationResolverInterface;
use Shlinkio\Shlink\Rest\Entity\ApiKey;
use Shlinkio\Shlink\TestUtils\DbTest\DatabaseTestCase;
class DomainRepositoryTest extends DatabaseTestCase
{
protected const ENTITIES_TO_EMPTY = [Domain::class];
protected const ENTITIES_TO_EMPTY = [ShortUrl::class, Domain::class];
private DomainRepository $repo;
@@ -23,12 +27,23 @@ class DomainRepositoryTest extends DatabaseTestCase
public function findDomainsReturnsExpectedResult(): void
{
$fooDomain = new Domain('foo.com');
$barDomain = new Domain('bar.com');
$bazDomain = new Domain('baz.com');
$this->getEntityManager()->persist($fooDomain);
$fooShortUrl = $this->createShortUrl($fooDomain);
$this->getEntityManager()->persist($fooShortUrl);
$barDomain = new Domain('bar.com');
$this->getEntityManager()->persist($barDomain);
$barShortUrl = $this->createShortUrl($barDomain);
$this->getEntityManager()->persist($barShortUrl);
$bazDomain = new Domain('baz.com');
$this->getEntityManager()->persist($bazDomain);
$bazShortUrl = $this->createShortUrl($bazDomain);
$this->getEntityManager()->persist($bazShortUrl);
$detachedDomain = new Domain('detached.com');
$this->getEntityManager()->persist($detachedDomain);
$this->getEntityManager()->flush();
self::assertEquals([$barDomain, $bazDomain, $fooDomain], $this->repo->findDomainsWithout());
@@ -36,4 +51,30 @@ class DomainRepositoryTest extends DatabaseTestCase
self::assertEquals([$bazDomain, $fooDomain], $this->repo->findDomainsWithout('bar.com'));
self::assertEquals([$barDomain, $fooDomain], $this->repo->findDomainsWithout('baz.com'));
}
private function createShortUrl(Domain $domain): ShortUrl
{
return new ShortUrl(
'foo',
ShortUrlMeta::fromRawData(['domain' => $domain->getAuthority()]),
new class ($domain) implements ShortUrlRelationResolverInterface {
private Domain $domain;
public function __construct(Domain $domain)
{
$this->domain = $domain;
}
public function resolveDomain(?string $domain): ?Domain
{
return $this->domain;
}
public function resolveApiKey(?string $key): ?ApiKey
{
return null;
}
},
);
}
}