Attempt to speed up queries in manageaccount activity, a=chris

Chris Pollett [2020-06-23 23:Jun:rd]
Attempt to speed up queries in manageaccount activity, a=chris
Filename
src/controllers/components/AccountaccessComponent.php
src/controllers/components/SocialComponent.php
src/models/GroupModel.php
diff --git a/src/controllers/components/AccountaccessComponent.php b/src/controllers/components/AccountaccessComponent.php
index 0b9445da0..fe58f951a 100644
--- a/src/controllers/components/AccountaccessComponent.php
+++ b/src/controllers/components/AccountaccessComponent.php
@@ -185,19 +185,17 @@ class AccountaccessComponent extends Component
             }
             $data['GROUPS'][$i] = $tmp_group;
             $search_array = [
-                ["group_id", "=", $data['GROUPS'][$i]['GROUP_ID'], ""],
+                ["group_id", "=", $group_id, ""],
                 ["pub_date", "", "", "DESC"]
                 ];
             $item = $group_model->getGroupItems(0, 1,
                 $search_array, $user_id);
             $data['GROUPS'][$i]['NUM_POSTS'] =
-                $group_model->getGroupItemCount($search_array, $user_id);
+                $group_model->getGroupPostCount($group_id);
             $data['GROUPS'][$i]['NUM_THREADS'] =
-                $group_model->getGroupItemCount($search_array, $user_id,
-                $data['GROUPS'][$i]['GROUP_ID']);
+                $group_model->getGroupThreadCount($group_id);
             $data['GROUPS'][$i]['NUM_PAGES'] =
-                $group_model->getGroupPageCount(
-                $data['GROUPS'][$i]['GROUP_ID']);
+                $group_model->getGroupPageCount($group_id);
             if (isset($item[0]['TITLE'])) {
                 $data['GROUPS'][$i]["ITEM_TITLE"] = $item[0]['TITLE'];
                 $data['GROUPS'][$i]["THREAD_ID"] = $item[0]['PARENT_ID'];
diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php
index c0b5f60ad..58783282b 100644
--- a/src/controllers/components/SocialComponent.php
+++ b/src/controllers/components/SocialComponent.php
@@ -2264,14 +2264,15 @@ class SocialComponent extends Component implements CrawlConstants
                 $data['NUM_GROUPS'], [], [$user_id, false]);
         $num_shown = count($data['GROUPS']);
         for ($i = 0; $i < $num_shown; $i++) {
+            $group_id = $data['GROUPS'][$i]['GROUP_ID'];
             $search_array = [
-                ["group_id", "=", $data['GROUPS'][$i]['GROUP_ID'], ""],
+                ["group_id", "=", $group_id, ""],
                 ["pub_date", "", "", "DESC"] ];
             $item = $group_model->getGroupItems(0, 1, $search_array, $user_id);
-            $data['GROUPS'][$i]['NUM_POSTS'] = $group_model->getGroupItemCount(
-                $search_array, $user_id);
-            $data['GROUPS'][$i]['NUM_THREADS']=$group_model->getGroupItemCount(
-                $search_array, $user_id, $data['GROUPS'][$i]['GROUP_ID']);
+            $data['GROUPS'][$i]['NUM_POSTS'] = $group_model->getGroupPostCount(
+                $group_id);
+            $data['GROUPS'][$i]['NUM_THREADS']=
+                $group_model->getGroupThreadCount($group_id);
             $data['GROUPS'][$i]['NUM_PAGES'] = $group_model->getGroupPageCount(
                 $data['GROUPS'][$i]['GROUP_ID']);
             if (isset($item[0]['TITLE'])) {
diff --git a/src/models/GroupModel.php b/src/models/GroupModel.php
index f6b122f0c..ae3d2f0f6 100644
--- a/src/models/GroupModel.php
+++ b/src/models/GroupModel.php
@@ -1049,7 +1049,7 @@ class GroupModel extends Model implements MediaConstants
      * @param int $user_id who is making this request to determine which
      * @param int $for_group if this value is set it is a assumed
      *     that group_items are being returned for only one group
-     *     and that the count desrired is over the number of threads in that
+     *     and that the count desired is over the number of threads in that
      *     group
      * @return int number of items matching the search criteria for the
      *     given user_id
@@ -1106,6 +1106,36 @@ class GroupModel extends Model implements MediaConstants
         $row = $db->fetchArray($result);
         return $row['NUM'] ?? false;
     }
+    /**
+     *
+     */
+    public function getGroupThreadCount($group_id)
+    {
+        $db = $this->db;
+        $sql = "SELECT COUNT(DISTINCT GI.PARENT_ID) AS NUM FROM GROUP_ITEM GI
+            WHERE GI.GROUP_ID = ?";
+        $result = $db->execute($sql, [$group_id]);
+        if (!$result) {
+            return 0;
+        }
+        $row = $db->fetchArray($result);
+        return $row['NUM'] ?? 0;
+    }
+    /**
+     *
+     */
+    public function getGroupPostCount($group_id)
+    {
+        $db = $this->db;
+        $sql = "SELECT COUNT(DISTINCT GI.ID) AS NUM FROM GROUP_ITEM GI
+            WHERE GI.GROUP_ID = ?";
+        $result = $db->execute($sql, [$group_id]);
+        if (!$result) {
+            return 0;
+        }
+        $row = $db->fetchArray($result);
+        return $row['NUM'] ?? 0;
+    }
     /**
      * Deletes Group Items which are older than the expiry date for posts
      * for that group
ViewGit