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

fix: Assignment is the new AssignedUsers

Browse Source 
Signed-off-by: Max <max@nextcloud.com>
This commit is contained in:
Max
2022-02-09 14:45:00 +01:00
committed by Julius Härtl
parent e8ada52c37
commit 4d3dabb94e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/AssignmentMapper.php
View File

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

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

@@ -3,8 +3,8 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Board; use OCA\Deck\Db\Board;
/** /**
@@ -23,8 +23,8 @@ class TransferOwnershipTest extends \Test\TestCase {
protected $cardService; protected $cardService;
/** @var StackService */ /** @var StackService */
protected $stackService; protected $stackService;
/** @var AssignedUsersMapper */ /** @var AssignmentMapper */
protected $assignedUsersMapper; protected $assignmentMapper;
/** @var AssignmentService */ /** @var AssignmentService */
private $assignmentService; private $assignmentService;
/** @var Board */ /** @var Board */
@@ -55,7 +55,7 @@ class TransferOwnershipTest extends \Test\TestCase {
$this->stackService = \OC::$server->query(StackService::class); $this->stackService = \OC::$server->query(StackService::class);
$this->cardService = \OC::$server->query(CardService::class); $this->cardService = \OC::$server->query(CardService::class);
$this->assignmentService = \OC::$server->query(AssignmentService::class); $this->assignmentService = \OC::$server->query(AssignmentService::class);
$this->assignedUsersMapper = \OC::$server->query(AssignedUsersMapper::class); $this->assignmentMapper = \OC::$server->query(AssignmentMapper::class);
$this->createBoardWithExampleData(); $this->createBoardWithExampleData();
} }
@@ -128,9 +128,9 @@ class TransferOwnershipTest extends \Test\TestCase {
*/ */
public function testReassignCardToNewOwner() { public function testReassignCardToNewOwner() {
$this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_2); $this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_2);
$assignedUsers = $this->assignedUsersMapper->find($this->cards[0]->getId()); $users = $this->assignmentMapper->findAll($this->cards[0]->getId());
$participantsUIDs = []; $participantsUIDs = [];
foreach ($assignedUsers as $user) { foreach ($users as $user) {
$participantsUIDs[] = $user->getParticipant(); $participantsUIDs[] = $user->getParticipant();
} }
$this->assertContains(self::TEST_USER_2, $participantsUIDs); $this->assertContains(self::TEST_USER_2, $participantsUIDs);
@@ -141,11 +141,11 @@ class TransferOwnershipTest extends \Test\TestCase {
* @covers ::transferOwnership * @covers ::transferOwnership
*/ */
public function testReassignCardToNewParticipantOnlyIfParticipantHasUserType() { public function testReassignCardToNewParticipantOnlyIfParticipantHasUserType() {
$this->assignmentService->assignUser($this->cards[1]->getId(), self::TEST_USER_1, AssignedUsers::TYPE_GROUP); $this->assignmentService->assignUser($this->cards[1]->getId(), self::TEST_USER_1, Assignment::TYPE_GROUP);
$this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_2); $this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_2);
$assignedUsers = $this->assignedUsersMapper->find($this->cards[1]->getId()); $users = $this->assignmentMapper->findAll($this->cards[1]->getId());
$participantsUIDs = []; $participantsUIDs = [];
foreach ($assignedUsers as $user) { foreach ($users as $user) {
$participantsUIDs[] = $user->getParticipant(); $participantsUIDs[] = $user->getParticipant();
} }
$this->assertContains(self::TEST_USER_1, $participantsUIDs); $this->assertContains(self::TEST_USER_1, $participantsUIDs);
@@ -196,7 +196,7 @@ class TransferOwnershipTest extends \Test\TestCase {
*/ */
public function testTargetAlreadyParticipantOfCard() { public function testTargetAlreadyParticipantOfCard() {
$this->expectNotToPerformAssertions(); $this->expectNotToPerformAssertions();
$this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER_3, AssignedUsers::TYPE_USER); $this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER_3, Assignment::TYPE_USER);
$this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_3); $this->boardService->transferOwnership(self::TEST_USER_1, self::TEST_USER_3);
} }