unify AssertNoLoop-Validators

ecamp · Jul 9, 2024 · e0f65ff · e0f65ff
1 parent cb9fa18
commit e0f65ff
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 68 deletions.
diff --git a/api/src/Entity/ChecklistItem.php b/api/src/Entity/ChecklistItem.php
@@ -16,8 +16,8 @@
 use App\InputFilter;
 use App\Repository\ChecklistItemRepository;
 use App\Util\EntityMap;
+use App\Validator\AssertNoLoop;
 use App\Validator\ChecklistItem\AssertBelongsToChecklist;
-use App\Validator\ChecklistItem\AssertNoLoop;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -67,7 +67,7 @@
 )]
 #[ApiFilter(filterClass: SearchFilter::class, properties: ['checklist'])]
 #[ORM\Entity(repositoryClass: ChecklistItemRepository::class)]
-class ChecklistItem extends BaseEntity implements BelongsToCampInterface, CopyFromPrototypeInterface {
+class ChecklistItem extends BaseEntity implements BelongsToCampInterface, CopyFromPrototypeInterface, HasParentInterface {
     public const CHECKLIST_SUBRESOURCE_URI_TEMPLATE = '/checklists/{checklistId}/checklist_items.{_format}';
 
     /**
@@ -140,6 +140,10 @@ public function getCamp(): ?Camp {
         return $this->checklist?->getCamp();
     }
 
+    public function getParent(): ?HasParentInterface {
+        return $this->parent;
+    }
+
     /**
      * @return ChecklistItem[]
      */

diff --git a/api/src/Entity/ContentNode.php b/api/src/Entity/ContentNode.php
@@ -14,9 +14,9 @@
 use App\Util\ClassInfoTrait;
 use App\Util\EntityMap;
 use App\Util\JsonMergePatch;
+use App\Validator\AssertNoLoop;
 use App\Validator\ContentNode\AssertAttachedToRoot;
 use App\Validator\ContentNode\AssertContentTypeCompatible;
-use App\Validator\ContentNode\AssertNoLoop;
 use App\Validator\ContentNode\AssertNoRootChange;
 use App\Validator\ContentNode\AssertSlotSupportedByParent;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -49,7 +49,7 @@
 #[ORM\InheritanceType('SINGLE_TABLE')]
 #[ORM\DiscriminatorColumn(name: 'strategy', type: 'string')]
 #[ORM\UniqueConstraint(name: 'contentnode_parentid_slot_position_unique', columns: ['parentid', 'slot', 'position'])]
-abstract class ContentNode extends BaseEntity implements BelongsToContentNodeTreeInterface, CopyFromPrototypeInterface {
+abstract class ContentNode extends BaseEntity implements BelongsToContentNodeTreeInterface, CopyFromPrototypeInterface, HasParentInterface {
     use ClassInfoTrait;
 
     /**
@@ -180,6 +180,10 @@ public function getRoot(): ?ColumnLayout {
         return $this->root;
     }
 
+    public function getParent(): ?HasParentInterface {
+        return $this->parent;
+    }
+
     /**
      * Holds the actual data of the content node.
      */

diff --git a/api/src/Entity/HasParentInterface.php b/api/src/Entity/HasParentInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Entity;
+
+interface HasParentInterface extends HasId {
+    public function getParent(): ?HasParentInterface;
+}
diff --git a/...rc/Validator/ContentNode/AssertNoLoop.php → api/src/Validator/AssertNoLoop.php b/...rc/Validator/ContentNode/AssertNoLoop.php → api/src/Validator/AssertNoLoop.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Validator\ContentNode;
+namespace App\Validator;
 
 use Symfony\Component\Validator\Constraint;
 

diff --git a/...tor/ContentNode/AssertNoLoopValidator.php → api/src/Validator/AssertNoLoopValidator.php b/...tor/ContentNode/AssertNoLoopValidator.php → api/src/Validator/AssertNoLoopValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Validator\ContentNode;
+namespace App\Validator;
 
-use App\Entity\ContentNode;
+use App\Entity\HasParentInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -19,7 +19,7 @@ public function validate($value, Constraint $constraint): void {
 
         $object = $this->context->getObject();
 
-        /** @var ContentNode $parent */
+        /** @var HasParentInterface $parent */
         $parent = $value;
 
         // $seen keeps track of all parents that we have visited. This is for a safety
@@ -36,7 +36,7 @@ public function validate($value, Constraint $constraint): void {
             }
 
             $seen[] = $parent->getId();
-            $parent = $parent->parent;
+            $parent = $parent->getParent();
         }
     }
 }
diff --git a/api/src/Validator/ChecklistItem/AssertNoLoop.php b/api/src/Validator/ChecklistItem/AssertNoLoop.php
diff --git a/api/src/Validator/ChecklistItem/AssertNoLoopValidator.php b/api/src/Validator/ChecklistItem/AssertNoLoopValidator.php
diff --git a/...ContentNode/AssertNoLoopValidatorTest.php → ...s/Validator/AssertNoLoopValidatorTest.php b/...ContentNode/AssertNoLoopValidatorTest.php → ...s/Validator/AssertNoLoopValidatorTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Tests\Validator\ContentNode;
+namespace App\Tests\Validator;
 
 use App\Entity\ContentNode;
-use App\Validator\ContentNode\AssertNoLoop;
-use App\Validator\ContentNode\AssertNoLoopValidator;
+use App\Validator\AssertNoLoop;
+use App\Validator\AssertNoLoopValidator;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;