implement organization files deletion

src/Service/File/FileManager.php

@@ -18,6 +18,7 @@ use App\Service\File\Factory\ImageFactory;
 use App\Service\File\Storage\FileStorageInterface;
 use App\Service\File\Storage\LocalStorage;
 use App\Service\ServiceIterator\StorageIterator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * Le gestionnaire de fichiers permet d'effectuer de nombreuses opérations sur les fichiers stockés dans les différents
@@ -29,7 +30,8 @@ class FileManager
         protected readonly IriConverterInterface $iriConverter,
         protected readonly StorageIterator $storageIterator,
         protected readonly ImageFactory $imageFactory,
-        protected readonly LocalStorage $localStorage
+        protected readonly LocalStorage $localStorage,
+        protected readonly EntityManagerInterface $entityManager,
     ) {
     }
 
@@ -137,4 +139,42 @@ class FileManager
             ['fileId' => $file->getId()]
         );
     }
+
+    /**
+     * Permanently delete the organization's files from each storage, and remove any reference
+     * in the DB
+     *
+     * @param int $organizationId
+     * @return void
+     */
+    public function deleteOrganizationFiles(int $organizationId): void
+    {
+        foreach ($this->storageIterator->getStorages() as $storageService) {
+            $storageService->removeOrganizationDirectory($organizationId);
+        }
+
+        $this->entityManager
+            ->createQuery('DELETE FROM App\Entity\File f WHERE f.organization_id = :organization_id')
+            ->setParameter('organization_id', $organizationId)
+            ->execute();
+    }
+
+    /**
+     * Permanently delete the person's files from each storage, and remove any reference
+     * * in the DB
+ *
+     * @param int $personId
+     * @return void
+     */
+    public function deletePersonFiles(int $personId): void
+    {
+        foreach ($this->storageIterator->getStorages() as $storageService) {
+            $storageService->removePersonDirectory($personId);
+        }
+
+        $this->entityManager
+            ->createQuery('DELETE FROM App\Entity\File f WHERE f.organization_id = :organization_id')
+            ->setParameter('person_id', $personId)
+            ->execute();
+    }
 }

src/Service/File/Storage/ApiLegacyStorage.php

@@ -52,4 +52,30 @@ class ApiLegacyStorage implements FileStorageInterface
     {
         return $file->getHost() === FileHostEnum::API1;
     }
+
+    /**
+     * Permanently delete the entire file storage of the given Organization
+     *
+     * @param int $organizationId
+     * @return void
+     */
+    public function removeOrganizationDirectory(int $organizationId): void
+    {
+        $url = sprintf('api/files/organization/remove-all/%s', $organizationId);
+
+        $this->apiLegacyRequestService->get($url);
+    }
+
+    /**
+     * Permanently delete the entire file storage of the given Person
+     *
+     * @param int $personId
+     * @return void
+     */
+    public function removePersonDirectory(int $personId): void
+    {
+        $url = sprintf('api/files/person/remove-all/%s', $personId);
+
+        $this->apiLegacyRequestService->get($url);
+    }
 }

src/Service/File/Storage/FileStorageInterface.php

@@ -15,4 +15,8 @@ interface FileStorageInterface
     public function getImageUrl(File $file, string $size, bool $relativePath): string;
 
     public function support(File $file): bool;
+
+    public function removeOrganizationDirectory(int $organizationId): void;
+
+    public function removePersonDirectory(int $personId): void;
 }

src/Service/File/Storage/LocalStorage.php

@@ -294,6 +294,30 @@ class LocalStorage implements FileStorageInterface
         }
     }
 
