pkp#8700 Updated code to make use of the new safeCount() macro

jonasraoni · May 23, 2024 · cf3d30d · cf3d30d
1 parent 9a325ef
commit cf3d30d
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 43 deletions.
diff --git a/classes/announcement/DAO.php b/classes/announcement/DAO.php
@@ -82,8 +82,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->get('a.' . $this->primaryKeyColumn)
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/author/DAO.php b/classes/author/DAO.php
@@ -112,7 +112,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/category/DAO.php b/classes/category/DAO.php
@@ -70,7 +70,7 @@ public function newDataObject(): Category
      */
     public function getCount(Collector $query): int
     {
-        return $query->getQueryBuilder()->count();
+        return $query->getQueryBuilder()->safeCount();
     }
 
     /**

diff --git a/classes/decision/DAO.php b/classes/decision/DAO.php
@@ -76,7 +76,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/doi/DAO.php b/classes/doi/DAO.php
@@ -78,9 +78,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->select('d.' . $this->primaryKeyColumn)
-            ->get()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/doi/Repository.php b/classes/doi/Repository.php
@@ -322,8 +322,8 @@ public function isAssigned(int $doiId, string $pubObjectType): bool
             Repo::doi()::TYPE_PUBLICATION => Repo::publication()
                 ->getCollector()
                 ->filterByDoiIds([$doiId])
-                ->getIds()
-                ->count(),
+                ->getQueryBuilder()
+                ->safeCount() > 0,
             default => false,
         };
     }

diff --git a/classes/emailTemplate/DAO.php b/classes/emailTemplate/DAO.php
@@ -145,8 +145,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->get()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/galley/DAO.php b/classes/galley/DAO.php
@@ -91,9 +91,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->select('g.' . $this->primaryKeyColumn)
-            ->get()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/institution/DAO.php b/classes/institution/DAO.php
@@ -79,8 +79,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->select('i.' . $this->primaryKeyColumn)
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/oai/PKPOAIDAO.php b/classes/oai/PKPOAIDAO.php
@@ -145,7 +145,7 @@ public function getRecord($dataObjectId, $setIds = [])
     public function getRecords($setIds, $from, $until, $set, $offset, $limit, &$total)
     {
         $query = $this->_getRecordsRecordSetQuery($setIds, $from, $until, $set);
-        $total = $query->count();
+        $total = $query->safeCount();
         $results = $query->offset($offset)->limit($limit)->get();
 
         $records = [];
@@ -173,7 +173,7 @@ public function getRecords($setIds, $from, $until, $set, $offset, $limit, &$tota
     public function getIdentifiers($setIds, $from, $until, $set, $offset, $limit, &$total)
     {
         $query = $this->_getRecordsRecordSetQuery($setIds, $from, $until, $set);
-        $total = $query->count();
+        $total = $query->safeCount();
         $results = $query->offset($offset)->limit($limit)->get();
 
         $records = [];

diff --git a/classes/publication/DAO.php b/classes/publication/DAO.php
@@ -112,7 +112,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/section/DAO.php b/classes/section/DAO.php
@@ -53,8 +53,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->select($this->primaryKeyColumn)
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/services/PKPStatsContextService.php b/classes/services/PKPStatsContextService.php
@@ -33,7 +33,7 @@ public function getCount(array $args): int
         unset($args['count']);
         unset($args['offset']);
         $metricsQB = $this->getQueryBuilder($args);
-        return $metricsQB->getContextIds()->get()->count();
+        return $metricsQB->getContextIds()->safeCount();
     }
 
     /**

diff --git a/classes/services/PKPStatsGeoService.php b/classes/services/PKPStatsGeoService.php
@@ -48,7 +48,7 @@ public function getCount(array $args, string $scale): int
             $groupBy = [StatisticsHelper::STATISTICS_DIMENSION_COUNTRY];
         }
 
-        return $metricsQB->getGeoData($groupBy)->get()->count();
+        return $metricsQB->getGeoData($groupBy)->safeCount();
     }
 
     /**

diff --git a/classes/services/PKPStatsPublicationService.php b/classes/services/PKPStatsPublicationService.php
@@ -87,7 +87,7 @@ public function getCount(array $args): int
 
         Hook::call('StatsPublication::getCount::queryBuilder', [&$metricsQB, $args]);
 
-        return $metricsQB->getSubmissionIds()->get()->count();
+        return $metricsQB->getSubmissionIds()->safeCount();
     }
 
     /**
@@ -189,7 +189,7 @@ public function getFilesCount(array $args): int
         $groupBy = [PKPStatisticsHelper::STATISTICS_DIMENSION_SUBMISSION_ID, PKPStatisticsHelper::STATISTICS_DIMENSION_SUBMISSION_FILE_ID];
         $metricsQB = $metricsQB->getSum($groupBy);
 
-        return $metricsQB->get()->count();
+        return $metricsQB->safeCount();
     }
 
     /**

diff --git a/classes/services/queryBuilders/PKPContextQueryBuilder.php b/classes/services/queryBuilders/PKPContextQueryBuilder.php
@@ -93,9 +93,7 @@ public function getCount()
     {
         return $this
             ->getQuery()
-            ->select('c.' . $this->dbIdColumn)
-            ->get()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/services/queryBuilders/PKPStatsContextQueryBuilder.php b/classes/services/queryBuilders/PKPStatsContextQueryBuilder.php
@@ -31,7 +31,7 @@ public function getContextIds(): Builder
     {
         return $this->_getObject()
             ->select([PKPStatisticsHelper::STATISTICS_DIMENSION_CONTEXT_ID])
-            ->distinct();
+            ->groupBy(PKPStatisticsHelper::STATISTICS_DIMENSION_CONTEXT_ID);
     }
 
     /**

diff --git a/classes/services/queryBuilders/PKPStatsEditorialQueryBuilder.php b/classes/services/queryBuilders/PKPStatsEditorialQueryBuilder.php
@@ -110,7 +110,7 @@ public function countSubmissionsReceived()
             $q->where('s.date_submitted', '<=', $this->dateEnd);
         }
 
-        return $q->count();
+        return $q->safeCount();
     }
 
     /**
@@ -184,7 +184,7 @@ public function countByStatus($status)
     {
         return $this->_getObject()
             ->whereIn('s.status', (array) $status)
-            ->count();
+            ->safeCount();
     }
 
     /**
@@ -199,7 +199,7 @@ public function countActiveByStages($stages)
         return $this->_getObject()
             ->where('s.status', '=', PKPSubmission::STATUS_QUEUED)
             ->whereIn('s.stage_id', $stages)
-            ->count();
+            ->safeCount();
     }
 
     /**
@@ -234,7 +234,7 @@ public function countPublished()
             }
         }
 
-        return $q->count();
+        return $q->safeCount();
     }
 
     /**
@@ -458,7 +458,7 @@ public function countImported()
             ->where(DB::raw('CAST(s.date_submitted AS DATE)'), '>', DB::raw('pi.date_published'))
             ->when($this->dateStart, fn (Builder $q) => $q->where('s.date_submitted', '>=', $this->dateStart))
             ->when($this->dateEnd, fn (Builder $q) => $q->where('s.date_submitted', '<=', $this->dateEnd))
-            ->count();
+            ->safeCount();
     }
 
     /**
@@ -473,7 +473,7 @@ public function countInProgress()
             ->where('s.submission_progress', '<>', '')
             ->when($this->dateStart, fn (Builder $q) => $q->where('s.date_submitted', '>=', $this->dateStart))
             ->when($this->dateEnd, fn (Builder $q) => $q->where('s.date_submitted', '<=', $this->dateEnd))
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/services/queryBuilders/PKPStatsPublicationQueryBuilder.php b/classes/services/queryBuilders/PKPStatsPublicationQueryBuilder.php
@@ -111,7 +111,7 @@ public function getSubmissionIds(): Builder
     {
         return $this->_getObject()
             ->select(['metrics_submission.' . PKPStatisticsHelper::STATISTICS_DIMENSION_SUBMISSION_ID])
-            ->distinct();
+            ->groupBy(PKPStatisticsHelper::STATISTICS_DIMENSION_SUBMISSION_ID);
     }
 
     /**

diff --git a/classes/submission/DAO.php b/classes/submission/DAO.php
@@ -91,7 +91,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/submission/reviewRound/ReviewRoundDAO.php b/classes/submission/reviewRound/ReviewRoundDAO.php
@@ -389,7 +389,7 @@ public function getReviewRoundCountBySubmissionId(int $submissionId, ?int $stage
         return DB::table('review_rounds')
             ->where('submission_id', $submissionId)
             ->when(!is_null($stageId), fn ($query) => $query->where('stage_id', $stageId))
-            ->count();
+            ->safeCount();
     }
 }
 

diff --git a/classes/submissionFile/DAO.php b/classes/submissionFile/DAO.php
@@ -122,7 +122,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**
@@ -359,7 +359,7 @@ public function pubIdExists(
                 'sfs.setting_value' => (string) $pubId,
                 'sfs.submission_file_id' => (int) $excludePubObjectId,
                 's.context_id' => (int) $contextId
-            ])->count();
+            ])->safeCount();
         return (bool) $result > 0;
     }
 

diff --git a/classes/user/DAO.php b/classes/user/DAO.php
@@ -138,7 +138,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**

diff --git a/classes/userGroup/DAO.php b/classes/userGroup/DAO.php
@@ -78,7 +78,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->count();
+            ->safeCount();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ public function newDataObject(): Category @@
          */
         public function getCount(Collector $query): int
         {
-            return $query->getQueryBuilder()->count();
+            return $query->getQueryBuilder()->safeCount();
         }
         /**
@@ Expand Down @@