Invalidate archives after deleting a visit to prevent race conditions (#16967)

* Invalidate archives after deleting a visit to prevent race conditions

The deletion of visits can take a while. To prevent any possible race condition we should invalidate archives only after the visits were deleted.

We recently deleted few visits and noticed the reports are still showing the wrong data. Not sure if this was the problem but be still good to change.

* fix test

Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/PrivacyManager/Model/DataSubjects.php b/plugins/PrivacyManager/Model/DataSubjects.php
index 6c5d7583c3..1819b20bfb 100644
--- a/plugins/PrivacyManager/Model/DataSubjects.php
+++ b/plugins/PrivacyManager/Model/DataSubjects.php
@@ -107,22 +107,22 @@ class DataSubjects
          */
         Piwik::postEvent('PrivacyManager.deleteDataSubjects', array(&$results, $visits));
 
-        $this->invalidateArchives($visits);
+        $datesToInvalidateByIdSite = $this->getDatesToInvalidate($visits);
 
         $logTables = $this->getLogTablesToDeleteFrom();
         $deleteCounts = $this->deleteLogDataFrom($logTables, function ($tableToSelectFrom) use ($visits) {
             return $this->visitsToWhereAndBind($tableToSelectFrom, $visits);
         });
 
+        $this->invalidateArchives($datesToInvalidateByIdSite);
+
         $results = array_merge($results, $deleteCounts);
         krsort($results); // make sure test results are always in same order
         return $results;
     }
 
-    private function invalidateArchives($visits)
+    private function invalidateArchives($datesToInvalidateByIdSite)
     {
-        $datesToInvalidateByIdSite = $this->getDatesToInvalidate($visits);
-
         $invalidator = StaticContainer::get('Piwik\Archive\ArchiveInvalidator');
 
         foreach ($datesToInvalidateByIdSite as $idSite => $visitDates) {