pkp#8700 Dropped safeCount() workaround in favor of getCountForPagina…

…tion() (cherry picked from commit 5539710)
jonasraoni · May 23, 2024 · 5652fde · 5652fde
1 parent 85f70f7
commit 5652fde
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 79 deletions.
diff --git a/classes/announcement/DAO.php b/classes/announcement/DAO.php
@@ -83,7 +83,7 @@ public function getCount(Collector $query): int
     {
         return $query
             ->getQueryBuilder()
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**

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

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

diff --git a/classes/core/PKPContainer.php b/classes/core/PKPContainer.php
@@ -30,7 +30,6 @@
 use Illuminate\Queue\Failed\DatabaseFailedJobProvider;
 use Illuminate\Support\Facades\Facade;
 use PKP\config\Config;
-use PKP\db\DatabaseServiceProvider;
 use PKP\i18n\LocaleServiceProvider;
 use PKP\core\PKPUserProvider;
 use PKP\proxy\ProxyParser;
@@ -144,7 +143,6 @@ public function registerConfiguredProviders()
     {
         // Load main settings, this should be done before registering services, e.g., it's used by Database Service
         $this->loadConfiguration();
-        $this->register(new DatabaseServiceProvider($this));
 
         $this->register(new \PKP\core\PKPAuthServiceProvider($this));
         $this->register(new \Illuminate\Cookie\CookieServiceProvider($this));

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

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

diff --git a/classes/doi/Repository.php b/classes/doi/Repository.php
@@ -327,7 +327,7 @@ public function isAssigned(int $doiId, string $pubObjectType): bool
                 ->getCollector()
                 ->filterByDoiIds([$doiId])
                 ->getQueryBuilder()
-                ->safeCount() > 0,
+                ->getCountForPagination() > 0,
             default => false,
         };
     }

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

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

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

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->safeCount();
+        $total = $query->getCountForPagination();
         $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->safeCount();
+        $total = $query->getCountForPagination();
         $results = $query->offset($offset)->limit($limit)->get();
 
         $records = [];

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

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

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()->safeCount();
+        return $metricsQB->getContextIds()->getCountForPagination();
     }
 
     /**

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)->safeCount();
+        return $metricsQB->getGeoData($groupBy)->getCountForPagination();
     }
 
     /**

diff --git a/classes/services/PKPStatsPublicationService.php b/classes/services/PKPStatsPublicationService.php
@@ -89,7 +89,7 @@ public function getCount(array $args): int
 
         Hook::call('StatsPublication::getCount::queryBuilder', [&$metricsQB, $args]);
 
-        return $metricsQB->getSubmissionIds()->safeCount();
+        return $metricsQB->getSubmissionIds()->getCountForPagination();
     }
 
     /**
@@ -197,7 +197,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->safeCount();
+        return $metricsQB->getCountForPagination();
     }
 
     /**

diff --git a/classes/services/queryBuilders/PKPContextQueryBuilder.php b/classes/services/queryBuilders/PKPContextQueryBuilder.php
@@ -95,7 +95,7 @@ public function getCount()
     {
         return $this
             ->getQuery()
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**

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->safeCount();
+        return $q->getCountForPagination();
     }
 
     /**
@@ -184,7 +184,7 @@ public function countByStatus($status)
     {
         return $this->_getObject()
             ->whereIn('s.status', (array) $status)
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**
@@ -199,7 +199,7 @@ public function countActiveByStages($stages)
         return $this->_getObject()
             ->where('s.status', '=', PKPSubmission::STATUS_QUEUED)
             ->whereIn('s.stage_id', $stages)
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**
@@ -234,7 +234,7 @@ public function countPublished()
             }
         }
 
-        return $q->safeCount();
+        return $q->getCountForPagination();
     }
 
     /**
@@ -460,7 +460,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))
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**
@@ -475,7 +475,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))
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**

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()
-            ->safeCount();
+            ->getCountForPagination();
     }
 
     /**

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))
-            ->safeCount();
+            ->getCountForPagination();
     }
 }
 

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

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

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