+    /**
+     * Permanently delete the entire file storage of the given Organization
+     *
+     * @param int $organizationId
+     * @return void
+     */
+    public function removeOrganizationDirectory(int $organizationId): void
+    {
+        $this->filesystem->delete('organization/' . $organizationId);
+        $this->filesystem->delete('temp/organization/' . $organizationId);
+    }
+
+    /**
+     * Permanently delete the entire file storage of the given Person
+     *
+     * @param int $personId
+     * @return void
+     */
+    public function removePersonDirectory(int $personId): void
+    {
+        $this->filesystem->delete('person/' . $personId);
+        $this->filesystem->delete('temp/person/' . $personId);
+    }
+
     /**
      * If an organization owns the file, the prefix will be '(_temp_/)organization/{id}(/{type})'.
      * If a person owns it, the prefix will be '(_temp_/)person/{id}(/{type})'

src/Service/Organization/OrganizationFactory.php

@@ -28,6 +28,7 @@ use App\Repository\Core\CountryRepository;
 use App\Repository\Organization\OrganizationRepository;
 use App\Repository\Person\PersonRepository;
 use App\Service\Dolibarr\DolibarrApiService;
+use App\Service\File\FileManager;
 use App\Service\Typo3\BindFileService;
 use App\Service\Typo3\SubdomainService;
 use App\Service\Typo3\Typo3Service;
@@ -63,7 +64,7 @@ class OrganizationFactory
         private readonly DolibarrApiService     $dolibarrApiService,
         private readonly EntityManagerInterface $entityManager,
         private readonly PersonRepository       $personRepository,
-        private readonly BindFileService        $bindFileService,
+        private readonly BindFileService        $bindFileService, private readonly FileManager $fileManager,
     ) {}
 
     #[Required]
@@ -609,8 +610,7 @@ class OrganizationFactory
         $withError = false;
 
         try {
-            // On doit gérer à part la suppression des Access afin de supprimer au passage les Person devenues 'orphelines'
-            $this->deleteOrganizationAccesses($organization);
+            $orphanPersons = $this->getOrphansToBePersons($organization);
 
             // On est obligé de supprimer manuellement les paramètres, car c'est l'entité Parameters qui est
             // propriétaire de la relation Organization ↔ Parameters.
@@ -619,6 +619,11 @@ class OrganizationFactory
             // Toutes les autres entités liées seront supprimées en cascade
             $this->entityManager->remove($organization);
 
+            // Supprime les personnes qui n'avaient pas d'autre Access attaché
+            foreach ($orphanPersons as $person) {
+                $this->entityManager->remove($person);
+            }
+
             $this->entityManager->flush();
             $this->entityManager->commit();
         } catch (\Exception $e) {
@@ -628,7 +633,7 @@ class OrganizationFactory
         }
 
         try {
-            $this->deleteTypo3Website($organization);
+            $this->deleteTypo3Website($organizationDeletionRequest->getOrganizationId());
         } catch (\Exception $e) {
             $this->logger->critical("An error happened while deleting the Typo3 website, please proceed manually.");
             $this->logger->debug($e);
@@ -636,7 +641,7 @@ class OrganizationFactory
         }
 
         try {
-            $this->deleteDolibarrSociety($organization);
+            $this->deleteDolibarrSociety($organizationDeletionRequest->getOrganizationId());
         } catch (\Exception $e) {
             $this->logger->critical("An error happened while deleting the Dolibarr society, please proceed manually.");
             $this->logger->debug($e);
@@ -644,27 +649,21 @@ class OrganizationFactory
         }
 
         try {
-            $this->deleteLocalDirectories($organization);
+            $this->fileManager->deleteOrganizationFiles($organizationDeletionRequest->getOrganizationId());
         } catch (\Exception $e) {
-            $this->logger->critical("An error happened while deleting the local directories, please proceed manually.");
+            $this->logger->critical("An error happened while deleting the organization's files, please proceed manually.");
             $this->logger->debug($e);
             $withError = true;
         }
 
-        try {
-            $this->deleteDirectoriesV1($organization);
-        } catch (\Exception $e) {
-            $this->logger->critical("An error happened while deleting the V1 directories, please proceed manually.");
-            $this->logger->debug($e);
-            $withError = true;
-        }
-
-        try {
-            $this->deleteDirectories59($organization);
-        } catch (\Exception $e) {
-            $this->logger->critical("An error happened while deleting the 5.9 directories, please proceed manually.");
-            $this->logger->debug($e);
-            $withError = true;
+        foreach ($orphanPersons as $person) {
+            try {
+                $this->fileManager->deletePersonFiles($person->getId());
+            } catch (\Exception $e) {
+                $this->logger->critical("An error happened while deleting the person's files, please proceed manually (id=" . $person->getId() . ").");
+                $this->logger->debug($e);
+                $withError = true;
+            }
         }
 
         if ($withError) {
@@ -682,63 +681,29 @@ class OrganizationFactory
      * rattachée (si celle-ci n'est pas liée à d'autres Access)
      *
      * @param Organization $organization
-     * @return void
+     * @return array<Person>
      */
-    protected function deleteOrganizationAccesses(Organization $organization): void
+    protected function getOrphansToBePersons(Organization $organization): array
     {
+        $orphans = [];
+
         foreach ($organization->getAccesses() as $access) {
             $person = $access->getPerson();
             if ($person->getAccesses()->count() === 1) {
-                $this->entityManager->remove($person);
+                $orphans[] = $person;
             }
-            $this->entityManager->remove($access);
         }
-    }
 
