verdigado-public/organization_folders
0
0
Fork 0
mirror of https://github.com/verdigado/organization_folders.git synced 2024-11-21 20:28:11 +01:00
Code Projects Activity

implemented proper resource deletion: remove folder resources in filesystem; remove child resources first

Browse source
This commit is contained in:
Jonathan Treffler 2024-11-05 13:45:14 +01:00
parent 6252ca26dc
commit fe50f71d6b
1 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/Service/ResourceService.php
View file

@ -271,14 +271,51 @@ class ResourceService {
public function getFolderResourceFilesystemNode(FolderResource $resource) {
return $this->pathManager->getOrganizationFolderByIdSubfolder($resource->getOrganizationFolderId(), $this->getResourcePath($resource));
}
/**
* get all direct sub-resources
*/
public function getSubResources(Resource $resource) {
return $this->findAll($resource->getOrganizationFolderId(), $resource->getId());
}
public function delete(int $id): Resource {
/**
* get all sub-resources recursively
*/
public function getAllSubResources(Resource $resource) {
$subResources = $this->getSubResources($resource);
foreach($subResources as $subResource) {
$subResources = array_merge($subResources, $this->getAllSubResources($subResource));
}
return $subResources;
}
public function deleteById(int $id): Resource {
try {
$resource = $this->mapper->find($id);
$this->mapper->delete($resource);
return $resource;
return $this->delete($resource);
} catch (Exception $e) {
$this->handleException($e, $id);
$this->handleException($e, $resource->getId());
}
}
public function delete(Resource $resource): Resource {
// first delete all subresources recursively
$subResources = $this->getSubResources($resource);
foreach($subResources as $subResource) {
$this->delete($subResource);
}
// delete in filesystem if type folder
if($resource->getType() === "folder") {
$this->getFolderResourceFilesystemNode($resource)->delete();
}
// delete in database
$this->mapper->delete($resource);
return $resource;
}
}