nextcloud · ArtificialOwl · Mar 14, 2022
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -55,6 +55,7 @@
 		],
 		['name' => 'Local#circleJoin', 'url' => '/circles/{circleId}/join', 'verb' => 'PUT'],
 		['name' => 'Local#circleLeave', 'url' => '/circles/{circleId}/leave', 'verb' => 'PUT'],
+		['name' => 'Local#memberships', 'url' => '/memberships', 'verb' => 'GET'],
 
 		['name' => 'Local#editName', 'url' => '/circles/{circleId}/name', 'verb' => 'PUT'],
 		['name' => 'Local#editDescription', 'url' => '/circles/{circleId}/description', 'verb' => 'PUT'],
@@ -93,6 +94,7 @@
 		],
 		['name' => 'Admin#circleJoin', 'url' => '/admin/{emulated}/circles/{circleId}/join', 'verb' => 'PUT'],
 		['name' => 'Admin#circleLeave', 'url' => '/admin/{emulated}/circles/{circleId}/leave', 'verb' => 'PUT'],
+		['name' => 'Admin#memberships', 'url' => '/admin/{emulated}/memberships', 'verb' => 'GET'],
 		['name' => 'Admin#editName', 'url' => '/admin/{emulated}/circles/{circleId}/name', 'verb' => 'PUT'],
 		['name' => 'Admin#editDescription', 'url' => '/admin/{emulated}/circles/{circleId}/description', 'verb' => 'PUT'],
 		['name' => 'Admin#editSetting', 'url' => '/admin/{emulated}/circles/{circleId}/setting', 'verb' => 'PUT'],

diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
@@ -31,8 +31,6 @@
 
 namespace OCA\Circles\Controller;
 
-use OCA\Circles\Tools\Traits\TDeserialize;
-use OCA\Circles\Tools\Traits\TNCLogger;
 use Exception;
 use OCA\Circles\Exceptions\ContactAddressBookNotFoundException;
 use OCA\Circles\Exceptions\ContactFormatException;
@@ -46,12 +44,15 @@
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Probes\BasicProbe;
 use OCA\Circles\Model\Probes\CircleProbe;
+use OCA\Circles\Model\Probes\MemberProbe;
 use OCA\Circles\Service\CircleService;
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\MemberService;
 use OCA\Circles\Service\MembershipService;
 use OCA\Circles\Service\SearchService;
+use OCA\Circles\Tools\Traits\TDeserialize;
+use OCA\Circles\Tools\Traits\TNCLogger;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
@@ -150,11 +151,11 @@ public function create(
 		} catch (Exception $e) {
 			$this->e(
 				$e, [
-					'emulated' => $emulated,
-					'name' => $name,
-					'members' => $personal,
-					'local' => $local
-				]
+					  'emulated' => $emulated,
+					  'name' => $name,
+					  'members' => $personal,
+					  'local' => $local
+				  ]
 			);
 			throw new OcsException($e->getMessage(), $e->getCode());
 		}
@@ -211,11 +212,11 @@ public function memberAdd(string $emulated, string $circleId, string $userId, in
 		} catch (Exception $e) {
 			$this->e(
 				$e, [
-					'emulated' => $emulated,
-					'circleId' => $circleId,
-					'userId' => $userId,
-					'type' => $type
-				]
+					  'emulated' => $emulated,
+					  'circleId' => $circleId,
+					  'userId' => $userId,
+					  'type' => $type
+				  ]
 			);
 			throw new OCSException($e->getMessage(), $e->getCode());
 		}
