Merge pull request #42 from feyobekius/master

add possibility to fetch more than 60 results.
picqer · Feb 2, 2016 · b2abf49 · b2abf49
2 parents cdda5cb + 6028662
commit b2abf49
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/Picqer/Financials/Exact/Connection.php b/src/Picqer/Financials/Exact/Connection.php
@@ -84,6 +84,12 @@ class Connection
      */
     protected $middleWares = [];
 
+
+    /**
+    * @var
+    */
+    public $nextUrl = null;
+
     /**
      * @return Client
      */
@@ -173,7 +179,7 @@ private function createRequest($method = 'GET', $endpoint, $body = null, array $
      */
     public function get($url, array $params = [])
     {
-        $url = $this->formatUrl($url, $url !== 'current/Me');
+        $url = $this->formatUrl($url, $url !== 'current/Me', $url == $this->nextUrl);
 
         try {
             $request = $this->createRequest('GET', $url, null, $params);
@@ -343,6 +349,12 @@ private function parseResponse(Response $response)
                     if (count($json['d']['results']) == 1) {
                         return $json['d']['results'][0];
                     }
+                    if (array_key_exists('__next', $json['d'])) {
+                        $this->nextUrl = $json['d']['__next'];
+                    }
+                    else {
+                        $this->nextUrl = null;
+                    }
 
                     return $json['d']['results'];
                 }
@@ -462,8 +474,12 @@ private function tokenHasExpired()
         return $this->tokenExpires <= time();
     }
 
-    private function formatUrl($endPoint, $includeDivision = true)
+    private function formatUrl($endPoint, $includeDivision = true, $formatNextUrl = false)
     {
+        if ($formatNextUrl) {
+            return $endPoint;
+        }
+
         if ($includeDivision) {
             return implode('/', [
                 $this->getApiUrl(),
@@ -581,5 +597,3 @@ public function setTokenUrl($tokenUrl)
         $this->tokenUrl = $tokenUrl;
     }
 }
-
-
diff --git a/src/Picqer/Financials/Exact/Query/Findable.php b/src/Picqer/Financials/Exact/Query/Findable.php
@@ -63,6 +63,11 @@ public function collectionFromResult($result)
             $result = [ $result ];
         }
 
+        while ($this->connection()->nextUrl !== null)
+        {
+            $nextResult = $this->connection()->get($this->connection()->nextUrl);
+            $result = array_merge($result, $nextResult);
+        }
         $collection = [ ];
         foreach ($result as $r) {
             $collection[] = new self($this->connection(), $r);