-    // TODO: à revoir, c'est du many to many
-//    protected function removeTypeOfPractices(Organization $organization): void {
-//        foreach ($organization->getTypeOfPractices() as $typeOfPractice) {
-//            $organization->removeTypeOfPractice($typeOfPractice);
-//        }
-//    }
-
-    // TODO: à revoir, c'est du many to many
-//    protected function deleteContactPoints(Organization $organization): void
-//    {
-//        foreach ($organization->getContactPoints() as $contactPoint) {
-//            $this->entityManager->remove($contactPoint);
-//        }
-//    }
-
-    // TODO: à revoir, c'est du many to many
-//    protected function deleteBankAccounts(Organization $organization): void {
-//        foreach ($organization->getBankAccounts() as $bankAccount) {
-//            $this->entityManager->remove($bankAccount);
-//        }
-//    }
-
-    protected function deleteTypo3Website(Organization $organization): void
-    {
-        // TODO: implement
-//        $this->typo3Service->deleteSite($organization->getId());
+        return $orphans;
     }
 
-    protected function deleteDolibarrSociety(Organization $organization): void
-    {
-        // TODO: implement
-    }
-
-    protected function deleteLocalDirectories(Organization $organization): void
-    {
-        // TODO: implement
-    }
-
-    protected function deleteDirectoriesV1(Organization $organization): void
+    protected function deleteTypo3Website(int $organizationId): void
     {
         // TODO: implement
+//        $this->typo3Service->deleteSite($organization->getId());
     }
 
-    protected function deleteDirectories59(Organization $organization): void
+    protected function deleteDolibarrSociety(int $organizationId): void
     {
         // TODO: implement
     }

src/Service/ServiceIterator/StorageIterator.php

@@ -22,6 +22,11 @@ class StorageIterator
     ) {
     }
 
+    public function getStorages(): iterable
+    {
+        return $this->storageServices;
+    }
+
     /**
      * Itère sur les services de storage disponibles et
      * retourne le premier qui supporte ce type de requête.

tests/Unit/Service/Organization/OrganizationFactoryTest.php

@@ -132,9 +132,9 @@ class TestableOrganizationFactory extends OrganizationFactory {
         parent::deleteDolibarrSociety($organization);
     }
 
-    public function deleteLocalDirectories(Organization $organization): void
+    public function deleteOrganizationFiles(Organization $organization): void
     {
-        parent::deleteLocalDirectories($organization);
+        parent::deleteOrganizationFiles($organization);
     }
 
     public function deleteDirectoriesV1(Organization $organization): void
@@ -1313,7 +1313,7 @@ class OrganizationFactoryTest extends TestCase
 
         $organizationFactory->expects(self::once())->method('deleteTypo3Website')->with($organization);
         $organizationFactory->expects(self::once())->method('deleteDolibarrSociety')->with($organization);
-        $organizationFactory->expects(self::once())->method('deleteLocalDirectories')->with($organization);
+        $organizationFactory->expects(self::once())->method('deleteOrganizationFiles')->with($organization);
         $organizationFactory->expects(self::once())->method('deleteDirectoriesV1')->with($organization);
         $organizationFactory->expects(self::once())->method('deleteDirectories59')->with($organization);
 
@@ -1359,7 +1359,7 @@ class OrganizationFactoryTest extends TestCase
 
         $organizationFactory->expects(self::never())->method('deleteTypo3Website');
         $organizationFactory->expects(self::never())->method('deleteDolibarrSociety');
-        $organizationFactory->expects(self::never())->method('deleteLocalDirectories');
+        $organizationFactory->expects(self::never())->method('deleteOrganizationFiles');
         $organizationFactory->expects(self::never())->method('deleteDirectoriesV1');
         $organizationFactory->expects(self::never())->method('deleteDirectories59');
 
@@ -1411,7 +1411,7 @@ class OrganizationFactoryTest extends TestCase
 
         $organizationFactory->expects(self::once())->method('deleteTypo3Website')->willThrowException(new \Exception('some error'));
         $organizationFactory->expects(self::once())->method('deleteDolibarrSociety')->willThrowException(new \Exception('some error'));
-        $organizationFactory->expects(self::once())->method('deleteLocalDirectories')->willThrowException(new \Exception('some error'));
+        $organizationFactory->expects(self::once())->method('deleteOrganizationFiles')->willThrowException(new \Exception('some error'));
         $organizationFactory->expects(self::once())->method('deleteDirectoriesV1')->willThrowException(new \Exception('some error'));
         $organizationFactory->expects(self::once())->method('deleteDirectories59')->willThrowException(new \Exception('some error'));