TASK: Only use parent property for manipulating and traversing asset collection hierarchy

Author: Sebobo

Neos.Media/Classes/Domain/Model/AssetCollection.php

@@ -52,14 +52,6 @@ class AssetCollection
      */
     protected $parent;
 
-    /**
-     * @var Collection<AssetCollection>
-     * @ORM\OneToMany(mappedBy="parent", orphanRemoval=true, cascade={"persist"})
-     * @ORM\OrderBy({"title"="ASC"})
-     * @Flow\Lazy
-     */
-    protected $children;
-
     /**
      * @param string $title
      */
@@ -221,41 +213,4 @@ public function setParent(?self $parent): void
         $this->parent = $parent;
         $this->validateCircularHierarchy();
     }
-
-    public function addChild(self $child): void
-    {
-        if (!$this->children->contains($child)) {
-            $this->children->add($child);
-            $child->setParent($this);
-        }
-    }
-
-    public function removeChild(self $child): void
-    {
-        if ($this->children->contains($child)) {
-            $this->children->removeElement($child);
-        }
-    }
-
-    /**
-     * @return Collection<self>
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children ?? new ArrayCollection();
-    }
-
-    /**
-     * @param Collection<self> $children
-     */
-    public function setChildren(Collection $children): void
-    {
-        foreach ($this->children as $child) {
-            $child->setParent(null);
-        }
-        foreach ($children as $child) {
-            $child->setParent($this);
-        }
-        $this->validateCircularHierarchy();
-    }
 }

Neos.Media/Classes/Domain/Repository/AssetCollectionRepository.php

@@ -13,13 +13,15 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\QueryInterface;
+use Neos\Flow\Persistence\QueryResultInterface;
 use Neos\Flow\Persistence\Repository;
 use Neos\Media\Domain\Model\AssetCollection;
 
 /**
  * A repository for AssetCollections
  *
  * @method AssetCollection findOneByTitle(string $title)
+ * @method QueryResultInterface<AssetCollection> findByParent(AssetCollection $parent)
  *
  * @Flow\Scope("singleton")
  */

Neos.Media/Tests/Functional/Domain/Model/AssetCollectionTest.php

@@ -51,10 +51,11 @@ public function parentChildrenRelation(): void
         $parent = new AssetCollection('parent');
 
         $child1->setParent($parent);
-        $parent->addChild($child2);
+        $child2->setParent($parent);
 
         $this->assetCollectionRepository->add($parent);
         $this->assetCollectionRepository->add($child1);
+        $this->assetCollectionRepository->add($child2);
 
         $this->persistenceManager->persistAll();
         $this->persistenceManager->clearState();
@@ -65,7 +66,7 @@ public function parentChildrenRelation(): void
         self::assertEquals('parent', $persistedParent->getTitle());
         self::assertNull($persistedParent->getParent());
 
-        $children = $persistedParent->getChildren();
+        $children = $this->assetCollectionRepository->findByParent($parent);
         self::assertEquals(2, $children->count());
         self::assertEquals('child1', $children->offsetGet(0)->getTitle());
         self::assertEquals('child2', $children->offsetGet(1)->getTitle());
@@ -87,69 +88,6 @@ public function circularParentChildrenRelationThrowsErrorWhenSettingParent(): vo
         $parent->setParent($childOfChild);
     }
 
-    /**
-     * @test
-     */
-    public function circularParentChildrenRelationThrowsErrorWhenAddingChild(): void
-    {
-        $child = new AssetCollection('child');
-        $childOfChild = new AssetCollection('childOfChild');
-        $parent = new AssetCollection('parent');
-
-        $parent->addChild($child);
-        $child->addChild($childOfChild);
-
-        $this->expectException(\InvalidArgumentException::class);
-        $childOfChild->addChild($parent);
-    }
-
-    /**
-     * @test
-     */
-    public function circularParentChildrenRelationThrowsErrorWhenSettingChildren(): void
-    {
-        $child = new AssetCollection('child');
-        $childOfChild = new AssetCollection('childOfChild');
-        $parent = new AssetCollection('parent');
-
-        $parent->setChildren(new ArrayCollection([$child]));
-        $child->setChildren(new ArrayCollection([$childOfChild]));
-
-        $this->expectException(\InvalidArgumentException::class);
-        $childOfChild->setChildren(new ArrayCollection([$parent]));
-    }
-
-    /**
-     * @test
-     */
-    public function removingTheChildDeletesIt(): void
-    {
-        $child = new AssetCollection('child');
-        $parent = new AssetCollection('parent');
-
-        $child->setParent($parent);
-
-        $this->assetCollectionRepository->add($parent);
-        $this->assetCollectionRepository->add($child);
-
-        $this->persistenceManager->persistAll();
-        $this->persistenceManager->clearState();
-
-        $persistedChild = $this->assetCollectionRepository->findOneByTitle('child');
-        $persistedParent = $this->assetCollectionRepository->findOneByTitle('parent');
-
-        $persistedParent->removeChild($persistedChild);
-
-        $this->persistenceManager->persistAll();
-        $this->persistenceManager->clearState();
-
-        $persistedChild = $this->assetCollectionRepository->findOneByTitle('child');
-        $persistedParent = $this->assetCollectionRepository->findOneByTitle('parent');
-
-        self::assertNull($persistedChild);
-        self::assertEquals(0, $persistedParent->getChildren()->count());
-    }
-
     /**
      * @test
      */
@@ -176,8 +114,10 @@ public function unsettingTheParentRemovesChildFromParent(): void
         $persistedChild = $this->assetCollectionRepository->findOneByTitle('child');
         $persistedParent = $this->assetCollectionRepository->findOneByTitle('parent');
 
+        $children = $this->assetCollectionRepository->findByParent($persistedParent);
+
         self::assertNull($persistedChild->getParent());
-        self::assertEquals(0, $persistedParent->getChildren()->count());
+        self::assertEquals(0, count($children));
     }
 
     /**
@@ -208,29 +148,4 @@ public function deletingTheParentDeletesTheChild(): void
         self::assertNull($persistedChild);
         self::assertNull($persistedParent);
     }
-
-    /**
-     * @test
-     */
-    public function settingChildrenSetsTheirParent(): void
-    {
-        $child1 = new AssetCollection('child1');
-        $child2 = new AssetCollection('child2');
-        $parent = new AssetCollection('parent');
-
-        $parent->setChildren(new ArrayCollection([$child1, $child2]));
-
-        $this->assetCollectionRepository->add($parent);
-        $this->assetCollectionRepository->add($child1);
-        $this->assetCollectionRepository->add($child2);
-
-        $this->persistenceManager->persistAll();
-        $this->persistenceManager->clearState();
-
-        $persistedChild1 = $this->assetCollectionRepository->findOneByTitle('child1');
-        $persistedChild2 = $this->assetCollectionRepository->findOneByTitle('child2');
-
-        self::assertEquals('parent', $persistedChild1->getParent()->getTitle());
-        self::assertEquals('parent', $persistedChild2->getParent()->getTitle());
-    }
 }