Save the time emails are sent

Author: silverbackdan

features/bootstrap/DoctrineContext.php

@@ -280,8 +280,7 @@ public function theUserHasANewEmailAddress(string $emailAddress, string $verific
         $user
             ->setNewEmailAddress($emailAddress)
             ->setNewEmailConfirmationToken($this->passwordHasher->hashPassword($user, $verificationToken))
-            ->setNewEmailAddressChangeRequestedAt(new \DateTime($emailSentAt))
-        ;
+            ->setNewEmailAddressChangeRequestedAt(new \DateTime($emailSentAt));
         $this->manager->flush();
     }
 

src/Action/User/PasswordRequestAction.php

@@ -53,10 +53,6 @@ public function __invoke(Request $request, string $username)
 
         $this->entityManager->flush();
         $passwordResetSuccess = $this->mailer->sendPasswordResetEmail($user);
-        if ($passwordResetSuccess) {
-            $user->setPasswordRequestedAt(new \DateTime());
-            $this->entityManager->flush();
-        }
 
         $response = new Response(null, $passwordResetSuccess ? Response::HTTP_OK : Response::HTTP_SERVICE_UNAVAILABLE);
         $response->setCache([

src/Helper/User/UserMailer.php

@@ -13,6 +13,7 @@
 
 namespace Silverback\ApiComponentsBundle\Helper\User;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Psr\Container\ContainerInterface;
 use Silverback\ApiComponentsBundle\Entity\User\AbstractUser;
 use Silverback\ApiComponentsBundle\Exception\MailerTransportException;
@@ -47,20 +48,35 @@ public function sendPasswordResetEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(PasswordResetEmailFactory::class)->create($user, $this->context);
 
+        if ($email) {
+            $user->setPasswordRequestedAt(new \DateTime());
+            $this->container->get(EntityManagerInterface::class)->flush();
+        }
+
         return $this->send($email);
     }
 
     public function sendChangeEmailConfirmationEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(ChangeEmailConfirmationEmailFactory::class)->create($user, $this->context);
 
+        if ($email) {
+            $user->setNewEmailAddressChangeRequestedAt(new \DateTime());
+            $this->container->get(EntityManagerInterface::class)->flush();
+        }
+
         return $this->send($email);
     }
 
     public function sendEmailVerifyEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(VerifyEmailFactory::class)->create($user, $this->context);
 
+        if ($email) {
+            $user->setEmailAddressVerificationRequestedAt(new \DateTime());
+            $this->container->get(EntityManagerInterface::class)->flush();
+        }
+
         return $this->send($email);
     }
 

src/Resources/config/services.php

@@ -1193,6 +1193,7 @@
                     PasswordChangedEmailFactory::class => new Reference(PasswordChangedEmailFactory::class),
                     VerifyEmailFactory::class => new Reference(VerifyEmailFactory::class),
                     'logger' => new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+                    new Reference(EntityManagerInterface::class),
                 ]),
                 '', // injected in dependency injection
             ]

tests/Helper/User/UserMailerTest.php

@@ -13,6 +13,7 @@
 
 namespace Silverback\ApiComponentsBundle\Tests\Helper\User;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Monolog\Logger;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -96,8 +97,10 @@ public function test_exception_thrown_if_mailer_send_throws_exception(): void
         };
         $templateEmail = new TemplatedEmail();
 
+        $additionalExpectations = $this->createEmMockExpectation();
+
         $loggerMock = $this->createMock(Logger::class);
-        $factoryMock = $this->getFactoryFromContainerMock(PasswordResetEmailFactory::class, [['logger', $loggerMock]]);
+        $factoryMock = $this->getFactoryFromContainerMock(PasswordResetEmailFactory::class, [...$additionalExpectations, ['logger', $loggerMock]]);
 
         $factoryMock
             ->expects(self::once())
@@ -126,7 +129,9 @@ public function test_send_password_reset_email(): void
             protected ?string $username = 'test_send_password_reset_email';
         };
 
-        $this->expectFactoryCallAndSendMailerMethod(PasswordResetEmailFactory::class, $user);
+        $additionalExpectations = $this->createEmMockExpectation();
+
+        $this->expectFactoryCallAndSendMailerMethod(PasswordResetEmailFactory::class, $user, $additionalExpectations);
 
         $this->userMailer->sendPasswordResetEmail($user);
     }
@@ -137,7 +142,9 @@ public function test_send_change_email_verification_email(): void
             protected ?string $username = 'test_send_change_email_verification_email';
         };
 
-        $this->expectFactoryCallAndSendMailerMethod(ChangeEmailConfirmationEmailFactory::class, $user);
+        $additionalExpectations = $this->createEmMockExpectation();
+
+        $this->expectFactoryCallAndSendMailerMethod(ChangeEmailConfirmationEmailFactory::class, $user, $additionalExpectations);
 
         $this->userMailer->sendChangeEmailConfirmationEmail($user);
     }
@@ -186,11 +193,11 @@ public function test_send_password_changed_email(): void
         $this->userMailer->sendPasswordChangedEmail($user);
     }
 
-    private function expectFactoryCallAndSendMailerMethod(string $factoryClass, AbstractUser $user): void
+    private function expectFactoryCallAndSendMailerMethod(string $factoryClass, AbstractUser $user, array $additionalExpectations = []): void
     {
         $templateEmail = new TemplatedEmail();
 
-        $factoryMock = $this->getFactoryFromContainerMock($factoryClass);
+        $factoryMock = $this->getFactoryFromContainerMock($factoryClass, $additionalExpectations);
 
         $factoryMock
             ->expects(self::once())
@@ -201,6 +208,19 @@ private function expectFactoryCallAndSendMailerMethod(string $factoryClass, Abst
         $this->expectMailerSendMethod($templateEmail);
     }
 
+    private function createEmMockExpectation(): array
+    {
+        $emMock = $this->createMock(EntityManagerInterface::class);
+        $emMock->expects(self::once())->method('flush');
+
+        return [
+            [
+                EntityManagerInterface::class,
+                $emMock,
+            ],
+        ];
+    }
+
     private function getFactoryFromContainerMock(string $factory, array $additionalExpectations = []): MockObject
     {
         $factoryMock = $this->createMock(AbstractUserEmailFactory::class);