From 9b366857ab6df25c8ae15e491cc85862d94c659b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 4 Nov 2020 19:43:40 +0100 Subject: [PATCH] Rename find to findAll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Command/UserExport.php | 2 +- lib/Db/AssignmentMapper.php | 6 +----- lib/Service/AssignmentService.php | 4 ++-- lib/Service/CardService.php | 4 ++-- lib/Service/OverviewService.php | 2 +- lib/Service/StackService.php | 2 +- tests/integration/database/AssignmentMapperTest.php | 6 +++--- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/Command/UserExport.php b/lib/Command/UserExport.php index b40659ad9..1d73e8dcf 100644 --- a/lib/Command/UserExport.php +++ b/lib/Command/UserExport.php @@ -99,7 +99,7 @@ class UserExport extends Command { $cards = $this->cardMapper->findAllByStack($stack->getId()); foreach ($cards as $card) { $fullCard = $this->cardMapper->find($card->getId()); - $assignedUsers = $this->assignedUsersMapper->find($card->getId()); + $assignedUsers = $this->assignedUsersMapper->findAll($card->getId()); $fullCard->setAssignedUsers($assignedUsers); $data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array)$fullCard->jsonSerialize(); } diff --git a/lib/Db/AssignmentMapper.php b/lib/Db/AssignmentMapper.php index e4571c2de..0491cff1e 100644 --- a/lib/Db/AssignmentMapper.php +++ b/lib/Db/AssignmentMapper.php @@ -55,13 +55,9 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper { } /** - * FIXME: rename this since it returns multiple entities otherwise the naming is confusing with Entity::find - * - * @param $cardId * @return Assignment[] */ - - public function find($cardId): array { + public function findAll(int $cardId): array { $qb = $this->db->getQueryBuilder(); $qb->select('*') ->from('deck_assigned_users') diff --git a/lib/Service/AssignmentService.php b/lib/Service/AssignmentService.php index 64c1266e3..aaf0cec37 100644 --- a/lib/Service/AssignmentService.php +++ b/lib/Service/AssignmentService.php @@ -120,7 +120,7 @@ class AssignmentService { } $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT); - $assignments = $this->assignedUsersMapper->find($cardId); + $assignments = $this->assignedUsersMapper->findAll($cardId); foreach ($assignments as $assignment) { if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) { throw new BadRequestException('The user is already assigned to the card'); @@ -179,7 +179,7 @@ class AssignmentService { throw new BadRequestException('user must be provided'); } - $assignments = $this->assignedUsersMapper->find($cardId); + $assignments = $this->assignedUsersMapper->findAll($cardId); foreach ($assignments as $assignment) { if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) { $assignment = $this->assignedUsersMapper->delete($assignment); diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php index 0e2d1ead7..eab133554 100644 --- a/lib/Service/CardService.php +++ b/lib/Service/CardService.php @@ -98,7 +98,7 @@ class CardService { public function enrich($card) { $cardId = $card->getId(); $this->cardMapper->mapOwner($card); - $card->setAssignedUsers($this->assignedUsersMapper->find($cardId)); + $card->setAssignedUsers($this->assignedUsersMapper->findAll($cardId)); $card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId)); $card->setAttachmentCount($this->attachmentService->count($cardId)); $user = $this->userManager->get($this->currentUser); @@ -136,7 +136,7 @@ class CardService { $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ); $card = $this->cardMapper->find($cardId); - $assignedUsers = $this->assignedUsersMapper->find($card->getId()); + $assignedUsers = $this->assignedUsersMapper->findAll($card->getId()); $attachments = $this->attachmentService->findAll($cardId, true); $card->setAssignedUsers($assignedUsers); $card->setAttachments($attachments); diff --git a/lib/Service/OverviewService.php b/lib/Service/OverviewService.php index a5df16d69..6d514cd32 100644 --- a/lib/Service/OverviewService.php +++ b/lib/Service/OverviewService.php @@ -80,7 +80,7 @@ class OverviewService { $cardId = $card->getId(); $this->cardMapper->mapOwner($card); - $card->setAssignedUsers($this->assignedUsersMapper->find($cardId)); + $card->setAssignedUsers($this->assignedUsersMapper->findAll($cardId)); $card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId)); $card->setAttachmentCount($this->attachmentService->count($cardId)); diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php index 8178d1423..b5dc22213 100644 --- a/lib/Service/StackService.php +++ b/lib/Service/StackService.php @@ -118,7 +118,7 @@ class StackService { $stack = $this->stackMapper->find($stackId); $cards = $this->cardMapper->findAll($stackId); foreach ($cards as $cardIndex => $card) { - $assignedUsers = $this->assignedUsersMapper->find($card->getId()); + $assignedUsers = $this->assignedUsersMapper->findAll($card->getId()); $card->setAssignedUsers($assignedUsers); $card->setAttachmentCount($this->attachmentService->count($card->getId())); } diff --git a/tests/integration/database/AssignmentMapperTest.php b/tests/integration/database/AssignmentMapperTest.php index e593a5d6b..56b53e27f 100644 --- a/tests/integration/database/AssignmentMapperTest.php +++ b/tests/integration/database/AssignmentMapperTest.php @@ -107,14 +107,14 @@ class AssignmentMapperTest extends \Test\TestCase { } /** - * @covers ::find + * @covers ::findAll */ public function testFind() { $uids = []; $this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER1); $this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER2); - $assignedUsers = $this->assignedUsersMapper->find($this->cards[0]->getId()); + $assignedUsers = $this->assignedUsersMapper->findAll($this->cards[0]->getId()); foreach ($assignedUsers as $user) { $uids[$user->getParticipant()] = $user; } @@ -152,7 +152,7 @@ class AssignmentMapperTest extends \Test\TestCase { $assignment->setType(Assignment::TYPE_USER); $this->assignedUsersMapper->insert($assignment); - $actual = $this->assignedUsersMapper->find($this->cards[1]->getId()); + $actual = $this->assignedUsersMapper->findAll($this->cards[1]->getId()); $this->assertEquals(1, count($actual)); $this->assertEquals($this->cards[1]->getId(), $actual[0]->getCardId()); $this->assertEquals(self::TEST_USER4, $actual[0]->getParticipant());