Merge pull request #131 from keboola/AJDA-1176-ondra-fix

[AJDA-1176] Create data file if not exists

Author: ondrajodas

phpstan-baseline.neon

@@ -840,11 +840,6 @@ parameters:
 			count: 1
 			path: tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php
 
-		-
-			message: "#^Method Keboola\\\\GoogleAnalyticsExtractor\\\\ApplicationTest\\:\\:assertManifestContainsColumns\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php
-
 		-
 			message: "#^Method Keboola\\\\GoogleAnalyticsExtractor\\\\ApplicationTest\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -855,11 +850,6 @@ parameters:
 			count: 1
 			path: tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, mixed given\\.$#"
 			count: 2

src/Extractor/Output.php

@@ -167,7 +167,11 @@ public function createCsvFile(string $name): CsvFile
         if (!is_dir($outTablesDir)) {
             mkdir($outTablesDir, 0777, true);
         }
-        return new CsvFile($this->dataDir . '/out/tables/' . $name . '.csv');
+        $filename = $this->dataDir . '/out/tables/' . $name . '.csv';
+        if (!file_exists($filename)) {
+            touch($filename);
+        }
+        return new CsvFile($filename);
     }
 
     public function createManifest(

tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php

@@ -50,72 +50,6 @@ private function getConfig(string $suffix = ''): array
         return $config;
     }
 
-    public function testAppRunDailyWalk(): void
-    {
-        $this->config = $this->getConfig('_antisampling');
-        $this->runProcess();
-
-        $dailyWalk = $this->getManifestFiles('dailyWalk');
-        Assert::assertEquals(1, count($dailyWalk));
-
-        foreach ($dailyWalk as $file) {
-            /** @var $file SplFileInfo */
-            $this->assertManifestContainsColumns($file->getPathname(), [
-                'id',
-                'idProfile',
-                'date',
-                'sourceMedium',
-                'landingPagePath',
-                'pageviews',
-            ]);
-        }
-    }
-
-    public function testAppRunAdaptive(): void
-    {
-        $this->config = $this->getConfig('_antisampling_adaptive');
-        $this->runProcess();
-
-        $adaptive = $this->getManifestFiles('adaptive');
-        Assert::assertEquals(1, count($adaptive));
-
-        foreach ($adaptive as $file) {
-            /** @var $file SplFileInfo */
-            $this->assertManifestContainsColumns($file->getPathname(), [
-                'id',
-                'idProfile',
-                'date',
-                'sourceMedium',
-                'landingPagePath',
-                'pageviews',
-            ]);
-        }
-    }
-
-    public function testAppRunMCF(): void
-    {
-        $this->config = $this->getConfig('_mcf');
-        $this->runProcess();
-
-        $funnelFiles = $this->getManifestFiles('funnel');
-        Assert::assertEquals(1, count($funnelFiles));
-
-        foreach ($funnelFiles as $file) {
-            /** @var $file SplFileInfo */
-            $this->assertManifestContainsColumns($file->getPathname(), [
-                'id',
-                'idProfile',
-                'mcf:conversionDate',
-                'mcf:sourcePath',
-                'mcf:mediumPath',
-                'mcf:sourceMedium',
-                'mcf:totalConversions',
-                'mcf:totalConversionValue',
-                'mcf:assistedConversions',
-            ]);
-        }
-    }
-
     public function testAppProfilesProperties(): void
     {
         $this->config = $this->getConfig('_empty');
@@ -183,13 +117,6 @@ private function getManifestFiles(string $queryName): Finder
         ;
     }
 
-    private function assertManifestContainsColumns(string $pathname, array $expected): void
-    {
-        $manifest = (array) json_decode(file_get_contents($pathname), true, 512, JSON_THROW_ON_ERROR);
-        Assert::assertArrayHasKey('columns', $manifest);
-        Assert::assertEquals($expected, $manifest['columns']);
-    }
-
     public function appRunDataProvider(): Generator
     {
         yield 'configRow' => [

tests/data/config_antisampling.json

@@ -0,0 +1 @@
+{"destination":"in.c-keboola-ex-google-analytics-v4-01k6mq8atddf0xbr48p2b9st4h.empty-data","incremental":true,"columns":["id","idProperty","campaignId","campaignName","city","cityId","active1DayUsers","active28DayUsers"],"primary_key":["id"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"idProperty":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"campaignId":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"campaignName":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"city":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"cityId":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"active1DayUsers":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}],"active28DayUsers":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"STRING"}]}}

tests/data/config_antisampling_adaptive.json

@@ -0,0 +1 @@
+"properties/403517979","Website - GA4","accounts/128209249","Keboola Website"