Optimize user state for users in added groups

lib/Controller/ConnectedGroupController.php

@@ -77,6 +77,7 @@ public function addGroup(int $spaceId, string $gid): JSONResponse {
 		}
 
 		$space = $this->spaceMapper->find($spaceId);
+		$spaceArray = $this->spaceManager->get($spaceId);
 
 		$this->folderHelper->addApplicableGroup(
 			$space->getGroupfolderId(),

lib/Db/GroupFoldersGroupsMapper.php

@@ -26,6 +26,7 @@
 
 use OCP\AppFramework\Db\QBMapper;
 use OCP\IDBConnection;
+use PDO;
 
 class GroupFoldersGroupsMapper extends QBMapper {
 	protected $db;
@@ -124,22 +125,26 @@ public function findAddedGroups($groupfolderId) : array|false {
 		return empty($result) ? false : $result;
 	}
 
-	public function isUserConnectedGroup(string $uid, string $gid): mixed {
+	/**
+	 * Return all userids from DB user group
+	 *
+	 * @param string $gid
+	 * @return array userids
+	 */
+	public function getStrictSpaceUserIds(string $gid): array {
+
 		$qb = $this->db->getQueryBuilder();
 
 		$query = $qb
-			->select('*')
+			->select('uid')
 			->from('group_user')
-			->where('uid = :uid')
-			->andWhere('gid = :gid')
+			->where('gid = :gid')
 			->setParameters([
-				'uid' => $uid,
 				'gid' => $gid
 			])
 		;
 
 		$res = $query->executeQuery();
-
-		return $res->fetch();
+		return $res->fetchAll(PDO::FETCH_COLUMN);
 	}
 }

lib/Service/Group/ConnectedGroupsService.php

@@ -37,6 +37,7 @@ class ConnectedGroupsService {
 
 	private ?array $linkedSpaceGroups = null;
 	private array $linkedGroupsWSGroups = [];
+	private array $strictSpaceUsers = [];
 
 	public function __construct(
 		private IGroupManager $groupManager,
@@ -162,43 +163,14 @@ public function add(IGroup $group, Space $space): bool {
 		return true;
 	}
 
-	public function isUserConnectedGroup(string $uid, array $space): bool {
-
-		$userIsInConnectedGroup = $this->isUserMemberOfConnectedGroup($uid, $space);
-		$userIsInUserGroup = $this->isUserMemberOfUserGroup($uid, $space);
-
-		return $userIsInConnectedGroup && $userIsInUserGroup;
-	}
-
-	private function isUserMemberOfConnectedGroup(string $uid, array $space): bool {
-		if (isset($space['groupfolder_id'])) {
-			$groupfolderId = $space['groupfolder_id'];
-		} elseif (isset($space['groupfolderId'])) {
-			$groupfolderId = $space['groupfolderId'];
-		} else {
-			$groupfolderId = 0;
-		}
-
-		$connectedGroups = $groupfolderId ? $this->mapper->findAddedGroups($groupfolderId) : false;
-
-		if ($connectedGroups === false) {
-			return false;
-		}
-
-		$user = $this->userManager->get($uid);
-		$groups = array_map(fn ($group) => $this->groupManager->get($group->getGid()), $connectedGroups);
-
-		foreach ($groups as $group) {
-			if ($group->inGroup($user)) {
-				return true;
-			}
+	/**
+	 * @param string $uid user UID
+	 * @param string $spaceUserGid space-u group
+	 */
+	public function isStrictSpaceUser(string $uid, string $spaceUserGid) {
+		if (!isset($this->strictSpaceUsers[$spaceUserGid])) {
+			$this->strictSpaceUsers[$spaceUserGid] = $this->mapper->getStrictSpaceUserIds($spaceUserGid);
 		}
-
-		return false;
-	}
-
-	private function isUserMemberOfUserGroup(string $uid, array $space): bool {
-		$userGroup = $this->userGroup->get($space['id']);
-		return empty($this->mapper->isUserConnectedGroup($uid, $userGroup));
+		return in_array($uid, $this->strictSpaceUsers[$spaceUserGid]);
 	}
 }

lib/Service/User/UserFormatter.php

@@ -47,6 +47,7 @@ public function __construct(
 	 */
 	public function formatUsers(array $users, array $groupfolder, string $spaceId): array {
 		$groupWorkspaceManager = $this->groupsWorkspace->getWorkspaceManagerGroup($spaceId);
+		$spaceUserGid = UserGroup::get($spaceId);
 
 		$usersFormatted = [];
 		foreach ($users as $user) {
@@ -56,15 +57,15 @@ public function formatUsers(array $users, array $groupfolder, string $spaceId):
 				$role = Roles::User;
 			}
 
-			$isConnected = $this->connectedGroupsService->isUserConnectedGroup($user->getUID(), $groupfolder);
+			$isStrictSpaceUser = $this->connectedGroupsService->isStrictSpaceUser($user->getUID(), $spaceUserGid);
 
 			$usersFormatted[$user->getUID()] = [
 				'uid' => $user->getUID(),
 				'name' => $user->getDisplayName(),
 				'email' => $user->getEmailAddress(),
 				'subtitle' => $user->getEmailAddress(),
 				'groups' => $this->groupsWorkspace->getGroupsUserFromGroupfolder($user, $groupfolder, $spaceId),
-				'is_connected' => $isConnected,
+				'is_connected' => !$isStrictSpaceUser,
 				'profile' => $this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $user->getUID()]),
 				'role' => $role
 			];

lib/Service/UserService.php

@@ -73,7 +73,7 @@ public function formatUser(IUser $user, array $space, string $role): ?array {
 		$groups = [];
 
 		if (!isset($space['groups'])) {
-			throw new \Exception('The "groups" key is not presetn');
+			throw new \Exception('The "groups" key is not present');
 		}
 
 		if (!is_array($space['groups'])) {
@@ -86,7 +86,7 @@ public function formatUser(IUser $user, array $space, string $role): ?array {
 			}
 		}
 
-		$isConnected = $this->connectedGroups->isUserConnectedGroup($user->getUID(), $space);
+		$isStrictSpaceUser = $this->connectedGroups->isStrictSpaceUser($user->getUID(), UserGroup::get($space['id']));
 
 		return [
 			'uid' => $user->getUID(),
@@ -95,7 +95,7 @@ public function formatUser(IUser $user, array $space, string $role): ?array {
 			'subtitle' => $user->getEmailAddress(),
 			'groups' => $groups,
 			'role' => $role,
-			'is_connected' => $isConnected,
+			'is_connected' => !$isStrictSpaceUser,
 			'profile' => $this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $user->getUID()])
 		];
 	}

lib/Users/UserFormatter.php

@@ -34,13 +34,15 @@ public function formatUser(IUser $user, array $space, string $role): array {
 			}
 		}
 
+		$spaceUserGid = UserGroup::get($space['id']);
+
 		return [
 			'uid' => $user->getUID(),
 			'name' => $user->getDisplayName(),
 			'email' => $user->getEmailAddress(),
 			'subtitle' => $user->getEmailAddress(),
 			'groups' => $groups,
-			'is_connected' => $this->connectedGroupsService->isUserConnectedGroup($user->getUID(), $space),
+			'is_connected' => !$this->connectedGroupsService->isStrictSpaceUser($user->getUID(), $spaceUserGid),
 			'profile' => $this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $user->getUID()]),
 			'role' => $role
 		];