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

improved organization folder service: added function to find by id, return model entity after creation, added function to remove

Browse source
This commit is contained in:
Jonathan Treffler 2024-11-02 20:14:52 +01:00
parent 79a1c1e9f3
commit 9487ddc910
3 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Errors/OrganizationFolderNotFound.php Normal file
View file

@ -0,0 +1,9 @@
<?php
namespace OCA\OrganizationFolders\Errors;
class OrganizationFolderNotFound extends NotFoundException {
public function __construct($id) {
parent::__construct(\OCA\OrganizationFolders\Model\OrganizationFolder::class, ["id" => $id]);
}
}

2
lib/Errors/OrganizationNotFound.php
View file

@ -4,6 +4,6 @@ namespace OCA\OrganizationFolders\Errors;
class OrganizationNotFound extends NotFoundException { class OrganizationNotFound extends NotFoundException {
public function __construct($provider, $id) { public function __construct($provider, $id) {
parent::__construct(OCA\OrganizationFolders\Model\Organization::class, ["provider" => $provider, "id" => $id]); parent::__construct(\OCA\OrganizationFolders\Model\Organization::class, ["provider" => $provider, "id" => $id]);
} }
} }

39
lib/Service/OrganizationFolderService.php
View file

@ -10,6 +10,7 @@ use OCP\IDBConnection;
use OCA\GroupFolders\Folder\FolderManager; use OCA\GroupFolders\Folder\FolderManager;
use OCA\GroupfolderTags\Service\TagService; use OCA\GroupfolderTags\Service\TagService;
use OCA\OrganizationFolders\Errors\OrganizationFolderNotFound;
use OCA\OrganizationFolders\Model\OrganizationFolder; use OCA\OrganizationFolders\Model\OrganizationFolder;
use OCA\OrganizationFolders\OrganizationProvider\OrganizationProviderManager; use OCA\OrganizationFolders\OrganizationProvider\OrganizationProviderManager;
@ -44,8 +45,26 @@ class OrganizationFolderService {
return $result; return $result;
} }
public function create(string $name, int $quota, ?string $organizationProvider = null,?int $organizationId = null) { public function find(int $id): OrganizationFolder {
$this->atomic(function () use ($name, $quota) { $groupfolder = $this->tagService->findGroupfolderWithTags($id,[
["key" => "organization_folder"],
], ["organization_provider", "organization_id"]);
if(is_null($groupfolder)) {
throw new OrganizationFolderNotFound($id);
}
return new OrganizationFolder(
id: $groupfolder["id"],
name: $groupfolder["mount_point"],
quota: $groupfolder["quota"],
organizationProvider: $groupfolder["organization_provider"],
organizationId: $groupfolder["organization_id"],
);
}
public function create(string $name, int $quota, ?string $organizationProvider = null,?int $organizationId = null): OrganizationFolder {
return $this->atomic(function () use ($name, $quota, $organizationProvider, $organizationId) {
$groupfolderId = $this->folderManager->createFolder($name); $groupfolderId = $this->folderManager->createFolder($name);
$this->folderManager->setFolderQuota($groupfolderId, $quota); $this->folderManager->setFolderQuota($groupfolderId, $quota);
$this->folderManager->setFolderACL($groupfolderId, true); $this->folderManager->setFolderACL($groupfolderId, true);
@ -58,9 +77,16 @@ class OrganizationFolderService {
$this->tagService->update($groupfolderId, "organization_provider", $organizationProvider); $this->tagService->update($groupfolderId, "organization_provider", $organizationProvider);
$this->tagService->update($groupfolderId, "organization_id", $organization->getId()); $this->tagService->update($groupfolderId, "organization_id", $organization->getId());
} }
// TODO: return Model object
$organizationFolder = new OrganizationFolder(
id: $groupfolderId,
name: $name,
quota: $quota,
organizationProvider: $organizationProvider,
organizationId: $organizationId,
);
return $organizationFolder;
}, $this->db); }, $this->db);
} }
@ -68,4 +94,9 @@ class OrganizationFolderService {
} }
public function remove($id): void {
$organizationFolder = $this->find($id);
$this->folderManager->removeFolder($organizationFolder->getId());
}
} }