@@ -263,6 +264,7 @@ public function memberLevel(string $emulated, string $circleId, string $memberId
 	 * @param string $emulated
 	 * @param int $limit
 	 * @param int $offset
+	 *
 	 * @return DataResponse
 	 * @throws OCSException
 	 */
@@ -468,7 +470,12 @@ public function editDescription(string $emulated, string $circleId, string $valu
 	 * @return DataResponse
 	 * @throws OCSException
 	 */
-	public function editSetting(string $emulated, string $circleId, string $setting, ?string $value = null): DataResponse {
+	public function editSetting(
+		string $emulated,
+		string $circleId,
+		string $setting,
+		?string $value = null
+	): DataResponse {
 		try {
 			$this->setLocalFederatedUser($emulated);
 
@@ -482,9 +489,6 @@ public function editSetting(string $emulated, string $circleId, string $setting,
 	}
 
 
-
-
-
 	/**
 	 * @param string $emulated
 	 * @param string $circleId
@@ -528,6 +532,39 @@ public function link(string $emulated, string $circleId, string $singleId): Data
 	}
 
 
+	/**
+	 * @param string $emulated
+	 * @param string $type
+	 * @param int $level
+	 * @param string $details
+	 *
+	 * @return DataResponse
+	 * @throws OCSException
+	 */
+	public function memberships(
+		string $emulated,
+		string $type = 'inherited',
+		int $level = Member::LEVEL_MEMBER,
+		string $details = 'false'
+	): DataResponse {
+		try {
+			$this->setLocalFederatedUser($emulated);
+
+			$probe = new MemberProbe();
+			$probe->setMinimumLevel($level);
+			$probe->initiatorAsDirectMember((strtolower($type) === 'direct'));
+			$probe->detailedMembership(strtolower($details) === 'true');
+
+			$result = $this->memberService->getMemberships($probe);
+
+			return new DataResponse($this->serializeArray($result));
+		} catch (Exception $e) {
+			$this->e($e, ['type' => $type, 'level' => $level]);
+			throw new OCSException($e->getMessage(), $e->getCode());
+		}
+	}
+
+
 	/**
 	 * @param string $emulated
 	 *

diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
@@ -31,8 +31,6 @@
 
 namespace OCA\Circles\Controller;
 
-use OCA\Circles\Tools\Traits\TDeserialize;
-use OCA\Circles\Tools\Traits\TNCLogger;
 use Exception;
 use OCA\Circles\Exceptions\FederatedUserException;
 use OCA\Circles\Exceptions\FederatedUserNotFoundException;
@@ -44,12 +42,15 @@
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Probes\BasicProbe;
 use OCA\Circles\Model\Probes\CircleProbe;
+use OCA\Circles\Model\Probes\MemberProbe;
 use OCA\Circles\Service\CircleService;
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\MemberService;
 use OCA\Circles\Service\MembershipService;
 use OCA\Circles\Service\SearchService;
+use OCA\Circles\Tools\Traits\TDeserialize;
+use OCA\Circles\Tools\Traits\TNCLogger;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
@@ -326,6 +327,39 @@ public function circleLeave(string $circleId): DataResponse {
 	}
 
 
+	/**
+	 * @NoAdminRequired
+	 *
+	 * @param string $type
+	 * @param int $level
+	 * @param bool $details
+	 *
+	 * @return DataResponse
+	 * @throws OCSException
+	 */
+	public function memberships(
+		string $type = 'inherited',
+		int $level = Member::LEVEL_MEMBER,
+		string $details = 'false'
+	): DataResponse {
+		try {
+			$this->setCurrentFederatedUser();
+
+			$probe = new MemberProbe();
+			$probe->setMinimumLevel($level)
+				  ->initiatorAsDirectMember((strtolower($type) === 'direct'))
+				  ->detailedMembership(strtolower($details) === 'true');
+
+			$result = $this->memberService->getMemberships($probe);
+
+			return new DataResponse($this->serializeArray($result));
+		} catch (Exception $e) {
+			$this->e($e, ['type' => $type, 'level' => $level]);
+			throw new OCSException($e->getMessage(), $e->getCode());
+		}
+	}
+
+
 	/**
 	 * @NoAdminRequired
 	 *
@@ -512,7 +546,11 @@ public function editDescription(string $circleId, string $value): DataResponse {
 	 * @return DataResponse
 	 * @throws OCSException
 	 */
-	public function editSetting(string $circleId, string $setting, ?string $value = null): DataResponse {
+	public function editSetting(
+		string $circleId,
+		string $setting,
+		?string $value = null
+	): DataResponse {
 		try {
 			$this->setCurrentFederatedUser();
 

diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php
@@ -163,6 +163,13 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
 			]
 		],
 		self::MEMBERSHIPS => [
+			self::CIRCLE => [
+				self::MEMBERSHIPS => [ // needed ?
+									   self::CONFIG,
+									   self::INITIATOR
+				],
+				self::INITIATOR => [self::INHERITED_BY => [self::MEMBERSHIPS]]
+			],
 			self::CONFIG
 		],
 		self::SHARE => [
@@ -385,6 +392,14 @@ public function limitToShareParent(int $shareId): void {
 	}
 
 
+	/**
+	 * @param int $level
+	 */
+	public function minLevel(int $level): void {
+		$this->gt('level', $level, true);
+	}
+
+
 	/**
 	 * @param Circle $circle
 	 */
@@ -1131,7 +1146,6 @@ public function leftJoinInitiator(
 			)
 		);
 
-
 		$listMembershipCircleAlias = [$aliasMembership];
 		if ($this->getBool('initiatorDirectMember', $options, false)) {
 			try {

diff --git a/lib/Db/MembershipRequest.php b/lib/Db/MembershipRequest.php
@@ -32,8 +32,10 @@
 namespace OCA\Circles\Db;
 
 use OCA\Circles\Exceptions\MembershipNotFoundException;
+use OCA\Circles\Exceptions\RequestBuilderException;
 use OCA\Circles\Model\FederatedUser;
 use OCA\Circles\Model\Membership;
+use OCA\Circles\Model\Probes\MemberProbe;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
@@ -102,12 +104,38 @@ public function getMembership(string $circleId, string $singleId): Membership {
 	}
 
 
+	/**
+	 * @param MemberProbe|null $probe
+	 * @param FederatedUser|null $initiator
+	 *
+	 * @return Membership[]
+	 * @throws RequestBuilderException
+	 */
+	public function getMemberships(FederatedUser $initiator, MemberProbe $probe): array {
+		$qb = $this->getMembershipSelectSql();
+		$qb->limitToSingleId($initiator->getSingleId());
+		$qb->leftJoinCircleConfig(CoreQueryBuilder::MEMBERSHIPS);
+
+		$qb->minLevel($probe->getMinimumLevel());
+		if ($probe->directMemberInitiator()) {
+			$qb->limitInt('inheritance_depth', 1);
+		}
+
+		if ($probe->isDetailedMembership()) {
+			$qb->setOptions([CoreQueryBuilder::MEMBERSHIPS, CoreQueryBuilder::CIRCLE], ['getData' => true]);
+			$qb->leftJoinCircle(CoreQueryBuilder::MEMBERSHIPS, $initiator);
+		}
+
+		return $this->getItemsFromRequest($qb);
+	}
+
+
 	/**
 	 * @param string $singleId
 	 *
 	 * @return Membership[]
 	 */
-	public function getMemberships(string $singleId): array {
+	public function getMembershipsBySingleId(string $singleId): array {
 		$qb = $this->getMembershipSelectSql();
 		$qb->limitToSingleId($singleId);
 		$qb->leftJoinCircleConfig(CoreQueryBuilder::MEMBERSHIPS);

diff --git a/lib/Model/Membership.php b/lib/Model/Membership.php
@@ -74,6 +74,9 @@ class Membership extends ManagedModel implements IDeserializable, IQueryRow, Jso
 	/** @var array */
 	private $inheritanceDetails = [];
 
+	/** @var Circle */
+	private $circle;
+
 
 	/**
 	 * Membership constructor.
@@ -271,6 +274,21 @@ public function getInheritanceDetails(): array {
 	}
 
 
+	public function hasCircle(): bool {
+		return (!is_null($this->circle));
+	}
+
+	public function setCircle(Circle $circle): self {
+		$this->circle = $circle;
+
+		return $this;
+	}
+
+	public function getCircle(): Circle {
+		return $this->circle;
+	}
+
+
 	/**
 	 * @param array $data
 	 *
@@ -315,6 +333,8 @@ public function importFromDatabase(array $data, string $prefix = ''): IQueryRow
 		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
 		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
 
+		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
+
 		return $this;
 	}
 
@@ -338,6 +358,11 @@ public function jsonSerialize(): array {
 			$result['inheritanceDetails'] = $this->getInheritanceDetails();
 		}
 
+		if ($this->hasCircle()) {
+			$result['circle'] = $this->getCircle();
+		}
+
 		return $result;
 	}
+
 }