Skip to content

perf(MemberRequest): Remove unused LEFT JOINs #1969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 1 commit into from
Jun 2, 2025
Merged

perf(MemberRequest): Remove unused LEFT JOINs #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
perf(MemberRequest): Remove unused LEFT JOINs 
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
@provokateurin
provokateurin committed Jun 2, 2025
commit f63b1fd3dfdd8326b56803bcec50d979d33e7424
2 changes: 1 addition & 1 deletion lib/Command/MembersList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ private function getMembers(
}
} else {
$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true);
$members = $this->memberService->getMembers($circleId);
$members = $this->memberService->getMembers($circleId, true);
}

if (!is_null($tree)) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/RemoteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ public function members(string $circleId): DataResponse {
}

try {
$members = $this->memberService->getMembers($circleId);
$members = $this->memberService->getMembers($circleId, true);

return new DataResponse($members);
} catch (Exception $e) {
Expand Down
7 changes: 5 additions & 2 deletions lib/Db/MemberRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ public function getMembers(
?IFederatedUser $initiator = null,
?MemberProbe $probe = null,
int $limit = 0,
bool $fullDetails = false,
): array {
if (is_null($probe)) {
$probe = new MemberProbe();
Expand All @@ -218,8 +219,10 @@ public function getMembers(
)
);

$qb->leftJoinCircle(CoreQueryBuilder::MEMBER, $initiator);
$qb->leftJoinInvitedBy(CoreQueryBuilder::MEMBER);
if ($fullDetails) {
$qb->leftJoinCircle(CoreQueryBuilder::MEMBER, $initiator);
$qb->leftJoinInvitedBy(CoreQueryBuilder::MEMBER);
}

if ($probe->hasFilterRemoteInstance()) {
$aliasCircle = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::CIRCLE);
Expand Down
5 changes: 3 additions & 2 deletions lib/Service/MemberService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public function getMemberById(
* @throws InitiatorNotFoundException
* @throws RequestBuilderException
*/
public function getMembers(string $circleId): array {
public function getMembers(string $circleId, bool $fullDetails = false): array {
$this->federatedUserService->mustHaveCurrentUser();

$probe = new MemberProbe();
Expand All @@ -164,7 +164,8 @@ public function getMembers(string $circleId): array {
return $this->memberRequest->getMembers(
$circleId,
$this->federatedUserService->getCurrentUser(),
$probe
$probe,
fullDetails: $fullDetails
);
}

Expand Down
Loading