new: usr: a new feature came up - the abandoned plays can be restored, if both users are registered users #7

src/Controller/GameController.php

@@ -12,16 +12,15 @@ namespace App\Controller;
 
 use App\Entity\ContactMessage;
 use App\Form\ContactFormType;
+use App\Service\Email\SendContactMailService;
+use App\Service\MercureJwtService;
+use App\Service\ResolveUserNamesService;
 use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
@@ -40,14 +39,12 @@ class GameController extends AbstractController
 {
     public function __construct(
         #[Autowire(env: 'APP_ENV')]
-        private readonly string          $env,
+        private readonly string                  $env,
         #[Autowire(env: 'MERCURE_PUBLIC_URL')]
-        private readonly string          $mercurePublicUrl,
-        #[Autowire(env: 'MERCURE_SUBSCRIBER_JWT')]
-        private readonly string          $mercureSubscriberJwt,
-        #[Autowire(env: 'APP_CONTACT_MAIL_ADDRESS')]
-        private readonly string          $appContactMailAddress,
-        private readonly LoggerInterface $logger,
+        private readonly string                  $mercurePublicUrl,
+        private readonly MercureJwtService       $mercureJwtService,
+        private readonly ResolveUserNamesService $opponentNameService,
+        private readonly SendContactMailService  $contactMailService,
     ) {
     }
 
@@ -59,12 +56,15 @@ class GameController extends AbstractController
 
     #[Route('/play', name: 'MineSeekerBundle_gamePlay')]
     #[Route('/play/{gameAssoc}', name: 'MineSeekerBundle_gamePlayWId')]
-    public function play(): Response
+    public function play(?string $gameAssoc = null): Response
     {
         return $this->render('Game/play.html.twig', [
             'env'                    => $this->env,
             'mercure_hub_url'        => $this->mercurePublicUrl,
-            'mercure_subscriber_jwt' => $this->mercureSubscriberJwt,
+            'mercure_subscriber_jwt' => $this->mercureJwtService->mintSubscriberToken(
+                $gameAssoc ?? '', $this->opponentNameService->resolveUserName(),
+            ),
+            'opponent_name'          => $this->opponentNameService->opponentName($gameAssoc),
         ]);
     }
 
@@ -92,9 +92,11 @@ class GameController extends AbstractController
 
         if ($form->isSubmitted() && $form->isValid()) {
             $contactMessage->setIpAddress($request->getClientIp());
+
             $em->persist($contactMessage);
             $em->flush();
-            $this->sendMail($mailer, $contactMessage);
+
+            $this->contactMailService->send($contactMessage);
             $this->addFlash('contact_success', 'Thank you for your message! We will get back to you soon.');
 
             return $this->redirectToRoute('MineSeekerBundle_contact');
@@ -116,31 +118,4 @@ class GameController extends AbstractController
     {
         return $this->render('Official/rules.html.twig');
     }
-
-    public function sendMail(MailerInterface $mailer, ContactMessage $contactMessage): void
-    {
-        try {
-            $mailer->send(
-                new TemplatedEmail()
-                    ->from('noreply@mineseeker.hu')
-                    ->to($this->appContactMailAddress)
-                    ->replyTo($contactMessage->getEmail())
-                    ->subject('New Contact Message from ' . $contactMessage->getName())
-                    ->htmlTemplate('emails/contact_notification.html.twig')
-                    ->context(['message' => $contactMessage])
-            );
-        } catch (\Exception $e) {
-            $this->logger->error('Failed to send contact notification email: ' . $e->getMessage(), [
-                'exception' => $e,
-                'message'   => $contactMessage,
-            ]);
-            throw new RuntimeException('Failed to send contact notification email: ' . $e->getMessage());
-        } catch (TransportExceptionInterface $e) {
-            $this->logger->error('Failed to send contact notification email: ' . $e->getMessage(), [
-                'exception' => $e,
-                'message'   => $contactMessage,
-            ]);
-            throw new RuntimeException('Failed to send contact notification email: ' . $e->getMessage());
-        }
-    }
 }