Merge pull request #117 from keboola/adamvyborny-CM-649-retry-on-unknown-metric

Retry on unknown metric

Author: AdamVyborny

composer.json

@@ -9,7 +9,7 @@
     "ext-json": "*",
     "keboola/common-exceptions": "^1.1",
     "keboola/csv": "^1.1",
-    "keboola/google-client-bundle": "^5.3",
+    "keboola/google-client-bundle": "^5.4",
     "keboola/php-component": "^9.4",
     "keboola/storage-api-client": "^12.9",
     "symfony/config": "^5.2",

composer.lock

@@ -4,9 +4,10 @@
 
 namespace Keboola\GoogleAnalyticsExtractor\GoogleAnalytics;
 
+use GuzzleHttp\Exception\ClientException;
 use Keboola\Google\ClientBundle\Google\RestApi;
-use Keboola\GoogleAnalyticsExtractor\Configuration\Config;
-use Keboola\GoogleAnalyticsExtractor\Configuration\ConfigDefinition;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
@@ -16,14 +17,22 @@ class ClientTest extends TestCase
     /** @var Client */
     protected $client;
 
+    /** @var \Monolog\Logger */
+    private Logger $logger;
+
     public function setUp(): void
     {
+        $testHandler = new TestHandler();
+        $this->logger = new Logger('Google Analytics API tests');
+        $this->logger->pushHandler($testHandler);
+
         $this->client = new Client(
             new RestApi(
                 (string) getenv('CLIENT_ID'),
                 (string) getenv('CLIENT_SECRET'),
                 (string) getenv('ACCESS_TOKEN'),
-                (string) getenv('REFRESH_TOKEN')
+                (string) getenv('REFRESH_TOKEN'),
+                $this->logger,
             ),
             new NullLogger(),
             []
@@ -89,4 +98,47 @@ public function testGetBatch(): void
         Assert::assertNotEmpty($reports[1]['data']);
         Assert::assertEquals('sessions', $reports[1]['query']['name']);
     }
+
+    public function testRetryOnUnknownMetric(): void
+    {
+        $query = [
+            'name' => 'sessions',
+            'endpoint' => Client::REPORTS_URL,
+            'query' => [
+                'viewId' => getenv('VIEW_ID'),
+                'metrics' => [
+                    ['expression' => 'ga:metric2'],
+                    ['expression' => 'ga:metric1'],
+                    ['expression' => 'ga:goal11Completions'],
+                ],
+                'dimensions' => [
+                    ['name' => 'ga:date'],
+                    ['name' => 'ga:source'],
+                    ['name' => 'ga:country'],
+                    ['name' => 'ga:pagePath'],
+                ],
+                'dateRanges' => [[
+                    'startDate' => date('Y-m-d', strtotime('-12 months')),
+                    'endDate' => date('Y-m-d', strtotime('now')),
+                ]],
+            ],
+        ];
+
+        try {
+            $this->client->getBatch($query);
+        } catch (ClientException $e) {
+            $this->assertStringContainsString('400 Bad Request', $e->getMessage());
+        }
+
+        /** @var TestHandler $testHandler */
+        $testHandler = $this->logger->getHandlers()[0];
+        for ($i = 1; $i <= 6; $i++) {
+            /** @var \Monolog\LogRecord $record */
+            $record = $testHandler->getRecords()[$i];
+            $this->assertEquals(
+                sprintf('Retrying request (%dx) - reason: Bad Request', $i),
+                $record['message']
+            );
+        }
+    }
 }