centralize "initializePaginatorCollection" for content

Author: cklei-carly

src/Dtos/ContentDto.php

@@ -157,22 +157,7 @@ public function getPaginatedChildren($perPage = 10, $pageName = 'page', $page =
         $currLocale = $this->getLocale();
 
         return $query->paginate($perPage, ['*'], $pageName, $page)
-            ->tap(function ($paginator) {
-                if ($paginator instanceof \Illuminate\Contracts\Pagination\Paginator) {
-
-                    $items = $paginator->getCollection();
-
-                    // for "toDto" method
-                    if ($items instanceof ContentCollection) {
-                        $items = $items->setPaginator($paginator);
-                    }
-
-                    $paginator->setCollection($items);
-
-                }
-
-                return $paginator;
-            })
+            ->tap(fn ($paginator)  => ContentHelper::initializePaginatorCollection($paginator))
             ->toDto($currLocale);
     }
 

src/Helpers/ContentHelper.php

@@ -4,8 +4,11 @@
 
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Resources\Pages\EditRecord;
+use Illuminate\Contracts\Pagination\Paginator;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Pagination\AbstractPaginator;
 use SolutionForest\InspireCms\Base\Filament\Contracts\ContentForm;
+use SolutionForest\InspireCms\Collection\ContentCollection;
 use SolutionForest\InspireCms\Facades\PermissionManifest;
 use SolutionForest\InspireCms\InspireCmsConfig;
 use SolutionForest\InspireCms\Models\Contracts\Content;
@@ -98,6 +101,28 @@ public static function getDtoRequiredRelations(): array
         ];
     }
 
+    /**
+     * @param Paginator|AbstractPaginator $paginator
+     * @return Paginator
+     */
+    public static function initializePaginatorCollection($paginator)
+    {
+        if ($paginator instanceof Paginator) {
+
+            $items = $paginator->getCollection();
+
+            // for "toDto" method
+            if ($items instanceof ContentCollection) {
+                $items = $items->setPaginator($paginator);
+            }
+
+            $paginator->setCollection($items);
+
+        }
+
+        return $paginator;
+    }
+
     /**
      * @return class-string<Model | Content>
      */

src/Services/ContentService.php

@@ -5,9 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
-use SolutionForest\InspireCms\Collection\ContentCollection;
 use SolutionForest\InspireCms\Content\SegmentProviderInterface;
 use SolutionForest\InspireCms\Factories\ContentSegmentFactory;
+use SolutionForest\InspireCms\Helpers\ContentHelper;
 use SolutionForest\InspireCms\InspireCmsConfig;
 use SolutionForest\InspireCms\Models\Contracts\Content;
 use SolutionForest\InspireCms\Models\Scopes\ContentVersionDetailScope;
@@ -95,23 +95,23 @@ public function getPaginatedByIds($ids, $page = 1, $perPage = 10, $pageName = 'p
     {
         return $this->buildFindByIdsQuery($ids, $isWebPage, $isPublished, $withRelations, $sorting, null)
             ->paginate($perPage, ['*'], $pageName, $page)
-            ->tap(fn ($paginator) => $this->initializePaginatorCollection($paginator));
+            ->tap(fn ($paginator)  => ContentHelper::initializePaginatorCollection($paginator));
     }
 
     /** {@inheritDoc} */
     public function getPaginatedByRealPath($path, $page = 1, $perPage = 10, $pageName = 'page', $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [])
     {
         return $this->buildFindByRealPathQuery($path, $isWebPage, $isPublished, $withRelations, $sorting, null)
             ->paginate($perPage, ['*'], $pageName, $page)
-            ->tap(fn ($paginator) => $this->initializePaginatorCollection($paginator));
+            ->tap(fn ($paginator)  => ContentHelper::initializePaginatorCollection($paginator));
     }
 
     /** {@inheritDoc} */
     public function getPaginatedUnderRealPath($path, $page = 1, $perPage = 10, $pageName = 'page', $isWebPage = null, $isPublished = null, $withRelations = [], $sorting = [])
     {
         return $this->buildGetUnderRealPathQuery($path, $isWebPage, $isPublished, $withRelations, $sorting, null)
             ->paginate($perPage, ['*'], $pageName, $page)
-            ->tap(fn ($paginator) => $this->initializePaginatorCollection($paginator));
+            ->tap(fn ($paginator)  => ContentHelper::initializePaginatorCollection($paginator));
     }
 
     /** {@inheritDoc} */
@@ -128,7 +128,7 @@ public function getPaginatedByDocumentType($documentType, $page = 1, $perPage =
         $query = $this->applySortingAndLimit($query, $sorting, null);
 
         return $query->paginate($perPage, ['*'], $pageName, $page)
-            ->tap(fn ($paginator) => $this->initializePaginatorCollection($paginator));
+            ->tap(fn ($paginator)  => ContentHelper::initializePaginatorCollection($paginator));
     }
 
     /** {@inheritDoc} */
@@ -339,22 +339,4 @@ private function buildGetUnderRealPathQuery($path, $isWebPage = null, $isPublish
 
         return $query;
     }
-
-    private function initializePaginatorCollection($paginator)
-    {
-        if ($paginator instanceof \Illuminate\Contracts\Pagination\Paginator) {
-
-            $items = $paginator->getCollection();
-
-            // for "toDto" method
-            if ($items instanceof ContentCollection) {
-                $items = $items->setPaginator($paginator);
-            }
-
-            $paginator->setCollection($items);
-
-        }
-
-        return $paginator;
-    }
 }