3666: Cleanup orphaned detection results when installations are removed from server

Author: turegjorup

src/Handler/DirectoryHandler.php

@@ -7,9 +7,13 @@
 use App\Entity\DetectionResult;
 use App\Entity\Installation;
 use App\Entity\Site;
+use App\Repository\DetectionResultRepository;
 use App\Repository\SiteRepository;
 use App\Service\InstallationFactory;
 use App\Types\DetectionType;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * Handler for DetectionResult off type "dir" (Installations).
@@ -25,6 +29,7 @@
     public function __construct(
         private SiteRepository $siteRepository,
         private InstallationFactory $installationFactory,
+        private DetectionResultRepository $detectionResultRepository,
     ) {
     }
 
@@ -33,13 +38,16 @@ public function __construct(
      */
     public function handleResult(DetectionResult $detectionResult): void
     {
+        $server = $detectionResult->getServer();
+        $oldInstallations = $server->getInstallations();
+
         $installations = $this->installationFactory->getInstallations($detectionResult);
 
         /** @var Installation $installation */
         foreach ($installations as $installation) {
             $sites = $this->siteRepository->findByRootDirAndServer(
                 $installation->getRootDir(),
-                $detectionResult->getServer()
+                $server
             );
             /* @var Site $site */
             foreach ($sites as $site) {
@@ -48,6 +56,14 @@ public function handleResult(DetectionResult $detectionResult): void
         }
 
         $detectionResult->getServer()->setInstallations($installations);
+
+        // Delete results from installations no longer seen on the server.
+        foreach ($oldInstallations as $oldInstallation) {
+            if (!$installations->contains($oldInstallation)) {
+                $this->detectionResultRepository->deleteByInstallation($oldInstallation);
+            }
+        }
+
     }
 
     /**
@@ -57,4 +73,16 @@ public function supportsType(string $type): bool
     {
         return DetectionType::DIRECTORY === $type;
     }
+
+    private function getRemovedInstallations(Collection $oldInstallations, Collection $newInstallations): array
+    {
+        $result = [];
+        foreach ($oldInstallations as $installation) {
+            if (!$newInstallations->contains($installation)) {
+                $result[] = $installation;
+            }
+        }
+
+        return $result;
+    }
 }

src/Repository/DetectionResultRepository.php

@@ -5,6 +5,8 @@
 namespace App\Repository;
 
 use App\Entity\DetectionResult;
+use App\Entity\Installation;
+use App\Entity\Server;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -40,6 +42,15 @@ public function remove(\DateTime $date): mixed
             ->getResult();
     }
 
+    /**
+     * Delete all except X similar detection results
+     *
+     * @param DetectionResult $detectionResult
+     * @param int $keep
+     * @param bool $flush
+     *
+     * @return void
+     */
     public function cleanup(DetectionResult $detectionResult, int $keep = 5, bool $flush = false): void
     {
         if ($keep < 1) {
@@ -65,4 +76,22 @@ public function cleanup(DetectionResult $detectionResult, int $keep = 5, bool $f
             $em->flush();
         }
     }
+
+    /**
+     * Delete all detection results for a given installation.
+     *
+     * @param Installation $installation
+     *
+     * @return void
+     */
+    public function deleteByInstallation(Installation $installation): void
+    {
+        $qb = $this->getEntityManager()->createQueryBuilder();
+        $qb->delete(DetectionResult::class, 'd')
+            ->where('d.server = :server')
+            ->andWhere('d.rootDir =:rootDir')
+            ->setParameter('server', $installation->getServer())
+            ->setParameter('rootDir', $installation->getRootDir());
+        $qb->getQuery()->execute();
+    }
 }