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

Update VisitsTracker so that its methods return the new Visit instance, if any

Browse Source
This commit is contained in:
Alejandro Celaya
2024-11-11 08:51:55 +01:00
parent 12a08cb373
commit a5a98bd578
29 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/Core/src/Visit/Model/Visitor.php
View File

@@ -51,7 +51,7 @@ final class Visitor
);
}
public static function emptyInstance(): self
public static function empty(): self
{
return new self('', '', null, '');
}

38
module/Core/src/Visit/VisitsTracker.php
View File

@@ -21,65 +21,63 @@ readonly class VisitsTracker implements VisitsTrackerInterface
) {
}
public function track(ShortUrl $shortUrl, Visitor $visitor): void
public function track(ShortUrl $shortUrl, Visitor $visitor): Visit|null
{
$this->trackVisit(
return $this->trackVisit(
fn (Visitor $v) => Visit::forValidShortUrl($shortUrl, $v, $this->options->anonymizeRemoteAddr),
$visitor,
);
}
public function trackInvalidShortUrlVisit(Visitor $visitor): void
public function trackInvalidShortUrlVisit(Visitor $visitor): Visit|null
{
$this->trackOrphanVisit(
return $this->trackOrphanVisit(
fn (Visitor $v) => Visit::forInvalidShortUrl($v, $this->options->anonymizeRemoteAddr),
$visitor,
);
}
public function trackBaseUrlVisit(Visitor $visitor): void
public function trackBaseUrlVisit(Visitor $visitor): Visit|null
{
$this->trackOrphanVisit(
return $this->trackOrphanVisit(
fn (Visitor $v) => Visit::forBasePath($v, $this->options->anonymizeRemoteAddr),
$visitor,
);
}
public function trackRegularNotFoundVisit(Visitor $visitor): void
public function trackRegularNotFoundVisit(Visitor $visitor): Visit|null
{
$this->trackOrphanVisit(
return $this->trackOrphanVisit(
fn (Visitor $v) => Visit::forRegularNotFound($v, $this->options->anonymizeRemoteAddr),
$visitor,
);
}
private function trackOrphanVisit(callable $createVisit, Visitor $visitor): void
private function trackOrphanVisit(callable $createVisit, Visitor $visitor): Visit|null
{
if (! $this->options->trackOrphanVisits) {
return;
return null;
}
$this->trackVisit($createVisit, $visitor);
return $this->trackVisit($createVisit, $visitor);
}
/**
* @param callable(Visitor $visitor): Visit $createVisit
*/
private function trackVisit(callable $createVisit, Visitor $visitor): void
private function trackVisit(callable $createVisit, Visitor $visitor): Visit|null
{
if ($this->options->disableTracking) {
return;
return null;
}
$visit = $createVisit($visitor->normalizeForTrackingOptions($this->options));
// Wrap persisting and flushing the visit in a transaction, so that the ShortUrlVisitsCountTracker performs
// changes inside that very same transaction atomically
$this->em->wrapInTransaction(function () use ($visit): void {
$this->em->persist($visit);
$this->em->flush();
});
// Wrap persisting the visit in a transaction, so that the ShortUrlVisitsCountTracker performs changes inside
// that very same transaction atomically
$this->em->wrapInTransaction(fn () => $this->em->persist($visit));
$this->eventDispatcher->dispatch(new UrlVisited($visit->getId(), $visitor->remoteAddress));
return $visit;
}
}

9
module/Core/src/Visit/VisitsTrackerInterface.php
View File

@@ -5,15 +5,16 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Visit;
use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Visit\Entity\Visit;
use Shlinkio\Shlink\Core\Visit\Model\Visitor;
interface VisitsTrackerInterface
{
public function track(ShortUrl $shortUrl, Visitor $visitor): void;
public function track(ShortUrl $shortUrl, Visitor $visitor): Visit|null;
public function trackInvalidShortUrlVisit(Visitor $visitor): void;
public function trackInvalidShortUrlVisit(Visitor $visitor): Visit|null;
public function trackBaseUrlVisit(Visitor $visitor): void;
public function trackBaseUrlVisit(Visitor $visitor): Visit|null;
public function trackRegularNotFoundVisit(Visitor $visitor): void;
public function trackRegularNotFoundVisit(Visitor $visitor): Visit|null;
}