MicroblogRepository.forPage() returns count

pradoslaw · Dec 6, 2023 · 5413c52 · 5413c52
1 parent 7c951c7
commit 5413c52
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/app/Repositories/Contracts/MicroblogRepositoryInterface.php b/app/Repositories/Contracts/MicroblogRepositoryInterface.php
@@ -47,7 +47,7 @@ public function countForUser($userId);
      * @param int $pageNumber
      * @return Microblog[]
      */
-    public function forPage(int $pageSize, int $pageNumber);
+    public function forPage(int $pageSize, int $pageNumber): array;
 
     /**
      * @param int|null $userId

diff --git a/app/Repositories/Eloquent/MicroblogRepository.php b/app/Repositories/Eloquent/MicroblogRepository.php
@@ -33,17 +33,19 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
     /**
      * @inheritDoc
      */
-    public function forPage(int $pageSize, int $pageNumber)
+    public function forPage(int $pageSize, int $pageNumber): array
     {
         return $this->applyCriteria(function () use ($pageSize, $pageNumber) {
-            return $this->model
+            $query = $this->model
                 ->newQuery()
                 ->whereNull('parent_id')
                 ->with(['user', 'assets', 'tags'])
-                ->withCount('comments')
+                ->withCount('comments');
+            $count = $query->count();
+            $paginatedQuery = $query
                 ->limit($pageSize)
-                ->offset(\max(0, $pageNumber - 1) * $pageSize)
-                ->get();
+                ->offset(\max(0, $pageNumber - 1) * $pageSize);
+            return [$paginatedQuery->get(), $count];
         });
     }
 
@@ -64,21 +66,19 @@ public function popular(int $pageSize, int $pageNumber): array
     {
         $this->applyCriteria();
         try {
-            $query = $this
-                ->model
+            $query = $this->model
                 ->newQuery()
                 ->whereNull('parent_id')
                 ->with(['user', 'assets', 'tags'])
                 ->withCount('comments')
                 ->where(fn(Builder $query) => $query
-                    ->where('votes', '>=', 1)
+                    ->where('votes', '>=', 0)
                     ->orWhere('is_sponsored', true));
             $count = $query->count();
-            $fetched = $query
+            $pagedQuery = $query
                 ->limit($pageSize)
-                ->offset(\max(0, $pageNumber - 1) * $pageSize)
-                ->get();
-            return [$fetched, $count];
+                ->offset(\max(0, $pageNumber - 1) * $pageSize);
+            return [$pagedQuery->get(), $count];
         } finally {
             $this->resetModel();
         }

diff --git a/app/Services/Microblogs/Builder.php b/app/Services/Microblogs/Builder.php
@@ -56,11 +56,11 @@ public function withTag(string $tag): self
 
     public function paginate(): LengthAwarePaginator
     {
-        $count = (int)$this->microblog->applyCriteria(fn() => $this->microblog->count());
         $page = LengthAwarePaginator::resolveCurrentPage();
         $this->loadUserScope();
+        [$items, $count] = $this->microblog->forPage(10, $page);
         $paginator = new LengthAwarePaginator(
-            $this->microblog->forPage(10, $page),
+            $items,
             $count,
             10,
             $page,