use getGroupMemberUIDs inside getGroupMembers (#236)

* use getGroupMemberUIDs inside getGroupMembers

* copy paste error

* no more cache_arr

* ignore order of list

Author: simonLeary42

resources/lib/UnityGroup.php

@@ -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(
@@ -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;
     }
 

test/functional/PiMemberApproveTest.php

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

test/functional/PiMemberDenyTest.php

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

test/phpunit-bootstrap.php

@@ -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,