refactor: Enhance pagination methods in CustomBuilder and improve code formatting in EloquentDatabase

Author: rcalicdan

src/Database/CustomBuilder.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Pagination\Paginator;
+use Illuminate\Pagination\CursorPaginator;
 
 class CustomBuilder extends Builder
 {
@@ -16,12 +18,58 @@ class CustomBuilder extends Builder
     public function paginateWithQueryString($perPage = 15)
     {
         $paginator = $this->paginate($perPage);
+        $this->appendQueryString($paginator);
+
+        return $paginator;
+    }
+
+    /**
+     * Simple paginate the given query and append query string parameters.
+     *
+     * @param  int  $perPage
+     * @return Paginator
+     */
+    public function simplePaginateWithQueryString($perPage = 15)
+    {
+        $paginator = $this->simplePaginate($perPage);
+        $this->appendQueryString($paginator);
+
+        return $paginator;
+    }
+
+    /**
+     * Cursor paginate the given query and append query string parameters.
+     *
+     * @param  int  $perPage
+     * @param  array  $columns
+     * @param  string  $cursorName
+     * @param  string|null  $cursor
+     * @return CursorPaginator
+     */
+    public function cursorPaginateWithQueryString($perPage = 15, $columns = ['*'], $cursorName = 'cursor', $cursor = null)
+    {
+        $paginator = $this->cursorPaginate($perPage, $columns, $cursorName, $cursor);
+        $this->appendQueryString($paginator);
+
+        return $paginator;
+    }
+
+    /**
+     * Append query string parameters to the paginator.
+     *
+     * @param  LengthAwarePaginator|Paginator|CursorPaginator  $paginator
+     * @return void
+     */
+    protected function appendQueryString($paginator)
+    {
         $request = \Config\Services::request();
         $paginator->setPath(base_url($request->getPath()));
+        
         $queryParams = $request->getGet();
+    
         unset($queryParams['page']);
+        unset($queryParams['cursor']);
+        
         $paginator->appends($queryParams);
-
-        return $paginator;
     }
-}
+}

src/Database/EloquentDatabase.php

@@ -22,7 +22,7 @@
  * Manages the setup and configuration of Laravel's Eloquent ORM in a CodeIgniter 4 app.
  * Optimized for performance with caching and lazy loading.
  */
-final class EloquentDatabase
+class EloquentDatabase
 {
     protected Container $container;
     protected Capsule $capsule;
@@ -462,7 +462,7 @@ protected function getEloquentModels(): array
         }
 
         // Try APCu cache first (production only)
-        $cacheKey = 'eloquent_models_'.md5(APPPATH.filemtime(APPPATH.'Models'));
+        $cacheKey = 'eloquent_models_' . md5(APPPATH . filemtime(APPPATH . 'Models'));
         if (function_exists('apcu_fetch') && ENVIRONMENT === 'production') {
             $cached = apcu_fetch($cacheKey);
             if ($cached !== false) {
@@ -485,13 +485,13 @@ protected function getEloquentModels(): array
      */
     private function discoverModels(): array
     {
-        $modelPath = APPPATH.'Models/';
+        $modelPath = APPPATH . 'Models/';
         if (! is_dir($modelPath)) {
             return [];
         }
 
         // Use glob for better performance than DirectoryIterator
-        $files = glob($modelPath.'*.php');
+        $files = glob($modelPath . '*.php');
         if ($files === false) {
             return [];
         }
@@ -568,19 +568,19 @@ protected function registerConfigService(): void
 
     protected function registerDatabaseService(): void
     {
-        $this->container->singleton('db', fn () => $this->capsule->getDatabaseManager());
+        $this->container->singleton('db', fn() => $this->capsule->getDatabaseManager());
     }
 
     protected function registerHashService(): void
     {
-        $this->container->singleton('hash', fn ($app) => new HashManager($app));
+        $this->container->singleton('hash', fn($app) => new HashManager($app));
     }
 
     protected function registerPaginationRenderer(): void
     {
         $this->container->singleton(
             PaginationRenderer::class,
-            fn () => new PaginationRenderer
+            fn() => new PaginationRenderer
         );
         $this->container->alias(PaginationRenderer::class, 'paginator.renderer');
     }
@@ -601,7 +601,7 @@ protected function configurePagination(): void
 
         $container = $this->container;
         Paginator::viewFactoryResolver(
-            fn () => $container->get('paginator.renderer')
+            fn() => $container->get('paginator.renderer')
         );
 
         Paginator::currentPageResolver(
@@ -616,8 +616,8 @@ function ($pageName = 'page') use ($request) {
             }
         );
 
-        Paginator::currentPathResolver(fn () => current_url());
-        Paginator::queryStringResolver(fn () => $uri->getQuery());
+        Paginator::currentPathResolver(fn() => current_url());
+        Paginator::queryStringResolver(fn() => $uri->getQuery());
 
         CursorPaginator::currentCursorResolver(
             function ($cursorName = 'cursor') use ($request) {
@@ -679,4 +679,4 @@ public function __destruct()
     {
         unset($this->sqliteHandler);
     }
-}
+}