ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make queries work with the new base mapper

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>

fix: conflicts
This commit is contained in:
Julius Härtl
2020-11-10 12:54:36 +01:00
parent fa7fcef470
commit e8ada52c37
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Db/AclMapper.php
View File

@@ -63,19 +63,18 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
* @param $newOwnerId
* @return void
*/
public function transferOwnership($ownerId, $newOwnerId) {
public function transferOwnership($boardId, $ownerId, $newOwnerId) {
$params = [
'owner' => $ownerId,
'newOwner' => $newOwnerId,
'type' => Acl::PERMISSION_TYPE_USER
'type' => Acl::PERMISSION_TYPE_USER,
'boardId' => $boardId
];
// Drop existing ACL rules for the new owner
$sql = "DELETE FROM `{$this->tableName}`
WHERE `participant` = :newOwner
AND `type` = :type
AND EXISTS (SELECT `id` FROM (SELECT `id` FROM `{$this->tableName}`
WHERE `participant` = :newOwner AND `type` = :type) as tmp)";
AND `board_id` = :boardId";
$stmt = $this->execute($sql, $params);
$stmt->closeCursor();
}

9
lib/Db/AssignmentMapper.php
View File

@@ -157,16 +157,17 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
'newOwner' => $newOwnerId,
'type' => AssignedUsers::TYPE_USER
];
$sql = "DELETE FROM `{$this->tableName}` WHERE `participant` = :newOwner AND `type`= :type";
$stmt = $this->execute($sql, $params);
$qb = $this->db->getQueryBuilder();
$sql = "DELETE FROM `*PREFIX*{$this->tableName}` WHERE `participant` = :newOwner AND `type`= :type";
$stmt = $this->db->executeQuery($sql, $params);
$stmt->closeCursor();
$params = [
'owner' => $ownerId,
'newOwner' => $newOwnerId,
'type' => AssignedUsers::TYPE_USER
];
$sql = "UPDATE `{$this->tableName}` SET `participant` = :newOwner WHERE `participant` = :owner AND `type`= :type";
$stmt = $this->execute($sql, $params);
$sql = "UPDATE `*PREFIX*{$this->tableName}` SET `participant` = :newOwner WHERE `participant` = :owner AND `type`= :type";
$stmt = $this->db->executeQuery($sql, $params);
$stmt->closeCursor();
}
}

16
lib/Service/BoardService.php
View File

@@ -678,14 +678,12 @@ class BoardService {
return $newBoard;
}
/**
* @param $ownerId
* @param $newOwnerId
* @return void
*/
public function transferOwnership($owner, $newOwner) {
public function transferOwnership(string $owner, string $newOwner): void {
$boards = $this->boardMapper->findAllByUser($owner);
foreach ($boards as $board) {
$this->aclMapper->transferOwnership($board->getId(), $owner, $newOwner);
}
$this->boardMapper->transferOwnership($owner, $newOwner);
$this->aclMapper->transferOwnership($owner, $newOwner);
$this->assignedUsersMapper->transferOwnership($owner, $newOwner);
$this->cardMapper->transferOwnership($owner, $newOwner);
}
@@ -721,4 +719,8 @@ class BoardService {
public function getBoardUrl($endpoint) {
return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#' . $endpoint;
}
private function clearBoardsCache() {
$this->boardsCache = null;
}
}

9
tests/integration/database/TransferOwnershipTest.php
View File

@@ -82,6 +82,7 @@ class TransferOwnershipTest extends \Test\TestCase {
*/
public function testTransferBoardOwnership() {
$this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_2);
$this->invokePrivate($this->boardService, 'clearBoardsCache');
$board = $this->boardService->find($this->board->getId());
$boardOwner = $board->getOwner();
$this->assertEquals(self::TEST_USER_2, $boardOwner);
@@ -94,10 +95,10 @@ class TransferOwnershipTest extends \Test\TestCase {
$this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_2);
$board = $this->boardService->find($this->board->getId());
$acl = $board->getAcl();
$isTargetInAcl = (bool)array_filter($acl, function ($item) {
return $item->getParticipant() === self::TEST_USER_2 && $item->getType() === Acl::PERMISSION_TYPE_USER;
});
$this->assertTrue($isTargetInAcl);
// Check if old owner is no longer in ACL
$this->assertTrue((bool)array_filter($acl, function ($item) {
return $item->getParticipant() === self::TEST_USER_1 && $item->getType() === Acl::PERMISSION_TYPE_USER;
}));
}
/**