IBX-8418: Remove drafts when trashing its parent or ancestor location

Author: barw4

src/contracts/Persistence/Content/Location/Handler.php

@@ -215,6 +215,11 @@ public function create(CreateStruct $location);
      */
     public function removeSubtree($locationId);
 
+    /**
+     * Removes all draft contents that have no location assigned to them under the given parent location.
+     */
+    public function deleteChildrenDrafts(int $locationId): void;
+
     /**
      * Set section on all content objects in the subtree.
      * Only main locations will be updated.

src/lib/Persistence/Cache/LocationHandler.php

@@ -415,6 +415,20 @@ public function removeSubtree($locationId)
         return $return;
     }
 
+    public function deleteChildrenDrafts(int $locationId): void
+    {
+        $this->logger->logCall(__METHOD__, ['location' => $locationId]);
+
+        $this->persistenceHandler->locationHandler()->deleteChildrenDrafts($locationId);
+
+        $this->cache->invalidateTags([
+            $this->cacheIdentifierGenerator->generateTag(
+                self::LOCATION_PATH_IDENTIFIER,
+                [$locationId],
+            ),
+        ]);
+    }
+
     /**
      * {@inheritdoc}
      */

src/lib/Persistence/Legacy/Content/Location/Gateway.php

@@ -111,6 +111,13 @@ abstract public function loadParentLocationsDataForDraftContent(int $contentId):
      */
     abstract public function getSubtreeContent(int $sourceId, bool $onlyIds = false): array;
 
+    /**
+     * Finds draft contents created under the given parent location.
+     *
+     * @return array<int>
+     */
+    abstract public function getSubtreeChildrenDraftContentIds(int $sourceId): array;
+
     abstract public function getSubtreeSize(string $path): int;
 
     /**

src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php

@@ -10,6 +10,7 @@
 use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Doctrine\DBAL\Result;
 use Ibexa\Contracts\Core\Persistence\Content\ContentInfo;
 use Ibexa\Contracts\Core\Persistence\Content\Location;
 use Ibexa\Contracts\Core\Persistence\Content\Location\CreateStruct;
@@ -237,6 +238,29 @@ public function getSubtreeContent(int $sourceId, bool $onlyIds = false): array
             : $results;
     }
 
+    /**
+     * @return array<int>
+     *
+     * @throws \Doctrine\DBAL\Exception
+     * @throws \Doctrine\DBAL\Driver\Exception
+     */
+    public function getSubtreeChildrenDraftContentIds(int $sourceId): array
+    {
+        $query = $this->connection->createQueryBuilder();
+        $query
+            ->select('contentobject_id')
+            ->from('eznode_assignment', 'n')
+            ->innerJoin('n', 'ezcontentobject', 'c', 'n.contentobject_id = c.id')
+            ->andWhere('n.parent_node = :parentNode')
+            ->andWhere('c.status = :status')
+            ->setParameter(':parentNode', $sourceId, ParameterType::INTEGER)
+            ->setParameter(':status', ContentInfo::STATUS_DRAFT, ParameterType::INTEGER);
+
+        $statement = $query->execute();
+
+        return $statement instanceof Result ? $statement->fetchFirstColumn() : [];
+    }
+
     public function getSubtreeSize(string $path): int
     {
         $query = $this->createNodeQueryBuilder([$this->dbPlatform->getCountExpression('node_id')]);

src/lib/Persistence/Legacy/Content/Location/Gateway/ExceptionConversion.php

@@ -106,6 +106,18 @@ public function getSubtreeContent(int $sourceId, bool $onlyIds = false): array
         }
     }
 
+    /**
+     * @return array<int>
+     */
+    public function getSubtreeChildrenDraftContentIds(int $sourceId): array
+    {
+        try {
+            return $this->innerGateway->getSubtreeChildrenDraftContentIds($sourceId);
+        } catch (PDOException $e) {
+            throw DatabaseException::wrap($e);
+        }
+    }
+
     public function getSubtreeSize(string $path): int
     {
         try {

src/lib/Persistence/Legacy/Content/Location/Handler.php

@@ -546,6 +546,11 @@ public function removeSubtree($locationId)
         $this->treeHandler->removeSubtree($locationId);
     }
 
+    public function deleteChildrenDrafts(int $locationId): void
+    {
+        $this->treeHandler->deleteChildrenDrafts($locationId);
+    }
+
     /**
      * Set section on all content objects in the subtree.
      *

src/lib/Persistence/Legacy/Content/TreeHandler.php

@@ -215,6 +215,26 @@ public function removeSubtree($locationId)
         $this->locationGateway->deleteNodeAssignment($contentId);
     }
 
+    /**
+     * Removes draft contents assigned to the given parent location and its descendant locations.
+     *
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     */
+    public function deleteChildrenDrafts(int $locationId): void
+    {
+        $subLocations = $this->locationGateway->getChildren($locationId);
+        foreach ($subLocations as $subLocation) {
+            $this->deleteChildrenDrafts($subLocation['node_id']);
+        }
+
+        // Fetch child draft content ids
+        $subtreeChildrenDraftIds = $this->locationGateway->getSubtreeChildrenDraftContentIds($locationId);
+
+        foreach ($subtreeChildrenDraftIds as $contentId) {
+            $this->removeRawContent($contentId);
+        }
+    }
+
     /**
      * Set section on all content objects in the subtree.
      *

src/lib/Repository/TrashService.php

@@ -146,6 +146,7 @@ public function trash(Location $location): ?APITrashItem
 
         $this->repository->beginTransaction();
         try {
+            $this->persistenceHandler->locationHandler()->deleteChildrenDrafts($location->id);
             $spiTrashItem = $this->persistenceHandler->trashHandler()->trashSubtree($location->id);
             $this->persistenceHandler->urlAliasHandler()->locationDeleted($location->id);
             $this->repository->commit();