Add method to base builder to perform the find on the connection and handle the possible exceptions

- The added method will clean up the get and paginate methods and let them rely on the same functionality to prevent repetitive code.
- Also, added the paginate method to the base builder to allow pagination of non-eloquent datasets.

Author: Michael Deck

src/Database/Eloquent/FMEloquentBuilder.php

@@ -9,6 +9,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 class FMEloquentBuilder extends Builder
@@ -194,7 +195,6 @@ public function editRecord()
             $this->model->setModId($this->getModIdFromFmResponse($response));
         }
 
-
         // also update any container fields which have changed
         // Only attempt to write modified container fields
         $modifiedContainerFields = $this->model->getContainersToWrite();
@@ -258,35 +258,12 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
 
         $perPage = $perPage ?: $this->model->getPerPage();
 
-        /** @var FMBaseBuilder $query */
-        $query = $this->toBase()->forPage($page, $perPage);
-
-        // prep items and total as null so we can handle 401 errors
-        $total = null;
-        $results = null;
-
-        // do the query and check for a 401. The query will 401 error if there are no rows which match the request
-        try {
-            $response = $this->getQuery()->getConnection()->performFind($query);
-        } catch (FileMakerDataApiException $e) {
-            if ($e->getCode() == 401) {
-                $results = $this->model->newCollection();
-                $total = 0;
-            } else {
-                throw $e;
-            }
-        }
-
-        // We didn't get a 401 and have received a real response, so parse it for the paginator
-        if ($total === null && $results === null) {
-
-            $total = $response['response']['dataInfo']['foundCount'];
+        $response = $this->forPage($page, $perPage)->getData();
 
-            $records = collect($response['response']['data']);
-
-            // start items as an empty array, but fill if the records
-            $results = $this->model->createModelsFromRecordSet($records);
-        }
+        $total = Arr::get($response, 'response.dataInfo.foundCount', 0);
+        $results = $this->model->createModelsFromRecordSet(
+            collect(Arr::get($response, 'response.data'))
+        );
 
         return $this->paginator($results, $total, $perPage, $page, [
             'path' => Paginator::resolveCurrentPath(),

src/Database/Query/FMBaseBuilder.php

@@ -10,6 +10,7 @@
 use Illuminate\Database\Query\Builder;
 use Illuminate\Http\File;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use InvalidArgumentException;
@@ -408,26 +409,44 @@ public function layoutResponse($name): FMBaseBuilder
      * @throws FileMakerDataApiException
      */
     public function get($columns = ['*'])
+    {
+        $records = Arr::get($this->getData(), 'response.data', []);
+
+        // filter to only requested columns
+        if ($columns !== ['*']) {
+            $records = $records->intersectByKeys(array_flip($columns));
+        }
+
+        return $records;
+    }
+
+    protected function getData()
     {
         $this->computeWhereIns();
 
         // Run the query and catch a 401 error if there are no records found - just return an empty collection
         try {
-            $response = $this->connection->performFind($this);
+            return $this->connection->performFind($this);
         } catch (FileMakerDataApiException $e) {
-            if ($e->getCode() == 401) {
-                return collect([]);
-            } else {
-                throw $e;
-            }
-        }
-        $records = collect($response['response']['data']);
+            throw_if($e->getCode() !== 401, $e);
 
-        // filter to only requested columns
-        if ($columns !== ['*']) {
-            $records = $records->intersectByKeys(array_flip($columns));
+            return [];
         }
-        return $records;
+    }
+
+    public function paginate($perPage = 15, $columns = ['*'], $pageName = 'page', $page = null)
+    {
+        $page = $page ?: Paginator::resolveCurrentPage($pageName);
+
+        $response = $this->forPage($page, $perPage)->getData();
+
+        $total = Arr::get($response, 'response.dataInfo.foundCount', 0);
+        $results = collect(Arr::get($response, 'response.data'));
+
+        return $this->paginator($results, $total, $perPage, $page, [
+            'path' => Paginator::resolveCurrentPath(),
+            'pageName' => $pageName,
+        ]);
     }