Do not try to populate cache for disabled periods (#23880)

* Do not try to populate cache for disabled periods

* adds test

Author: sgiehl

core/ArchiveProcessor/Loader.php

@@ -678,6 +678,9 @@ private function hasSiteVisitsBetweenTimeframe($idSite, Period $period): bool
             $currentPeriod = $period;
             do {
                 $parentPeriodLabel = $currentPeriod->getParentPeriodLabel();
+                if (!Period\Factory::isPeriodEnabledForAPI($parentPeriodLabel)) {
+                    $parentPeriodLabel = null;
+                }
                 if ($parentPeriodLabel) {
                     $parentPeriod = Period\Factory::build($parentPeriodLabel, $date1);
                     $cacheKey = CacheId::siteAware(sprintf($cacheKeyStr, $parentPeriod->getLabel(), $parentPeriod->getRangeString()), [$idSite]);

tests/PHPUnit/Integration/CronArchiveTest.php

@@ -12,6 +12,7 @@
 use Piwik\ArchiveProcessor\Parameters;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
+use Piwik\Config\GeneralConfig;
 use Piwik\Container\StaticContainer;
 use Piwik\CronArchive;
 use Piwik\DataAccess\ArchiveTableCreator;
@@ -1597,6 +1598,29 @@ public function testShouldNotStopProcessingWhenOneSiteIsInvalid()
         self::assertStringContainsString($expected, $logger->output);
     }
 
+    public function testShouldSkipYearPeriodWhenDisabled()
+    {
+        \Piwik\Tests\Framework\Mock\FakeCliMulti::$specifiedResults = [
+            '/method=API.get/' => json_encode([['nb_visits' => 1]]),
+        ];
+
+        GeneralConfig::setConfigValue('enabled_periods_API', 'day,week,month,range');
+
+        Fixture::createWebsite('2014-12-12 00:01:02');
+
+        $tracker = Fixture::getTracker(1, '2020-02-03 12:01:02');
+        Fixture::checkResponse($tracker->doTrackPageView('test'));
+
+        $logger = new FakeLogger();
+
+        $archiver                              = new CronArchive($logger);
+        $archiver->shouldArchiveSpecifiedSites = [1];
+        $archiver->init();
+        $archiver->run();
+
+        self::assertStringNotContainsString('year', $logger->output);
+    }
+
     public function provideContainerConfig()
     {
         Date::$now = strtotime('2020-02-03 04:05:06');