Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-06 23:33:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved visits iteration logic from command to service to allow lazy loading of entries in resultset

Browse Source
This commit is contained in:
Alejandro Celaya
2018-11-17 09:42:15 +01:00
parent 1bc01057f3
commit 0aae0d888c
9 changed files with 229 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
module/Core/src/Service/VisitService.php
View File

@@ -6,6 +6,7 @@ namespace Shlinkio\Shlink\Core\Service;
use Doctrine\ORM\EntityManagerInterface;
use Shlinkio\Shlink\Core\Entity\Visit;
use Shlinkio\Shlink\Core\Entity\VisitLocation;
use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
use Shlinkio\Shlink\Core\Repository\VisitRepository;
class VisitService implements VisitServiceInterface
@@ -20,26 +21,36 @@ class VisitService implements VisitServiceInterface
$this->em = $em;
}
/**
* @return Visit[]
*/
public function getUnlocatedVisits(): array
public function locateVisits(callable $getGeolocationData, ?callable $locatedVisit = null): void
{
/** @var VisitRepository $repo */
$repo = $this->em->getRepository(Visit::class);
return $repo->findUnlocatedVisits();
$results = $repo->findUnlocatedVisits();
foreach ($results as [$visit]) {
try {
$locationData = $getGeolocationData($visit);
} catch (IpCannotBeLocatedException $e) {
// Skip if the visit's IP could not be located
continue;
}
$location = new VisitLocation($locationData);
$this->locateVisit($visit, $location, $locatedVisit);
}
}
public function locateVisit(Visit $visit, VisitLocation $location, bool $clear = false): void
private function locateVisit(Visit $visit, VisitLocation $location, ?callable $locatedVisit): void
{
$visit->locate($location);
$this->em->persist($visit);
$this->em->flush();
if ($clear) {
$this->em->clear(VisitLocation::class);
$this->em->clear(Visit::class);
if ($locatedVisit !== null) {
$locatedVisit($location, $visit);
}
$this->em->clear();
}
}

10
module/Core/src/Service/VisitServiceInterface.php
View File

@@ -3,15 +3,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Service;
use Shlinkio\Shlink\Core\Entity\Visit;
use Shlinkio\Shlink\Core\Entity\VisitLocation;
interface VisitServiceInterface
{
/**
* @return Visit[]
*/
public function getUnlocatedVisits(): array;
public function locateVisit(Visit $visit, VisitLocation $location, bool $clear = false): void;
public function locateVisits(callable $getGeolocationData, ?callable $locatedVisit = null): void;
}