kevinveenbirkenbach/infinito
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/infinito.git synced 2025-09-13 13:57:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optimized RequestManagement and tests

Browse Source
This commit is contained in:
Kevin Frantz
2019-01-26 19:39:36 +01:00
parent 4731ef22a2
commit 4dd7ce8331
12 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/symfony/src/Attribut/RequestedEntityAttribut.php
View File

@@ -6,6 +6,8 @@ use App\Domain\RequestManagement\Entity\RequestedEntityInterface;
/**
* @author kevinfrantz
*
* @see RequestedEntityAttributInterface
*/
trait RequestedEntityAttribut
{
@@ -29,4 +31,12 @@ trait RequestedEntityAttribut
{
$this->requestedEntity = $requestedEntity;
}
/**
* @return bool
*/
public function hasRequestedEntity(): bool
{
return isset($this->requestedEntity);
}
}

5
application/symfony/src/Attribut/RequestedEntityAttributInterface.php
View File

@@ -9,6 +9,11 @@ use App\Domain\RequestManagement\Entity\RequestedEntityInterface;
*/
interface RequestedEntityAttributInterface
{
/**
* @return bool
*/
public function hasRequestedEntity(): bool;
/**
* @return RequestedEntityInterface
*/

8
application/symfony/src/Attribut/RequestedRightAttribut.php
View File

@@ -24,6 +24,14 @@ trait RequestedRightAttribut
$this->requestedRight = $requestedRight;
}
/**
* @return bool
*/
public function hasRequestedRight(): bool
{
return isset($this->requestedRight);
}
/**
* @return RequestedRightInterface
*/

5
application/symfony/src/Attribut/RequestedRightAttributInterface.php
View File

@@ -9,6 +9,11 @@ use App\Domain\RequestManagement\Right\RequestedRightInterface;
*/
interface RequestedRightAttributInterface
{
/**
* @return bool
*/
public function hasRequestedRight(): bool;
/**
* @param RequestedRightInterface $requestedRight
*/

46
application/symfony/src/Domain/RequestManagement/Entity/RequestedEntity.php
View File

@@ -14,6 +14,7 @@ use App\Entity\Source\AbstractSource;
use App\Exception\NotSetException;
use App\Repository\RepositoryInterface;
use App\Entity\Source\SourceInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* @author kevinfrantz
@@ -53,19 +54,44 @@ class RequestedEntity extends AbstractEntity implements RequestedEntityInterface
}
/**
* @throws NotSetException
*/
private function validateHasIdentity(): void
{
if (!($this->hasId() || $this->hasSlug())) {
throw new NotSetException('No identity attribut like id or slug was set!');
}
}
/**
* @param EntityInterface|null $entity
*
* @throws NotFoundHttpException
*/
private function validateLoadedEntity(?EntityInterface $entity): void
{
if (!$entity) {
throw new NotFoundHttpException('Entity with {id:"'.$this->id.'",slug:"'.$this->slug.'"} not found');
}
}
/**
* Sorry for the messed function, but should work ;)
* {@inheritdoc}
*
* @see \App\Domain\RequestManagement\Entity\RequestedEntityInterface::getEntity()
*/
public function getEntity(): EntityInterface
{
$this->validateHasIdentity();
if ($this->hasSlug()) {
return $this->loadBySlug();
$entity = $this->loadBySlug();
} elseif ($this->hasId()) {
$entity = $this->loadById();
}
if ($this->hasId()) {
return $this->loadById();
}
throw new NotSetException('No identity attribut like id or slug was set!');
$this->validateLoadedEntity($entity);
return $entity;
}
/**
@@ -82,9 +108,9 @@ class RequestedEntity extends AbstractEntity implements RequestedEntityInterface
/**
* @throws NotCorrectInstanceException
*
* @return SourceInterface
* @return SourceInterface|null
*/
private function loadBySlug(): SourceInterface
private function loadBySlug(): ?SourceInterface
{
$repository = $this->getEntityRepository();
if ($repository instanceof SourceRepositoryInterface) {
@@ -94,9 +120,9 @@ class RequestedEntity extends AbstractEntity implements RequestedEntityInterface
}
/**
* @return EntityInterface
* @return EntityInterface|null
*/
private function loadById(): EntityInterface
private function loadById(): ?EntityInterface
{
$repository = $this->getEntityRepository();
@@ -112,7 +138,7 @@ class RequestedEntity extends AbstractEntity implements RequestedEntityInterface
public function setRequestedRight($requestedRight): void
{
$this->requestedRight = $requestedRight;
if ($this->requestedRight !== $this) {
if (!$this->requestedRight->hasRequestedEntity()) {
$this->requestedRight->setRequestedEntity($this);
}
}

10
application/symfony/src/Domain/RequestManagement/Right/AbstractRequestedRightFacade.php
View File

@@ -114,4 +114,14 @@ abstract class AbstractRequestedRightFacade implements RequestedRightInterface
{
$this->requestedRight->setReciever($reciever);
}
/**
* {@inheritdoc}
*
* @see \App\Attribut\RequestedEntityAttributInterface::hasRequestedEntity()
*/
public function hasRequestedEntity(): bool
{
$this->requestedRight->hasRequestedEntity();
}
}

13
application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php
View File

@@ -27,11 +27,6 @@ class RequestedRight implements RequestedRightInterface
*/
private $source;
/**
* @var RequestedEntityInterface
*/
private $requestedEntity;
/**
* @throws NotCorrectInstanceException
*/
@@ -40,11 +35,15 @@ class RequestedRight implements RequestedRightInterface
$entity = $this->requestedEntity->getEntity();
if ($entity instanceof SourceInterface) {
$this->source = $entity;
return;
}
if ($entity instanceof MetaInterface) {
$this->source = $entity->getSource();
return;
}
throw new NotCorrectInstanceException('The entity instance can\'t be processed');
throw new NotCorrectInstanceException('The entity instance '.get_class($entity).' can\'t be processed');
}
/**
@@ -92,7 +91,7 @@ class RequestedRight implements RequestedRightInterface
final public function setRequestedEntity(RequestedEntityInterface $requestedEntity): void
{
$this->requestedEntity = $requestedEntity;
if ($requestedEntity->getRequestedRight() !== $this) {
if (!$requestedEntity->hasRequestedRight()) {
$this->requestedEntity->setRequestedRight($this);
}
}