Created new method to locate empty visits

module/Core/src/Repository/VisitRepository.php

@@ -14,7 +14,8 @@ class VisitRepository extends EntityRepository implements VisitRepositoryInterfa
     /**
      * This method will allow you to iterate the whole list of unlocated visits, but loading them into memory in
      * smaller blocks of a specific size.
-     * This will have side effects if you update those rows while you iterate them.
+     * This will have side effects if you update those rows while you iterate them, in a way that they are no longer
+     * unlocated.
      * If you plan to do so, pass the first argument as false in order to disable applying offsets while slicing the
      * dataset
      *
@@ -23,8 +24,8 @@ class VisitRepository extends EntityRepository implements VisitRepositoryInterfa
     public function findUnlocatedVisits(bool $applyOffset = true, int $blockSize = self::DEFAULT_BLOCK_SIZE): iterable
     {
         $dql = <<<DQL
-SELECT v FROM Shlinkio\Shlink\Core\Entity\Visit AS v WHERE v.visitLocation IS NULL
-DQL;
+            SELECT v FROM Shlinkio\Shlink\Core\Entity\Visit AS v WHERE v.visitLocation IS NULL
+        DQL;
         $query = $this->getEntityManager()->createQuery($dql)
                                           ->setMaxResults($blockSize);
         $remainingVisitsToProcess = $this->count(['visitLocation' => null]);

module/Core/src/Service/VisitServiceInterface.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Service;
-
-interface VisitServiceInterface
-{
-    public function locateUnlocatedVisits(callable $geolocateVisit, ?callable $notifyVisitWithLocation = null): void;
-}

module/Core/src/Visit/VisitLocator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\Service;
+namespace Shlinkio\Shlink\Core\Visit;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Shlinkio\Shlink\Core\Entity\Visit;
@@ -11,7 +11,7 @@ use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
 use Shlinkio\Shlink\IpGeolocation\Model\Location;
 
-class VisitService implements VisitServiceInterface
+class VisitLocator implements VisitLocatorInterface
 {
     private EntityManagerInterface $em;
 
@@ -20,11 +20,23 @@ class VisitService implements VisitServiceInterface
         $this->em = $em;
     }
 
-    public function locateUnlocatedVisits(callable $geolocateVisit, ?callable $notifyVisitWithLocation = null): void
+    public function locateUnlocatedVisits(callable $geolocateVisit, callable $notifyVisitWithLocation): void
     {
         /** @var VisitRepository $repo */
         $repo = $this->em->getRepository(Visit::class);
-        $results = $repo->findUnlocatedVisits(false);
+        $this->locateVisits($repo->findUnlocatedVisits(false), $geolocateVisit, $notifyVisitWithLocation);
+    }
+
+    public function locateVisitsWithEmptyLocation(callable $geolocateVisit, callable $notifyVisitWithLocation): void
+    {
+        $this->locateVisits([], $geolocateVisit, $notifyVisitWithLocation);
+    }
+
+    /**
+     * @param iterable|Visit[] $results
+     */
+    private function locateVisits(iterable $results, callable $geolocateVisit, callable $notifyVisitWithLocation): void
+    {
         $count = 0;
         $persistBlock = 200;
 
@@ -58,13 +70,11 @@ class VisitService implements VisitServiceInterface
         $this->em->clear();
     }
 
-    private function locateVisit(Visit $visit, VisitLocation $location, ?callable $notifyVisitWithLocation): void
+    private function locateVisit(Visit $visit, VisitLocation $location, callable $notifyVisitWithLocation): void
     {
         $visit->locate($location);
         $this->em->persist($visit);
 
-        if ($notifyVisitWithLocation !== null) {
-            $notifyVisitWithLocation($location, $visit);
-        }
+        $notifyVisitWithLocation($location, $visit);
     }
 }

module/Core/src/Visit/VisitLocatorInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Visit;
+
+interface VisitLocatorInterface
+{
+    public function locateUnlocatedVisits(callable $geolocateVisit, callable $notifyVisitWithLocation): void;
+
+    public function locateVisitsWithEmptyLocation(callable $geolocateVisit, callable $notifyVisitWithLocation): void;
+}