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

Rename find to findAll

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-11-04 19:43:40 +01:00
parent d66068cdcd
commit 9b366857ab
7 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Command/UserExport.php
View File

@@ -99,7 +99,7 @@ class UserExport extends Command {
$cards = $this->cardMapper->findAllByStack($stack->getId()); $cards = $this->cardMapper->findAllByStack($stack->getId());
foreach ($cards as $card) { foreach ($cards as $card) {
$fullCard = $this->cardMapper->find($card->getId()); $fullCard = $this->cardMapper->find($card->getId());
$assignedUsers = $this->assignedUsersMapper->find($card->getId()); $assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
$fullCard->setAssignedUsers($assignedUsers); $fullCard->setAssignedUsers($assignedUsers);
$data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array)$fullCard->jsonSerialize(); $data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array)$fullCard->jsonSerialize();
} }

6
lib/Db/AssignmentMapper.php
View File

@@ -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[] * @return Assignment[]
*/ */
public function findAll(int $cardId): array {
public function find($cardId): array {
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->select('*') $qb->select('*')
->from('deck_assigned_users') ->from('deck_assigned_users')

4
lib/Service/AssignmentService.php
View File

@@ -120,7 +120,7 @@ class AssignmentService {
} }
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$assignments = $this->assignedUsersMapper->find($cardId); $assignments = $this->assignedUsersMapper->findAll($cardId);
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) { if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) {
throw new BadRequestException('The user is already assigned to the card'); throw new BadRequestException('The user is already assigned to the card');
@@ -179,7 +179,7 @@ class AssignmentService {
throw new BadRequestException('user must be provided'); throw new BadRequestException('user must be provided');
} }
$assignments = $this->assignedUsersMapper->find($cardId); $assignments = $this->assignedUsersMapper->findAll($cardId);
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) { if ($assignment->getParticipant() === $userId && $assignment->getType() === $type) {
$assignment = $this->assignedUsersMapper->delete($assignment); $assignment = $this->assignedUsersMapper->delete($assignment);

4
lib/Service/CardService.php
View File

@@ -98,7 +98,7 @@ class CardService {
public function enrich($card) { public function enrich($card) {
$cardId = $card->getId(); $cardId = $card->getId();
$this->cardMapper->mapOwner($card); $this->cardMapper->mapOwner($card);
$card->setAssignedUsers($this->assignedUsersMapper->find($cardId)); $card->setAssignedUsers($this->assignedUsersMapper->findAll($cardId));
$card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId)); $card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId));
$card->setAttachmentCount($this->attachmentService->count($cardId)); $card->setAttachmentCount($this->attachmentService->count($cardId));
$user = $this->userManager->get($this->currentUser); $user = $this->userManager->get($this->currentUser);
@@ -136,7 +136,7 @@ class CardService {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ); $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
$card = $this->cardMapper->find($cardId); $card = $this->cardMapper->find($cardId);
$assignedUsers = $this->assignedUsersMapper->find($card->getId()); $assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
$attachments = $this->attachmentService->findAll($cardId, true); $attachments = $this->attachmentService->findAll($cardId, true);
$card->setAssignedUsers($assignedUsers); $card->setAssignedUsers($assignedUsers);
$card->setAttachments($attachments); $card->setAttachments($attachments);

2
lib/Service/OverviewService.php
View File

@@ -80,7 +80,7 @@ class OverviewService {
$cardId = $card->getId(); $cardId = $card->getId();
$this->cardMapper->mapOwner($card); $this->cardMapper->mapOwner($card);
$card->setAssignedUsers($this->assignedUsersMapper->find($cardId)); $card->setAssignedUsers($this->assignedUsersMapper->findAll($cardId));
$card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId)); $card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId));
$card->setAttachmentCount($this->attachmentService->count($cardId)); $card->setAttachmentCount($this->attachmentService->count($cardId));

2
lib/Service/StackService.php
View File

@@ -118,7 +118,7 @@ class StackService {
$stack = $this->stackMapper->find($stackId); $stack = $this->stackMapper->find($stackId);
$cards = $this->cardMapper->findAll($stackId); $cards = $this->cardMapper->findAll($stackId);
foreach ($cards as $cardIndex => $card) { foreach ($cards as $cardIndex => $card) {
$assignedUsers = $this->assignedUsersMapper->find($card->getId()); $assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
$card->setAssignedUsers($assignedUsers); $card->setAssignedUsers($assignedUsers);
$card->setAttachmentCount($this->attachmentService->count($card->getId())); $card->setAttachmentCount($this->attachmentService->count($card->getId()));
} }

6
tests/integration/database/AssignmentMapperTest.php
View File

@@ -107,14 +107,14 @@ class AssignmentMapperTest extends \Test\TestCase {
} }
/** /**
* @covers ::find * @covers ::findAll
*/ */
public function testFind() { public function testFind() {
$uids = []; $uids = [];
$this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER1); $this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER1);
$this->assignmentService->assignUser($this->cards[0]->getId(), self::TEST_USER2); $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) { foreach ($assignedUsers as $user) {
$uids[$user->getParticipant()] = $user; $uids[$user->getParticipant()] = $user;
} }
@@ -152,7 +152,7 @@ class AssignmentMapperTest extends \Test\TestCase {
$assignment->setType(Assignment::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$this->assignedUsersMapper->insert($assignment); $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(1, count($actual));
$this->assertEquals($this->cards[1]->getId(), $actual[0]->getCardId()); $this->assertEquals($this->cards[1]->getId(), $actual[0]->getCardId());
$this->assertEquals(self::TEST_USER4, $actual[0]->getParticipant()); $this->assertEquals(self::TEST_USER4, $actual[0]->getParticipant());