Configured publishing of new short URL events in RabbitMQ

module/Core/config/dependencies.config.php

@@ -98,6 +98,7 @@ return [
             'em',
             ShortUrl\Resolver\PersistenceShortUrlRelationResolver::class,
             Service\ShortUrl\ShortCodeUniquenessHelper::class,
+            EventDispatcherInterface::class,
         ],
         Visit\VisitsTracker::class => [
             'em',

module/Core/config/event_dispatcher.config.php

@@ -28,7 +28,7 @@ return [
                 EventDispatcher\UpdateGeoLiteDb::class,
             ],
             EventDispatcher\Event\ShortUrlCreated::class => [
-                EventDispatcher\Mercure\NotifyNewShortUrlToMercure::class,
+//                EventDispatcher\Mercure\NotifyNewShortUrlToMercure::class,
                 EventDispatcher\RabbitMq\NotifyNewShortUrlToRabbitMq::class,
             ],
         ],

module/Core/src/Service/UrlShortener.php

@@ -5,7 +5,9 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Service;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\EventDispatcher\Event\ShortUrlCreated;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
@@ -17,10 +19,11 @@ use Shlinkio\Shlink\Core\ShortUrl\Resolver\ShortUrlRelationResolverInterface;
 class UrlShortener implements UrlShortenerInterface
 {
     public function __construct(
-        private ShortUrlTitleResolutionHelperInterface $titleResolutionHelper,
+        private readonly ShortUrlTitleResolutionHelperInterface $titleResolutionHelper,
-        private EntityManagerInterface $em,
+        private readonly EntityManagerInterface $em,
-        private ShortUrlRelationResolverInterface $relationResolver,
+        private readonly ShortUrlRelationResolverInterface $relationResolver,
-        private ShortCodeUniquenessHelperInterface $shortCodeHelper,
+        private readonly ShortCodeUniquenessHelperInterface $shortCodeHelper,
+        private readonly EventDispatcherInterface $eventDispatcher,
     ) {
     }
 
@@ -39,7 +42,8 @@ class UrlShortener implements UrlShortenerInterface
         /** @var ShortUrlMeta $meta */
         $meta = $this->titleResolutionHelper->processTitleAndValidateUrl($meta);
 
-        return $this->em->transactional(function () use ($meta) {
+        /** @var ShortUrl $newShortUrl */
+        $newShortUrl = $this->em->wrapInTransaction(function () use ($meta) {
             $shortUrl = ShortUrl::fromMeta($meta, $this->relationResolver);
 
             $this->verifyShortCodeUniqueness($meta, $shortUrl);
@@ -47,6 +51,10 @@ class UrlShortener implements UrlShortenerInterface
 
             return $shortUrl;
         });
+
+        $this->eventDispatcher->dispatch(new ShortUrlCreated($newShortUrl->getId()));
+
+        return $newShortUrl;
     }
 
     private function findExistingShortUrlIfExists(ShortUrlMeta $meta): ?ShortUrl

module/Core/test/Service/UrlShortenerTest.php

@@ -10,6 +10,7 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
@@ -27,6 +28,7 @@ class UrlShortenerTest extends TestCase
     private ObjectProphecy $em;
     private ObjectProphecy $titleResolutionHelper;
     private ObjectProphecy $shortCodeHelper;
+    private ObjectProphecy $eventDispatcher;
 
     public function setUp(): void
     {
@@ -39,7 +41,7 @@ class UrlShortenerTest extends TestCase
             [$shortUrl] = $arguments;
             $shortUrl->setId('10');
         });
-        $this->em->transactional(Argument::type('callable'))->will(function (array $args) {
+        $this->em->wrapInTransaction(Argument::type('callable'))->will(function (array $args) {
             /** @var callable $callback */
             [$callback] = $args;
 
@@ -51,11 +53,14 @@ class UrlShortenerTest extends TestCase
         $this->shortCodeHelper = $this->prophesize(ShortCodeUniquenessHelperInterface::class);
         $this->shortCodeHelper->ensureShortCodeUniqueness(Argument::cetera())->willReturn(true);
 
+        $this->eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+
         $this->urlShortener = new UrlShortener(
             $this->titleResolutionHelper->reveal(),
             $this->em->reveal(),
             new SimpleShortUrlRelationResolver(),
             $this->shortCodeHelper->reveal(),
+            $this->eventDispatcher->reveal(),
         );
     }