Skip to content

use getGroupMemberUIDs inside getGroupMembers #236

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
merged 4 commits into from
Jun 3, 2025
Merged

use getGroupMemberUIDs inside getGroupMembers #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6202720
use getGroupMemberUIDs inside getGroupMembers
simonLeary42 Jun 3, 2025
c033a74
copy paste error
simonLeary42 Jun 3, 2025
6c7f3c0
no more cache_arr
simonLeary42 Jun 3, 2025
81f7835
ignore order of list
simonLeary42 Jun 3, 2025
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
44 changes: 18 additions & 26 deletions resources/lib/UnityGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,22 +460,8 @@ public function getRequests()

public function getGroupMembers($ignorecache = false)
{
if (!$ignorecache) {
$cached_val = $this->REDIS->getCache($this->getPIUID(), "members");
if (!is_null($cached_val)) {
$members = $cached_val;
}
}

$updatecache = false;
if (!isset($members)) {
$pi_group = $this->getLDAPPiGroup();
$members = $pi_group->getAttribute("memberuid");
$updatecache = true;
}

$members = $this->getGroupMemberUIDs($ignorecache);
$out = array();
$cache_arr = array();
$owner_uid = $this->getOwner()->getUID();
foreach ($members as $member) {
$user_obj = new UnityUser(
Expand All @@ -487,22 +473,28 @@ public function getGroupMembers($ignorecache = false)
$this->WEBHOOK
);
array_push($out, $user_obj);
array_push($cache_arr, $user_obj->getUID());
}

if (!$ignorecache && $updatecache) {
sort($cache_arr);
$this->REDIS->setCache($this->getPIUID(), "members", $cache_arr);
}

return $out;
}

public function getGroupMemberUIDs()
public function getGroupMemberUIDs($ignorecache = false)
{
$pi_group = $this->getLDAPPiGroup();
$members = $pi_group->getAttribute("memberuid");

if (!$ignorecache) {
$cached_val = $this->REDIS->getCache($this->getPIUID(), "members");
if (!is_null($cached_val)) {
$members = $cached_val;
}
}
$updatecache = false;
if (!isset($members)) {
$pi_group = $this->getLDAPPiGroup();
$members = $pi_group->getAttribute("memberuid");
$updatecache = true;
}
if (!$ignorecache && $updatecache) {
sort($members);
$this->REDIS->setCache($this->getPIUID(), "members", $members);
}
return $members;
}

Expand Down
21 changes: 18 additions & 3 deletions test/functional/PiMemberApproveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ public function testApproveRequest()
$pi = $USER;
$piGroup = $USER->getPIGroup();
$this->assertTrue($piGroup->exists());
$this->assertEquals([$pi->getUID()], $piGroup->getGroupMemberUIDs());
$this->assertTrue(
arraysAreEqualUnOrdered(
[$pi->getUID()],
$piGroup->getGroupMemberUIDs()
)
);
$this->assertEmpty($piGroup->getRequests());
$requestedUser = new UnityUser(self::$requestUid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
try {
Expand All @@ -41,7 +46,12 @@ public function testApproveRequest()
$piGroup->approveUser($requestedUser);
$this->assertEmpty($piGroup->getRequests());

$this->assertEquals([$pi->getUID(), self::$requestUid], $piGroup->getGroupMemberUIDs());
$this->assertTrue(
arraysAreEqualUnOrdered(
[$pi->getUID(), self::$requestUid],
$piGroup->getGroupMemberUIDs()
)
);
$this->assertTrue($piGroup->userExists($requestedUser));
} finally {
$piGroup->removeUser($requestedUser);
Expand All @@ -56,7 +66,12 @@ public function testApproveNonexistentRequest()
$pi = $USER;
$piGroup = $USER->getPIGroup();
$this->assertTrue($piGroup->exists());
$this->assertEquals([$pi->getUID()], $piGroup->getGroupMemberUIDs());
$this->assertTrue(
arraysAreEqualUnOrdered(
[$pi->getUID()],
$piGroup->getGroupMemberUIDs()
)
);
$this->assertEmpty($piGroup->getRequests());

$notRequestedUser = new UnityUser(self::$noRequestUid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
Expand Down
14 changes: 12 additions & 2 deletions test/functional/PiMemberDenyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ public function testDenyRequest()
$pi = $USER;
$piGroup = $USER->getPIGroup();
$this->assertTrue($piGroup->exists());
$this->assertEquals([$pi->getUID()], $piGroup->getGroupMemberUIDs());
$this->assertTrue(
arraysAreEqualUnOrdered(
[$pi->getUID()],
$piGroup->getGroupMemberUIDs()
)
);
$this->assertEmpty($piGroup->getRequests());
$requestedUser = new UnityUser(self::$requestUid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
try {
Expand All @@ -37,7 +42,12 @@ public function testDenyRequest()

$piGroup->denyUser($requestedUser);
$this->assertEmpty($piGroup->getRequests());
$this->assertEquals([$pi->getUID()], $piGroup->getGroupMemberUIDs());
$this->assertTrue(
arraysAreEqualUnOrdered(
[$pi->getUID()],
$piGroup->getGroupMemberUIDs()
)
);
$this->assertFalse($piGroup->userExists($requestedUser));
} finally {
$SQL->removeRequest(self::$requestUid, $piGroup->getPIUID());
Expand Down
6 changes: 6 additions & 0 deletions test/phpunit-bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
mb_convert_encoding("Hello, World!", "UTF-16")
];

function arraysAreEqualUnOrdered(array $a, array $b): bool
{
return (array_diff($a, $b) == [] && array_diff($b, $a) == []);
}


function switchUser(
string $eppn,
string $given_name,
Expand Down