Merge pull request #9 from ntidev/audit-log-repository-performance-fix

Removing count in pagination
ntidev · Jan 14, 2020 · b15fc0a · b15fc0a
2 parents 241a4bb + d7a8522
commit b15fc0a
Showing 1 changed file with 0 additions and 30 deletions.
diff --git a/src/DataDog/AuditBundle/Repository/AuditLogRepository.php b/src/DataDog/AuditBundle/Repository/AuditLogRepository.php
@@ -41,19 +41,6 @@ public function findByOptions($options = array()) {
 
         $qb = $this->createQueryBuilder('a')
             ->join('DataDog\AuditBundle\Entity\Association', 'aa', 'WITH', 'aa = a.source');
-
-        // Totals Count
-        $totalLogsQb = clone $qb;
-        $totalLogsQb->select('COUNT(a.id)');
-        $totalCountQuery = $totalLogsQb->getQuery();
-
-        try {
-            $totalLogsCount = $totalCountQuery->getSingleScalarResult();
-        } catch (NoResultException $e) {
-            $totalLogsCount = 0;
-        } catch (NonUniqueResultException $e) {
-            $totalLogsCount = 0;
-        }
 
         // Apply filters
         foreach($options["filters"] as $field => $search) {
@@ -130,18 +117,6 @@ public function findByOptions($options = array()) {
             $qb->orderBy($options["sortBy"], $options["orderBy"]);
         }
 
-        $countQb = clone $qb;
-        $countQb->select('COUNT(a.id)');
-        $countQuery = $countQb->getQuery();
-
-        try {
-            $logsCount = $countQuery->getSingleScalarResult();
-        } catch (NoResultException $e) {
-            $logsCount = 0;
-        } catch (NonUniqueResultException $e) {
-            $logsCount = 0;
-        }
-
         $resultQuery = $qb->getQuery();
         if(isset($options["_paginate"]) && $options["_paginate"] == true) {
             if(null !== $options["limit"])
@@ -154,12 +129,7 @@ public function findByOptions($options = array()) {
 
         return array(
             "draw" => intval( $options["draw"] ),
-            "recordsTotal" => $totalLogsCount,
-            "recordsFiltered" => $logsCount,
             'data' => $logs,
-            "pagination" => array(
-                "more" => $logsCount > ($options["start"] + $options["limit"]),
-            )
         );
 
     }