remove redis from getters (copilot)

Author: simonLeary42

resources/lib/UnityGroup.php

@@ -308,9 +308,9 @@ public function getRequests(): array
         return $out;
     }
 
-    public function getGroupMembers(bool $ignorecache = false): array
+    public function getGroupMembers(): array
     {
-        $members = $this->getGroupMemberUIDs($ignorecache);
+        $members = $this->getGroupMemberUIDs();
         $out = [];
         foreach ($members as $member) {
             $user_obj = new UnityUser(
@@ -325,23 +325,10 @@ public function getGroupMembers(bool $ignorecache = false): array
         return $out;
     }
 
-    public function getGroupMemberUIDs(bool $ignorecache = false): array
+    public function getGroupMemberUIDs(): array
     {
-        if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->gid, "members");
-            if (!is_null($cached_val)) {
-                $members = $cached_val;
-            }
-        }
-        $updatecache = false;
-        if (!isset($members)) {
-            $members = $this->entry->getAttribute("memberuid");
-            $updatecache = true;
-        }
-        if (!$ignorecache && $updatecache) {
-            sort($members);
-            $this->REDIS->setCache($this->gid, "members", $members);
-        }
+        $members = $this->entry->getAttribute("memberuid");
+        sort($members);
         return $members;
     }
 

resources/lib/UnityLDAP.php

@@ -193,31 +193,14 @@ public function getQualifiedUsersUIDs(): array
         return $this->qualifiedUserGroup->getAttribute("memberuid");
     }
 
-    public function getQualifiedUsers(
-        $UnitySQL,
-        $UnityMailer,
-        $UnityWebhook,
-        $ignorecache = false,
-    ): array {
+    public function getQualifiedUsers($UnitySQL, $UnityMailer, $UnityWebhook): array
+    {
         $out = [];
 
-        if (!$ignorecache) {
-            $qualifiedUsers = $UnityRedis->getCache("sorted_qualified_users", "");
-            if (!is_null($qualifiedUsers)) {
-                foreach ($qualifiedUsers as $user) {
-                    array_push(
-                        $out,
-                        new UnityUser($user, $this, $UnitySQL, $UnityMailer, $UnityWebhook),
-                    );
-                }
-                return $out;
-            }
-        }
-
         $qualifiedUsers = $this->getQualifiedUsersUIDs();
         sort($qualifiedUsers);
         foreach ($qualifiedUsers as $user) {
-            $params = [$user, $this, $UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook];
+            $params = [$user, $this, $UnitySQL, $UnityMailer, $UnityWebhook];
             array_push($out, new UnityUser(...$params));
         }
         return $out;
@@ -246,22 +229,9 @@ public function getAllPIGroups(
         UnitySQL $UnitySQL,
         UnityMailer $UnityMailer,
         UnityWebhook $UnityWebhook,
-        bool $ignorecache = false,
     ) {
         $out = [];
 
-        if (!$ignorecache) {
-            $groups = $UnityRedis->getCache("sorted_groups", "");
-            if (!is_null($groups)) {
-                foreach ($groups as $group) {
-                    $params = [$group, $this, $UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook];
-                    array_push($out, new UnityGroup(...$params));
-                }
-
-                return $out;
-            }
-        }
-
         $pi_groups = $this->pi_groupOU->getChildren(true);
 
         foreach ($pi_groups as $pi_group) {
@@ -362,27 +332,10 @@ public function getQualifiedUID2PIGIDs(): array
         return $uid2pigids;
     }
 
-    public function getAllOrgGroups(
-        $UnitySQL,
-        $UnityMailer,
-        $UnityWebhook,
-        $ignorecache = false,
-    ): array {
+    public function getAllOrgGroups($UnitySQL, $UnityMailer, $UnityWebhook): array
+    {
         $out = [];
 
-        if (!$ignorecache) {
-            $orgs = $UnityRedis->getCache("sorted_orgs", "");
-            if (!is_null($orgs)) {
-                foreach ($orgs as $org) {
-                    array_push(
-                        $out,
-                        new UnityOrg($org, $this, $UnitySQL, $UnityMailer, $UnityWebhook),
-                    );
-                }
-                return $out;
-            }
-        }
-
         $org_groups = $this->org_groupOU->getChildren(true);
 
         foreach ($org_groups as $org_group) {

resources/lib/UnityOrg.php

@@ -43,14 +43,14 @@ public function exists(): bool
         return $this->entry->exists();
     }
 
-    public function inOrg(UnityUser $user, bool $ignorecache = false): bool
+    public function inOrg(UnityUser $user): bool
     {
-        return in_array($user->uid, $this->getOrgMemberUIDs($ignorecache));
+        return in_array($user->uid, $this->getOrgMemberUIDs());
     }
 
-    public function getOrgMembers(bool $ignorecache = false): array
+    public function getOrgMembers(): array
     {
-        $members = $this->getOrgMemberUIDs($ignorecache);
+        $members = $this->getOrgMemberUIDs();
         $out = [];
         foreach ($members as $member) {
             $user_obj = new UnityUser(
@@ -65,23 +65,10 @@ public function getOrgMembers(bool $ignorecache = false): array
         return $out;
     }
 
-    public function getOrgMemberUIDs(bool $ignorecache = false): array
+    public function getOrgMemberUIDs(): array
     {
-        if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->gid, "members");
-            if (!is_null($cached_val)) {
-                $members = $cached_val;
-            }
-        }
-        $updatecache = false;
-        if (!isset($members)) {
-            $members = $this->entry->getAttribute("memberuid");
-            $updatecache = true;
-        }
-        if (!$ignorecache && $updatecache) {
-            sort($members);
-            $this->REDIS->setCache($this->gid, "members", $members);
-        }
+        $members = $this->entry->getAttribute("memberuid");
+        sort($members);
         return $members;
     }