diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml index a34c133..f66c82d 100644 --- a/config/packages/messenger.yaml +++ b/config/packages/messenger.yaml @@ -25,6 +25,7 @@ framework: App\Message\ProcessWatchListsTrigger: async App\Message\ProcessWatchListTrigger: async App\Message\ProcessDomainTrigger: async + App\Message\OrderDomain: async # Route your messages to the transports # 'App\Message\YourMessage': async diff --git a/src/Controller/DomainRefreshController.php b/src/Controller/DomainRefreshController.php index 3fab035..4393f2e 100644 --- a/src/Controller/DomainRefreshController.php +++ b/src/Controller/DomainRefreshController.php @@ -4,7 +4,7 @@ namespace App\Controller; use App\Entity\Domain; use App\Entity\WatchList; -use App\Message\ProcessDomainTrigger; +use App\Message\SendDomainEventNotif; use App\Repository\DomainRepository; use App\Service\RDAPService; use Psr\Log\LoggerInterface; @@ -80,7 +80,7 @@ class DomainRefreshController extends AbstractController /** @var WatchList $watchList */ foreach ($watchLists as $watchList) { - $this->bus->dispatch(new ProcessDomainTrigger($watchList->getToken(), $domain->getLdhName(), $updatedAt)); + $this->bus->dispatch(new SendDomainEventNotif($watchList->getToken(), $domain->getLdhName(), $updatedAt)); } return $domain; diff --git a/src/Message/ProcessDomainTrigger.php b/src/Message/OrderDomain.php similarity index 85% rename from src/Message/ProcessDomainTrigger.php rename to src/Message/OrderDomain.php index 69dca3c..8a5dcc5 100644 --- a/src/Message/ProcessDomainTrigger.php +++ b/src/Message/OrderDomain.php @@ -2,7 +2,7 @@ namespace App\Message; -final class ProcessDomainTrigger +final class OrderDomain { public function __construct( public string $watchListToken, diff --git a/src/Message/SendDomainEventNotif.php b/src/Message/SendDomainEventNotif.php new file mode 100644 index 0000000..cbe3c54 --- /dev/null +++ b/src/Message/SendDomainEventNotif.php @@ -0,0 +1,13 @@ +sender = new Address($mailerSenderEmail, $mailerSenderName); + } + + /** + * @throws TransportExceptionInterface + * @throws \Symfony\Component\Notifier\Exception\TransportExceptionInterface + * @throws \Throwable + */ + public function __invoke(OrderDomain $message): void + { + /** @var WatchList $watchList */ + $watchList = $this->watchListRepository->findOneBy(['token' => $message->watchListToken]); + /** @var Domain $domain */ + $domain = $this->domainRepository->findOneBy(['ldhName' => $message->ldhName]); + + $connector = $watchList->getConnector(); + if (null !== $connector && $domain->getDeleted()) { + $this->logger->notice('Watchlist {watchlist} is linked to connector {connector}. A purchase attempt will be made for domain name {ldhName} with provider {provider}.', [ + 'watchlist' => $message->watchListToken, + 'connector' => $connector->getId(), + 'ldhName' => $message->ldhName, + 'provider' => $connector->getProvider()->value, + ]); + try { + $provider = $connector->getProvider(); + if (null === $provider) { + throw new \Exception('Provider not found'); + } + + $connectorProviderClass = $provider->getConnectorProvider(); + + /** @var AbstractProvider $connectorProvider */ + $connectorProvider = new $connectorProviderClass($connector->getAuthData(), $this->client, $this->cacheItemPool, $this->kernel); + + $connectorProvider->orderDomain($domain, $this->kernel->isDebug()); + + $notification = (new DomainOrderNotification($this->sender, $domain, $connector)); + $this->mailer->send($notification->asEmailMessage(new Recipient($watchList->getUser()->getEmail()))->getMessage()); + SendDomainEventNotifHandler::sendChatNotification($watchList, $notification, $this->logger); + + $this->statService->incrementStat('stats.domain.purchased'); + } catch (\Throwable $exception) { + $this->logger->warning('Unable to complete purchase. An error message is sent to user {username}.', [ + 'username' => $watchList->getUser()->getUserIdentifier(), + ]); + + $notification = (new DomainOrderErrorNotification($this->sender, $domain)); + $this->mailer->send($notification->asEmailMessage(new Recipient($watchList->getUser()->getEmail()))->getMessage()); + SendDomainEventNotifHandler::sendChatNotification($watchList, $notification, $this->logger); + + $this->statService->incrementStat('stats.domain.purchase.failed'); + + throw $exception; + } + } + } +} diff --git a/src/MessageHandler/ProcessWatchListsTriggerHandler.php b/src/MessageHandler/ProcessWatchListsTriggerHandler.php index ee2085c..881c255 100644 --- a/src/MessageHandler/ProcessWatchListsTriggerHandler.php +++ b/src/MessageHandler/ProcessWatchListsTriggerHandler.php @@ -4,7 +4,7 @@ namespace App\MessageHandler; use App\Entity\WatchList; use App\Message\ProcessWatchListsTrigger; -use App\Message\ProcessWatchListTrigger; +use App\Message\UpdateDomainsFromWatchlist; use App\Repository\WatchListRepository; use Random\Randomizer; use Symfony\Component\Messenger\Attribute\AsMessageHandler; @@ -30,7 +30,7 @@ final readonly class ProcessWatchListsTriggerHandler /** @var WatchList $watchList */ foreach ($watchLists as $watchList) { - $this->bus->dispatch(new ProcessWatchListTrigger($watchList->getToken())); + $this->bus->dispatch(new UpdateDomainsFromWatchlist($watchList->getToken())); } } } diff --git a/src/MessageHandler/ProcessDomainTriggerHandler.php b/src/MessageHandler/SendDomainEventNotifHandler.php similarity index 58% rename from src/MessageHandler/ProcessDomainTriggerHandler.php rename to src/MessageHandler/SendDomainEventNotifHandler.php index db7df13..5770ff8 100644 --- a/src/MessageHandler/ProcessDomainTriggerHandler.php +++ b/src/MessageHandler/SendDomainEventNotifHandler.php @@ -2,23 +2,18 @@ namespace App\MessageHandler; -use App\Config\Provider\AbstractProvider; use App\Config\TriggerAction; use App\Config\WebhookScheme; use App\Entity\Domain; use App\Entity\DomainEvent; use App\Entity\WatchList; use App\Entity\WatchListTrigger; -use App\Message\ProcessDomainTrigger; -use App\Notifier\DomainOrderErrorNotification; -use App\Notifier\DomainOrderNotification; +use App\Message\SendDomainEventNotif; use App\Notifier\DomainUpdateNotification; use App\Repository\DomainRepository; use App\Repository\WatchListRepository; use App\Service\StatService; -use Psr\Cache\CacheItemPoolInterface; use Psr\Log\LoggerInterface; -use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Messenger\Attribute\AsMessageHandler; @@ -28,24 +23,20 @@ use Symfony\Component\Notifier\Notification\ChatNotificationInterface; use Symfony\Component\Notifier\Recipient\Recipient; use Symfony\Component\Notifier\Transport\AbstractTransportFactory; use Symfony\Component\Notifier\Transport\Dsn; -use Symfony\Contracts\HttpClient\HttpClientInterface; #[AsMessageHandler] -final readonly class ProcessDomainTriggerHandler +final readonly class SendDomainEventNotifHandler { private Address $sender; public function __construct( string $mailerSenderEmail, string $mailerSenderName, - private WatchListRepository $watchListRepository, - private DomainRepository $domainRepository, - private KernelInterface $kernel, private LoggerInterface $logger, - private HttpClientInterface $client, private MailerInterface $mailer, - private CacheItemPoolInterface $cacheItemPool, - private StatService $statService + private StatService $statService, + private DomainRepository $domainRepository, + private WatchListRepository $watchListRepository ) { $this->sender = new Address($mailerSenderEmail, $mailerSenderName); } @@ -55,52 +46,13 @@ final readonly class ProcessDomainTriggerHandler * @throws \Exception * @throws ExceptionInterface */ - public function __invoke(ProcessDomainTrigger $message): void + public function __invoke(SendDomainEventNotif $message): void { /** @var WatchList $watchList */ $watchList = $this->watchListRepository->findOneBy(['token' => $message->watchListToken]); /** @var Domain $domain */ $domain = $this->domainRepository->findOneBy(['ldhName' => $message->ldhName]); - $connector = $watchList->getConnector(); - if (null !== $connector && $domain->getDeleted()) { - $this->logger->notice('Watchlist {watchlist} is linked to connector {connector}. A purchase attempt will be made for domain name {ldhName} with provider {provider}.', [ - 'watchlist' => $message->watchListToken, - 'connector' => $connector->getId(), - 'ldhName' => $message->ldhName, - 'provider' => $connector->getProvider()->value, - ]); - try { - $provider = $connector->getProvider(); - if (null === $provider) { - throw new \Exception('Provider not found'); - } - - $connectorProviderClass = $provider->getConnectorProvider(); - - /** @var AbstractProvider $connectorProvider */ - $connectorProvider = new $connectorProviderClass($connector->getAuthData(), $this->client, $this->cacheItemPool, $this->kernel); - - $connectorProvider->orderDomain($domain, $this->kernel->isDebug()); - - $notification = (new DomainOrderNotification($this->sender, $domain, $connector)); - $this->mailer->send($notification->asEmailMessage(new Recipient($watchList->getUser()->getEmail()))->getMessage()); - $this->sendChatNotification($watchList, $notification); - - $this->statService->incrementStat('stats.domain.purchased'); - } catch (\Throwable) { - $this->logger->warning('Unable to complete purchase. An error message is sent to user {username}.', [ - 'username' => $watchList->getUser()->getUserIdentifier(), - ]); - - $notification = (new DomainOrderErrorNotification($this->sender, $domain)); - $this->mailer->send($notification->asEmailMessage(new Recipient($watchList->getUser()->getEmail()))->getMessage()); - $this->sendChatNotification($watchList, $notification); - - $this->statService->incrementStat('stats.domain.purchase.failed'); - } - } - /** @var DomainEvent $event */ foreach ($domain->getEvents()->filter(fn ($event) => $message->updatedAt < $event->getDate() && $event->getDate() < new \DateTime()) as $event) { $watchListTriggers = $watchList->getWatchListTriggers() @@ -120,7 +72,7 @@ final readonly class ProcessDomainTriggerHandler if (TriggerAction::SendEmail == $watchListTrigger->getAction()) { $this->mailer->send($notification->asEmailMessage($recipient)->getMessage()); } elseif (TriggerAction::SendChat == $watchListTrigger->getAction()) { - $this->sendChatNotification($watchList, $notification); + $this->sendChatNotification($watchList, $notification, $this->logger); } $this->statService->incrementStat('stats.alert.sent'); @@ -131,7 +83,7 @@ final readonly class ProcessDomainTriggerHandler /** * @throws \Symfony\Component\Notifier\Exception\TransportExceptionInterface */ - private function sendChatNotification(WatchList $watchList, ChatNotificationInterface $notification): void + public static function sendChatNotification(WatchList $watchList, ChatNotificationInterface $notification, LoggerInterface $logger): void { $webhookDsn = $watchList->getWebhookDsn(); if (null !== $webhookDsn && 0 !== count($webhookDsn)) { @@ -147,13 +99,13 @@ final readonly class ProcessDomainTriggerHandler $transportFactory = new $transportFactoryClass(); try { $transportFactory->create($dsn)->send($notification->asChatMessage(new Recipient())); - $this->logger->info('Chat message sent with {schema} for Watchlist {token}', + $logger->info('Chat message sent with {schema} for Watchlist {token}', [ 'scheme' => $webhookScheme->name, 'token' => $watchList->getToken(), ]); } catch (\Throwable) { - $this->logger->error('Unable to send a chat message to {scheme} for Watchlist {token}', + $logger->error('Unable to send a chat message to {scheme} for Watchlist {token}', [ 'scheme' => $webhookScheme->name, 'token' => $watchList->getToken(), diff --git a/src/MessageHandler/ProcessWatchListTriggerHandler.php b/src/MessageHandler/UpdateDomainsFromWatchlistHandler.php similarity index 83% rename from src/MessageHandler/ProcessWatchListTriggerHandler.php rename to src/MessageHandler/UpdateDomainsFromWatchlistHandler.php index c5c77fb..b651b00 100644 --- a/src/MessageHandler/ProcessWatchListTriggerHandler.php +++ b/src/MessageHandler/UpdateDomainsFromWatchlistHandler.php @@ -4,8 +4,9 @@ namespace App\MessageHandler; use App\Entity\Domain; use App\Entity\WatchList; -use App\Message\ProcessDomainTrigger; -use App\Message\ProcessWatchListTrigger; +use App\Message\OrderDomain; +use App\Message\SendDomainEventNotif; +use App\Message\UpdateDomainsFromWatchlist; use App\Notifier\DomainUpdateErrorNotification; use App\Repository\WatchListRepository; use App\Service\RDAPService; @@ -19,7 +20,7 @@ use Symfony\Component\Mime\Address; use Symfony\Component\Notifier\Recipient\Recipient; #[AsMessageHandler] -final readonly class ProcessWatchListTriggerHandler +final readonly class UpdateDomainsFromWatchlistHandler { private Address $sender; @@ -40,7 +41,7 @@ final readonly class ProcessWatchListTriggerHandler * @throws \Exception * @throws ExceptionInterface */ - public function __invoke(ProcessWatchListTrigger $message): void + public function __invoke(UpdateDomainsFromWatchlist $message): void { /** @var WatchList $watchList */ $watchList = $this->watchListRepository->findOneBy(['token' => $message->watchListToken]); @@ -71,7 +72,11 @@ final readonly class ProcessWatchListTriggerHandler $this->mailer->send($email->getMessage()); } - $this->bus->dispatch(new ProcessDomainTrigger($watchList->getToken(), $domain->getLdhName(), $updatedAt)); + $this->bus->dispatch(new SendDomainEventNotif($watchList->getToken(), $domain->getLdhName(), $updatedAt)); + + if (null !== $watchList->getConnector() && $domain->getDeleted()) { + $this->bus->dispatch(new OrderDomain($watchList->getToken(), $domain->getLdhName(), $updatedAt)); + } } } }