[Customer] Extract customer enabling logic to custom handler

spec/Command/Customer/EnableCustomerSpec.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
+
+use PhpSpec\ObjectBehavior;
+
+final class EnableCustomerSpec extends ObjectBehavior
+{
+    function let(): void
+    {
+        $this->beConstructedWith('example@customer.com');
+    }
+
+    function it_has_email(): void
+    {
+        $this->email()->shouldReturn('example@customer.com');
+    }
+}

spec/EventListener/UserRegistrationListenerSpec.php

@@ -10,6 +10,7 @@
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
+use Sylius\ShopApiPlugin\Command\Customer\EnableCustomer;
 use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
 use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Event\CustomerRegistered;
@@ -51,9 +52,9 @@ function it_generates_and_sends_verification_token_if_channel_requires_verificat
     }
 
     function it_enables_user_if_channel_does_not_require_verification(
+        MessageBusInterface $bus,
         ChannelRepositoryInterface $channelRepository,
         UserRepositoryInterface $userRepository,
-        ObjectManager $userManager,
         ShopUserInterface $user,
         ChannelInterface $channel
     ): void {
@@ -62,10 +63,8 @@ function it_enables_user_if_channel_does_not_require_verification(
 
         $channel->isAccountVerificationRequired()->willReturn(false);
 
-        $user->enable()->shouldBeCalled();
-
-        $userManager->persist($user)->shouldBeCalled();
-        $userManager->flush()->shouldBeCalled();
+        $command = new EnableCustomer('shop@example.com');
+        $bus->dispatch($command)->willReturn(new Envelope($command))->shouldBeCalled();
 
         $this->handleUserVerification(new CustomerRegistered(
             'shop@example.com',

spec/Handler/Customer/EnableCustomerHandlerSpec.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace spec\Sylius\ShopApiPlugin\Handler\Customer;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Core\Model\ShopUserInterface;
+use Sylius\Component\User\Repository\UserRepositoryInterface;
+use Sylius\ShopApiPlugin\Command\Customer\EnableCustomer;
+
+final class EnableCustomerHandlerSpec extends ObjectBehavior
+{
+    function let(UserRepositoryInterface $userRepository): void
+    {
+        $this->beConstructedWith($userRepository);
+    }
+
+    function it_handles_enabling_user(UserRepositoryInterface $userRepository, ShopUserInterface $user): void
+    {
+        $userRepository->findOneByEmail('shop@example.com')->willReturn($user);
+
+        $user->enable()->shouldBeCalled();
+
+        $this(new EnableCustomer('shop@example.com'));
+    }
+
+    function it_throws_an_exception_if_user_cannot_be_found(UserRepositoryInterface $userRepository): void
+    {
+        $userRepository->findOneByEmail('shop@example.com')->willReturn(null);
+
+        $this->shouldThrow(\InvalidArgumentException::class)->during('__invoke', [
+            new EnableCustomer('shop@example.com'),
+        ]);
+    }
+}

src/Command/Customer/EnableCustomer.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ShopApiPlugin\Command\Customer;
+
+class EnableCustomer
+{
+    /** @var string */
+    protected $email;
+
+    public function __construct(string $email)
+    {
+        $this->email = $email;
+    }
+
+    public function email(): string
+    {
+        return $this->email;
+    }
+}

src/EventListener/UserRegistrationListener.php

@@ -4,10 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\EventListener;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Sylius\Component\User\Repository\UserRepositoryInterface;
+use Sylius\ShopApiPlugin\Command\Customer\EnableCustomer;
 use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
 use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Event\CustomerRegistered;
@@ -22,22 +21,10 @@ final class UserRegistrationListener
     /** @var ChannelRepositoryInterface */
     private $channelRepository;
 
-    /** @var UserRepositoryInterface */
-    private $userRepository;
-
-    /** @var ObjectManager */
-    private $userManager;
-
-    public function __construct(
-        MessageBusInterface $bus,
-        ChannelRepositoryInterface $channelRepository,
-        UserRepositoryInterface $userRepository,
-        ObjectManager $userManager
-    ) {
+    public function __construct(MessageBusInterface $bus, ChannelRepositoryInterface $channelRepository)
+    {
         $this->bus = $bus;
         $this->channelRepository = $channelRepository;
-        $this->userRepository = $userRepository;
-        $this->userManager = $userManager;
     }
 
     public function handleUserVerification(CustomerRegistered $event): void
@@ -48,12 +35,7 @@ public function handleUserVerification(CustomerRegistered $event): void
         Assert::isInstanceOf($channel, ChannelInterface::class);
 
         if (!$channel->isAccountVerificationRequired()) {
-            $user = $this->userRepository->findOneByEmail($event->email());
-            $user->enable();
-
-            // TODO: Get rid of implementation details here
-            $this->userManager->persist($user);
-            $this->userManager->flush();
+            $this->bus->dispatch(new EnableCustomer($event->email()));
 
             return;
         }

src/Handler/Customer/EnableCustomerHandler.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ShopApiPlugin\Handler\Customer;
+
+use Sylius\Component\Core\Model\ShopUserInterface;
+use Sylius\Component\User\Repository\UserRepositoryInterface;
+use Sylius\ShopApiPlugin\Command\Customer\EnableCustomer;
+use Webmozart\Assert\Assert;
+
+final class EnableCustomerHandler
+{
+    /** @var UserRepositoryInterface */
+    private $userRepository;
+
+    public function __construct(UserRepositoryInterface $userRepository)
+    {
+        $this->userRepository = $userRepository;
+    }
+
+    public function __invoke(EnableCustomer $event): void
+    {
+        /** @var ShopUserInterface|null $user */
+        $user = $this->userRepository->findOneByEmail($event->email());
+
+        Assert::notNull($user);
+
+        $user->enable();
+    }
+}

src/Resources/config/services/handler/customer.xml

@@ -51,5 +51,11 @@
             <argument type="service" id="sylius.shop_user.token_generator.email_verification"/>
             <tag name="messenger.message_handler" />
         </service>
+
+        <service id="sylius.shop_api_plugin.handler.enable_customer_handler"
+                 class="Sylius\ShopApiPlugin\Handler\Customer\EnableCustomerHandler">
+            <argument type="service" id="sylius.repository.shop_user"/>
+            <tag name="messenger.message_handler" />
+        </service>
     </services>
 </container>