Merge pull request #69 from keboola/COM-1327-ondra

Skip disabled queries
keboola · Feb 4, 2022 · 86ecd78 · 86ecd78
2 parents 55e67b9 + 7ca6f62
commit 86ecd78
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/src/Configuration/Config.php b/src/Configuration/Config.php
@@ -46,7 +46,10 @@ public function getOutputBucket(): string
     public function getQueries(string $configDefinition): array
     {
         if ($configDefinition === OldConfigDefinition::class) {
-            return $this->getValue(['parameters', 'queries'], []);
+            $queries = $this->getValue(['parameters', 'queries'], []);
+            return array_filter($queries, function ($query) {
+                return $query['enabled'];
+            });
         } else {
             return [$this->getValue(['parameters'], [])];
         }

diff --git a/tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php b/tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php
@@ -65,6 +65,8 @@ public function testAppRun(string $configSuffix): void
         $users = $this->getOutputFiles('users');
         $usersManifests = $this->getManifestFiles('users');
 
+        $disabledUsers = $this->getOutputFiles('disabledUsers');
+
         $manifests = $this->getManifestFiles('');
 
         Assert::assertEquals(1, count($profiles));
@@ -73,6 +75,8 @@ public function testAppRun(string $configSuffix): void
         Assert::assertEquals(1, count($users));
         Assert::assertEquals(1, count($usersManifests));
 
+        Assert::assertEquals(0, count($disabledUsers));
+
         foreach ($manifests as $manifestFile) {
             $manifest = json_decode((string) file_get_contents((string) $manifestFile), true);
             Assert::assertArrayHasKey('incremental', $manifest);

diff --git a/tests/data/config_old.json b/tests/data/config_old.json
@@ -57,6 +57,44 @@
             }
           ]
         }
+      },
+      {
+        "outputTable": "disabledUsers",
+        "enabled": false,
+        "query": {
+          "metrics": [
+            {
+              "expression": "ga:users"
+            },
+            {
+              "expression": "ga:pageviews"
+            },
+            {
+              "expression": "ga:bounces"
+            }
+          ],
+          "dimensions": [
+            {
+              "name": "ga:date"
+            },
+            {
+              "name": "ga:source"
+            },
+            {
+              "name": "ga:medium"
+            },
+            {
+              "name": "ga:country"
+            }
+          ],
+          "filtersExpression": "",
+          "dateRanges": [
+            {
+              "startDate": "-3 months",
+              "endDate": "-1 day"
+            }
+          ]
+        }
       }
     ]
   }