verdigado-public/organization_folders
0
0
Fork 0
mirror of https://github.com/verdigado/organization_folders.git synced 2024-12-06 11:22:41 +01:00
Code Projects Activity

many small resource member related improvements

Browse source
This commit is contained in:
Jonathan Treffler 2024-11-16 03:06:21 +01:00
parent 8bfa9dfa29
commit 9ebae48238
9 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/Db/ResourceMember.php
View file

@ -7,7 +7,7 @@ use OCA\OrganizationFolders\Interface\TableSerializable;
use OCP\AppFramework\Db\Entity;
use OCA\OrganizationFolders\Enum\MemberPermissionLevel;
use OCA\OrganizationFolders\Enum\ResourceMemberPermissionLevel;
use OCA\OrganizationFolders\Enum\PrincipalType;
use OCA\OrganizationFolders\Model\Principal;
@ -26,6 +26,7 @@ class ResourceMember extends Entity implements JsonSerializable, TableSerializab
$this->addType('createdTimestamp','integer');
$this->addType('lastUpdatedTimestamp','integer');
}
public function getPrincipal(): Principal {
return new Principal(PrincipalType::from($this->principalType), $this->principalId);
}
@ -35,6 +36,20 @@ class ResourceMember extends Entity implements JsonSerializable, TableSerializab
$this->setPrincipalId($principal->getId());
}
public function setPermissionLevel(int $permissionLevel) {
if($permissionLevel >= 1 && $permissionLevel <= 2) {
if ($permissionLevel === $this->permissionLevel) {
// no change
return;
}
$this->markFieldUpdated("permissionLevel");
$this->permissionLevel = $permissionLevel;
} else {
throw new \Exception("invalid resource member permission level");
}
}
public function jsonSerialize(): array {
return [
'id' => $this->id,
@ -50,7 +65,7 @@ class ResourceMember extends Entity implements JsonSerializable, TableSerializab
return [
'Id' => $this->id,
'Resource Id' => $this->resourceId,
'Permission Level' => MemberPermissionLevel::from($this->permissionLevel)->name,
'Permission Level' => ResourceMemberPermissionLevel::from($this->permissionLevel)->name,
'Principal Type' => PrincipalType::from($this->principalType)->name,
'Principal Id' => $this->principalId,
'Created' => $this->createdTimestamp,

6
lib/Db/ResourceMemberMapper.php
View file

@ -49,15 +49,15 @@ class ResourceMemberMapper extends QBMapper {
return $this->findEntities($qb);
}
public function exists(int $resourceId, int $type, string $principal): bool {
public function exists(int $resourceId, int $principalType, string $principalId): bool {
/* @var $qb IQueryBuilder */
$qb = $this->db->getQueryBuilder();
$qb->select($qb->createFunction('COUNT(1)'))
->from(self::RESOURCE_MEMBERS_TABLE)
->where($qb->expr()->eq('resource_id', $qb->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('principal', $qb->createNamedParameter($principal)));
->andWhere($qb->expr()->eq('principal_type', $qb->createNamedParameter($principalType, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('principal_id', $qb->createNamedParameter($principalId)));
return $qb->executeQuery()->fetch()["COUNT(1)"] === 1;
}