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

Updated VisitService to have a method which locates visits and allows entity manager to be cleared

Browse Source
This commit is contained in:
Alejandro Celaya
2018-11-17 07:47:42 +01:00
parent 1363194909
commit c1906606c6
8 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/Core/src/Entity/Visit.php
View File

@@ -93,7 +93,7 @@ class Visit extends AbstractEntity implements JsonSerializable
return $this->visitLocation;
}
public function setVisitLocation(VisitLocation $visitLocation): self
public function locate(VisitLocation $visitLocation): self
{
$this->visitLocation = $visitLocation;
return $this;

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

@@ -5,6 +5,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\Repository\VisitRepository;
class VisitService implements VisitServiceInterface
@@ -22,19 +23,23 @@ class VisitService implements VisitServiceInterface
/**
* @return Visit[]
*/
public function getUnlocatedVisits()
public function getUnlocatedVisits(): array
{
/** @var VisitRepository $repo */
$repo = $this->em->getRepository(Visit::class);
return $repo->findUnlocatedVisits();
}
/**
* @param Visit $visit
*/
public function saveVisit(Visit $visit)
public function locateVisit(Visit $visit, VisitLocation $location, bool $clear = false): void
{
$visit->locate($location);
$this->em->persist($visit);
$this->em->flush();
if ($clear) {
$this->em->clear(VisitLocation::class);
$this->em->clear(Visit::class);
}
}
}

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

@@ -4,16 +4,14 @@ 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();
public function getUnlocatedVisits(): array;
/**
* @param Visit $visit
*/
public function saveVisit(Visit $visit);
public function locateVisit(Visit $visit, VisitLocation $location, bool $clear = false): void;
}

2
module/Core/test-func/Repository/VisitRepositoryTest.php
View File

@@ -45,7 +45,7 @@ class VisitRepositoryTest extends DatabaseTestCase
if ($i % 2 === 0) {
$location = new VisitLocation([]);
$this->getEntityManager()->persist($location);
$visit->setVisitLocation($location);
$visit->locate($location);
}
$this->getEntityManager()->persist($visit);

5
module/Core/test/Service/VisitServiceTest.php
View File

@@ -8,6 +8,7 @@ use PHPUnit\Framework\TestCase;
use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Entity\Visit;
use Shlinkio\Shlink\Core\Entity\VisitLocation;
use Shlinkio\Shlink\Core\Model\Visitor;
use Shlinkio\Shlink\Core\Repository\VisitRepository;
use Shlinkio\Shlink\Core\Service\VisitService;
@@ -32,12 +33,12 @@ class VisitServiceTest extends TestCase
/**
* @test
*/
public function saveVisitsPersistsProvidedVisit()
public function locateVisitPersistsProvidedVisit()
{
$visit = new Visit(new ShortUrl(''), Visitor::emptyInstance());
$this->em->persist($visit)->shouldBeCalledOnce();
$this->em->flush()->shouldBeCalledOnce();
$this->visitService->saveVisit($visit);
$this->visitService->locateVisit($visit, new VisitLocation([]));
}
/**