Merge pull request #121 from keboola/CM-765-ondra

profiles paging

Author: ondrajodas

src/GoogleAnalytics/Client.php

@@ -99,11 +99,22 @@ public function getWebProperties(): array
         return $body['items'] ?? [];
     }
 
-    public function getAccountProfiles(): array
+    public function getAccountProfiles(int $pageSize = self::PAGE_SIZE): array
     {
-        $response = $this->api->request(self::ACCOUNT_PROFILES_URL);
-        $body = json_decode($response->getBody()->getContents(), true);
-        return $body['items'] ?? [];
+        $items = [];
+        do {
+            $url = sprintf('%s?max-results=%d', self::ACCOUNT_PROFILES_URL, $pageSize);
+            if (isset($body['nextLink'])) {
+                $url = $body['nextLink'];
+            }
+            $response = $this->api->request($url);
+            $body = json_decode($response->getBody()->getContents(), true);
+            if (isset($body['items'])) {
+                $items[] = $body['items'];
+            }
+        } while (isset($body['nextLink']));
+
+        return array_merge([], ...$items);
     }
 
     public function getCustomMetrics(int $accountId, string $webPropertyId): array

tests/Keboola/GoogleAnalyticsExtractor/Extractor/ExtractorTest.php

@@ -199,7 +199,7 @@ public function testGetProfilesProperties(): void
             ->with($this->logicalOr(
                 sprintf('%s?pageSize=%d', Client::ACCOUNT_PROPERTIES_URL, Client::PAGE_SIZE),
                 Client::ACCOUNT_WEB_PROPERTIES_URL,
-                Client::ACCOUNT_PROFILES_URL,
+                sprintf('%s?max-results=%d', Client::ACCOUNT_PROFILES_URL, Client::PAGE_SIZE),
                 Client::ACCOUNTS_URL
             ))
             ->will($this->returnCallback(array($this, 'returnMockServerRequest')))
@@ -257,8 +257,8 @@ public function testGetEmptyProfilesProperties(): void
             ->method('request')
             ->with($this->logicalOr(
                 sprintf('%s?pageSize=%d', Client::ACCOUNT_PROPERTIES_URL, Client::PAGE_SIZE),
+                sprintf('%s?max-results=%d', Client::ACCOUNT_PROFILES_URL, Client::PAGE_SIZE),
                 Client::ACCOUNT_WEB_PROPERTIES_URL,
-                Client::ACCOUNT_PROFILES_URL,
                 Client::ACCOUNTS_URL
             ))
             ->will($this->returnCallback(array($this, 'returnMockServerRequestEmptyResponse')))
@@ -366,7 +366,7 @@ public function returnMockServerRequest(string $url): Response
                     [],
                     '{"accountSummaries":[{"name":"accountSummaries/128209249","account":"accounts/128209249","displayName":"Keboola Website"},{"name":"accountSummaries/185283969","account":"accounts/185283969","displayName":"Ondřej Jodas","propertySummaries":[{"property":"properties/255885884","displayName":"users"}]},{"name":"accountSummaries/52541130","account":"accounts/52541130","displayName":"Keboola Status Blog"}]}'
                 );
-            case Client::ACCOUNT_PROFILES_URL:
+            case sprintf('%s?max-results=%d', Client::ACCOUNT_PROFILES_URL, Client::PAGE_SIZE):
                 return new Response(
                     200,
                     [],

tests/Keboola/GoogleAnalyticsExtractor/Extractor/ValidatorTest.php

@@ -158,7 +158,7 @@ public function returnMockServerRequest(string $url): Response
                     [],
                     '{"accountSummaries":[{"name":"accountSummaries/128209249","account":"accounts/128209249","displayName":"Keboola Website"},{"name":"accountSummaries/185283969","account":"accounts/185283969","displayName":"Ondřej Jodas","propertySummaries":[{"property":"properties/255885884","displayName":"users"}]},{"name":"accountSummaries/52541130","account":"accounts/52541130","displayName":"Keboola Status Blog"}]}'
                 );
-            case Client::ACCOUNT_PROFILES_URL:
+            case sprintf('%s?max-results=%d', Client::ACCOUNT_PROFILES_URL, Client::PAGE_SIZE):
                 return new Response(
                     200,
                     [],
@@ -176,7 +176,7 @@ private function getMockRestApi(): RestApi
             ->method('request')
             ->with($this->logicalOr(
                 sprintf('%s?pageSize=%d', Client::ACCOUNT_PROPERTIES_URL, Client::PAGE_SIZE),
-                Client::ACCOUNT_PROFILES_URL
+                sprintf('%s?max-results=%d', Client::ACCOUNT_PROFILES_URL, Client::PAGE_SIZE)
             ))
             ->will($this->returnCallback([$this, 'returnMockServerRequest']));