Skip to content

Commit 4a170e2

Browse files
authored
Merge pull request #580 from caesar-team/feature/CAES-1680
[Item] CAES-1680: Fixed get keypairs endpoint.
2 parents 5e66b90 + b066e24 commit 4a170e2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/Repository/ItemRepository.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ public function getKeypairsByRequest(KeypairFilterRequest $request): array
9393
$queryBuilder = $this->createQueryBuilder('item');
9494
$queryBuilder
9595
->where('item.type = :type')
96-
->andWhere('item.owner = :user')
96+
->andWhere('item.owner = :user OR (item.team IN (:teams) AND item.relatedItem IS NOT NULL)')
9797
->setParameter('type', NodeEnumType::TYPE_KEYPAIR)
9898
->setParameter('user', $request->getUser())
99+
->setParameter('teams', $request->getUser()->getTeamsIds())
99100
;
100101

101102
if ($request->hasPersonalType()) {

tests/api/Item/KeypairTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,16 @@ public function getKeypairs()
7777

7878
/** @var User $user */
7979
$user = $I->have(User::class);
80+
/** @var User $member */
81+
$member = $I->have(User::class);
8082
$item = $I->createUserItem($user);
8183
$team = $I->createTeam($user);
84+
$I->addUserToTeam($team, $member);
8285
$teamItem = $I->createTeamItem($team, $user);
8386

8487
$personalKeypair = $I->createKeypairItem($user, $item);
8588
$teamKeypair = $I->createKeypairTeamItem($team, $user);
86-
$teamItemKeypair = $I->createKeypairTeamItem($team, $user, $teamItem);
89+
$teamItemKeypair = $I->createKeypairTeamItem($team, $member, $teamItem);
8790

8891
$I->login($user);
8992
$I->sendGET('/keypairs');

0 commit comments

Comments
 (0)