occ should get full details

Signed-off-by: Maxence Lange <[email protected]>

Author: ArtificialOwl

lib/Command/MembersList.php

@@ -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)) {

lib/Controller/RemoteController.php

@@ -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) {

lib/Db/CoreQueryBuilder.php

@@ -740,6 +740,32 @@ public function leftJoinCircle(
 		$this->leftJoinOwner($aliasCircle);
 	}
 
+	/**
+	 * @param string $aliasMember
+	 *
+	 * @throws RequestBuilderException
+	 */
+	public function leftJoinInvitedBy(string $aliasMember): void {
+		if ($this->getType() !== QueryBuilder::SELECT) {
+			return;
+		}
+
+		try {
+			$aliasInvitedBy = $this->generateAlias($aliasMember, self::INVITED_BY);
+		} catch (RequestBuilderException $e) {
+			return;
+		}
+
+		$expr = $this->expr();
+		$this->generateCircleSelectAlias($aliasInvitedBy)
+			 ->leftJoin(
+				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
+				 $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
+			 );
+
+		$this->leftJoinOwner($aliasInvitedBy);
+	}
+
 	/**
 	 * @param string $aliasMember
 	 * @param IFederatedUser|null $initiator

lib/Db/MemberRequest.php

@@ -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();
@@ -218,6 +219,11 @@ public function getMembers(
 			)
 		);
 
+		if ($fullDetails) {
+			$qb->leftJoinCircle(CoreQueryBuilder::MEMBER, $initiator);
+			$qb->leftJoinInvitedBy(CoreQueryBuilder::MEMBER);
+		}
+
 		if ($probe->hasFilterRemoteInstance()) {
 			$aliasCircle = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::CIRCLE);
 			$qb->limitToRemoteInstance(

lib/Service/MemberService.php

@@ -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();
@@ -164,7 +164,8 @@ public function getMembers(string $circleId): array {
 		return $this->memberRequest->getMembers(
 			$circleId,
 			$this->federatedUserService->getCurrentUser(),
-			$probe
+			$probe,
+			fullDetails: $fullDetails
 		);
 	}