Move usercountry:attribute iteration logic to VisitorGeolocator plugin.

2 files changed, 34 insertions, 20 deletions

diff --git a/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php b/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
index a3c85174ba..5e617f53e6 100644
--- a/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
+++ b/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
@@ -115,30 +115,12 @@ class AttributeHistoricalDataWithLocations extends ConsoleCommand
 
     protected function processSpecifiedLogsInChunks(OutputInterface $output, $from, $to, $segmentLimit)
     {
-        $visitFieldsToSelect = array_merge(array('idvisit', 'location_ip'), array_keys(VisitorGeolocator::$logVisitFieldsToUpdate));
-
-        $conditions = array(
-            array('visit_last_action_time', '>=', $from),
-            array('visit_last_action_time', '<', $to)
-        );
-
         $self = $this;
-        $this->dao->forAllLogs('log_visit', $visitFieldsToSelect, $conditions, $segmentLimit, function ($logs) use ($self, $output) {
-            if (!empty($logs)) {
-                $self->reattributeVisitLogs($output, $logs);
-            }
+        $this->visitorGeolocator->reattributeVisitLogs($from, $to, $idSite = null, $segmentLimit, function () use ($output, $self) {
+            $self->onVisitProcessed($output);
         });
     }
 
-    protected function reattributeVisitLogs(OutputInterface $output, $logRows)
-    {
-        foreach ($logRows as $row) {
-            $this->visitorGeolocator->attributeExistingVisit($row);
-
-            $this->onVisitProcessed($output);
-        }
-    }
-
     /**
      * @param InputInterface $input
      * @return int
diff --git a/plugins/UserCountry/VisitorGeolocator.php b/plugins/UserCountry/VisitorGeolocator.php
index be960c02f9..a12cbb5118 100644
--- a/plugins/UserCountry/VisitorGeolocator.php
+++ b/plugins/UserCountry/VisitorGeolocator.php
@@ -274,4 +274,36 @@ class VisitorGeolocator
         }
         return self::$defaultLocationCache;
     }
+
+    /**
+     * @param $from
+     * @param $to
+     * @param null $idSite
+     * @param int $segmentLimit
+     * @param callable $onLogProcessed
+     */
+    public function reattributeVisitLogs($from, $to, $idSite = null, $segmentLimit = 1000, $onLogProcessed = null)
+    {
+        $visitFieldsToSelect = array_merge(array('idvisit', 'location_ip'), array_keys(VisitorGeolocator::$logVisitFieldsToUpdate));
+
+        $conditions = array(
+            array('visit_last_action_time', '>=', $from),
+            array('visit_last_action_time', '<', $to)
+        );
+
+        if (!empty($idSite)) {
+            $conditions[] = array('idsite', '=', $idSite);
+        }
+
+        $self = $this;
+        $this->dao->forAllLogs('log_visit', $visitFieldsToSelect, $conditions, $segmentLimit, function ($logs) use ($self, $onLogProcessed) {
+            foreach ($logs as $row) {
+                $self->attributeExistingVisit($row);
+
+                if (!empty($onLogProcessed)) {
+                    $onLogProcessed($row);
+                }
+            }
+        });
+    }
 }
\ No newline at end of file