Refactor elimination feature and improve backoffice usability

This commit introduces a refactored EliminationFactory for better modularity, updates the elimination preparation process, and adds functionality to view eliminations. Backoffice templates and forms have been reorganized, minor translations were corrected, and additional assets like styles and flashes were included for enhanced user experience.

src/Controller/Backoffice/BackofficeController.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Backoffice;
+
+use App\Controller\AbstractController;
+use App\Entity\Season;
+use App\Entity\User;
+use App\Form\CreateSeasonFormType;
+use App\Repository\SeasonRepository;
+use App\Service\QuizSpreadsheetService;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Attribute\AsController;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[AsController]
+#[IsGranted('ROLE_USER')]
+final class BackofficeController extends AbstractController
+{
+    public function __construct(
+        private readonly SeasonRepository $seasonRepository,
+        private readonly Security $security,
+    ) {}
+
+    #[Route('/backoffice/', name: 'app_backoffice_index')]
+    public function index(): Response
+    {
+        $user = $this->getUser();
+        \assert($user instanceof User);
+
+        $seasons = $this->security->isGranted('ROLE_ADMIN')
+            ? $this->seasonRepository->findAll()
+            : $this->seasonRepository->getSeasonsForUser($user);
+
+        return $this->render('backoffice/index.html.twig', [
+            'seasons' => $seasons,
+        ]);
+    }
+
+    #[Route('/backoffice/add', name: 'app_backoffice_season_add', priority: 10)]
+    public function addSeason(Request $request, EntityManagerInterface $em): Response
+    {
+        $season = new Season();
+        $form = $this->createForm(CreateSeasonFormType::class, $season);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $user = $this->getUser();
+            \assert($user instanceof User);
+
+            $season->addOwner($user);
+            $season->generateSeasonCode();
+
+            $em->persist($season);
+            $em->flush();
+
+            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+        }
+
+        return $this->render('backoffice/season_add.html.twig', ['form' => $form]);
+    }
+
+    #[Route('/backoffice/template', name: 'app_backoffice_template', priority: 10)]
+    public function getTemplate(QuizSpreadsheetService $excel): Response
+    {
+        $response = new StreamedResponse($excel->generateTemplate());
+        $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        $response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');
+
+        return $response;
+    }
+}

src/Controller/Backoffice/QuizController.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Backoffice;
+
+use App\Controller\AbstractController;
+use App\Entity\Quiz;
+use App\Entity\Season;
+use App\Repository\CandidateRepository;
+use App\Security\Voter\SeasonVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\AsController;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[AsController]
+#[IsGranted('ROLE_USER')]
+class QuizController extends AbstractController
+{
+    public function __construct(
+        private readonly CandidateRepository $candidateRepository,
+    ) {}
+
+    #[Route('/backoffice/season/{seasonCode}/quiz/{quiz}', name: 'app_backoffice_quiz')]
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    public function index(Season $season, Quiz $quiz): Response
+    {
+        return $this->render('backoffice/quiz.html.twig', [
+            'season' => $season,
+            'quiz' => $quiz,
+            'result' => $this->candidateRepository->getScores($quiz),
+        ]);
+    }
+
+    #[Route('/backoffice/season/{seasonCode}/quiz/{quiz}/enable', name: 'app_backoffice_enable')]
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): Response
+    {
+        $season->setActiveQuiz($quiz);
+        $em->flush();
+
+        if ($quiz instanceof Quiz) {
+            return $this->redirectToRoute('app_backoffice_quiz', ['seasonCode' => $season->getSeasonCode(), 'quiz' => $quiz->getId()]);
+        }
+
+        return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+    }
+}

src/Controller/Backoffice/SeasonController.php

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Backoffice;
+
+use App\Controller\AbstractController;
+use App\Entity\Candidate;
+use App\Entity\Quiz;
+use App\Entity\Season;
+use App\Enum\FlashType;
+use App\Form\AddCandidatesFormType;
+use App\Form\UploadQuizFormType;
+use App\Security\Voter\SeasonVoter;
+use App\Service\QuizSpreadsheetService;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\AsController;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+#[AsController]
+#[IsGranted('ROLE_USER')]
+class SeasonController extends AbstractController
+{
+    public function __construct(private readonly TranslatorInterface $translator, private EntityManagerInterface $em,
+    ) {}
+
+    #[Route('/backoffice/season/{seasonCode}', name: 'app_backoffice_season')]
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    public function index(Season $season): Response
+    {
+        return $this->render('backoffice/season.html.twig', [
+            'season' => $season,
+        ]);
+    }
+
+    #[Route('/backoffice/season/{seasonCode}/add_candidate', name: 'app_backoffice_add_candidates', priority: 10)]
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    public function addCandidates(Season $season, Request $request): Response
+    {
+        $form = $this->createForm(AddCandidatesFormType::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $candidates = $form->get('candidates')->getData();
+            foreach (explode("\r\n", (string) $candidates) as $candidate) {
+                $season->addCandidate(new Candidate($candidate));
+            }
+
+            $this->em->flush();
+
+            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+        }
+
+        return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
+    }
+
+    #[Route('/backoffice/season/{seasonCode}/add', name: 'app_backoffice_quiz_add', priority: 10)]
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    public function addQuiz(Request $request, Season $season, QuizSpreadsheetService $quizSpreadsheet): Response
+    {
+        $quiz = new Quiz();
+        $form = $this->createForm(UploadQuizFormType::class, $quiz);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            /* @var UploadedFile $sheet */
+            $sheet = $form->get('sheet')->getData();
+
+            $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
+
+            $quiz->setSeason($season);
+            $this->em->persist($quiz);
+            $this->em->flush();
+
+            $this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));
+
+            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+        }
+
+        return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);
+    }
+}

src/Controller/BackofficeController.php

@@ -1,167 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller;
-
-use App\Entity\Candidate;
-use App\Entity\Quiz;
-use App\Entity\Season;
-use App\Entity\User;
-use App\Enum\FlashType;
-use App\Form\AddCandidatesFormType;
-use App\Form\CreateSeasonFormType;
-use App\Form\UploadQuizFormType;
-use App\Repository\CandidateRepository;
-use App\Repository\SeasonRepository;
-use App\Security\Voter\SeasonVoter;
-use App\Service\QuizSpreadsheetService;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-#[AsController]
-#[IsGranted('ROLE_USER')]
-final class BackofficeController extends AbstractController
-{
-    public function __construct(
-        private readonly SeasonRepository $seasonRepository,
-        private readonly CandidateRepository $candidateRepository,
-        private readonly Security $security,
-        private readonly TranslatorInterface $translator,
-    ) {}
-
-    #[Route('/backoffice/', name: 'app_backoffice_index')]
-    public function index(): Response
-    {
-        $user = $this->getUser();
-        \assert($user instanceof User);
-
-        $seasons = $this->security->isGranted('ROLE_ADMIN')
-            ? $this->seasonRepository->findAll()
-            : $this->seasonRepository->getSeasonsForUser($user);
-
-        return $this->render('backoffice/index.html.twig', [
-            'seasons' => $seasons,
-        ]);
-    }
-
-    #[Route('/backoffice/add', name: 'app_backoffice_season_add', priority: 10)]
-    public function seasonAdd(Request $request, EntityManagerInterface $em): Response
-    {
-        $season = new Season();
-        $form = $this->createForm(CreateSeasonFormType::class, $season);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $user = $this->getUser();
-            \assert($user instanceof User);
-
-            $season->addOwner($user);
-            $season->generateSeasonCode();
-
-            $em->persist($season);
-            $em->flush();
-
-            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        return $this->render('backoffice/season_add.html.twig', ['form' => $form]);
-    }
-
-    #[Route('/backoffice/{seasonCode}', name: 'app_backoffice_season')]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function season(Season $season): Response
-    {
-        return $this->render('backoffice/season.html.twig', [
-            'season' => $season,
-        ]);
-    }
-
-    #[Route('/backoffice/{seasonCode}/{quiz}', name: 'app_backoffice_quiz')]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function quiz(Season $season, Quiz $quiz): Response
-    {
-        return $this->render('backoffice/quiz.html.twig', [
-            'season' => $season,
-            'quiz' => $quiz,
-            'result' => $this->candidateRepository->getScores($quiz),
-        ]);
-    }
-
-    #[Route('/backoffice/{seasonCode}/{quiz}/enable', name: 'app_backoffice_enable')]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): Response
-    {
-        $season->setActiveQuiz($quiz);
-        $em->flush();
-
-        return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-    }
-
-    #[Route('/backoffice/{seasonCode}/add_candidate', name: 'app_backoffice_add_candidates', priority: 10)]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function addCandidates(Season $season, Request $request, EntityManagerInterface $em): Response
-    {
-        $form = $this->createForm(AddCandidatesFormType::class);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $candidates = $form->get('candidates')->getData();
-            foreach (explode("\r\n", (string) $candidates) as $candidate) {
-                $season->addCandidate(new Candidate($candidate));
-            }
-
-            $em->flush();
-
-            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
-    }
-
-    #[Route('/backoffice/{seasonCode}/add', name: 'app_backoffice_quiz_add', priority: 10)]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function addQuiz(Request $request, Season $season, QuizSpreadsheetService $quizSpreadsheet, EntityManagerInterface $em): Response
-    {
-        $quiz = new Quiz();
-        $form = $this->createForm(UploadQuizFormType::class, $quiz);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /* @var UploadedFile $sheet */
-            $sheet = $form->get('sheet')->getData();
-
-            $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
-
-            $quiz->setSeason($season);
-            $em->persist($quiz);
-            $em->flush();
-
-            $this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));
-
-            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);
-    }
-
-    #[Route('/backoffice/template', name: 'app_backoffice_template', priority: 10)]
-    public function getTemplate(QuizSpreadsheetService $excel): Response
-    {
-        $response = new StreamedResponse($excel->generateTemplate());
-        $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        $response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');
-
-        return $response;
-    }
-}

src/Controller/LoginController.php

@@ -4,17 +4,19 @@ declare(strict_types=1);
 
 namespace App\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use App\Enum\FlashType;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 #[AsController]
 final class LoginController extends AbstractController
 {
     #[Route(path: '/login', name: 'app_login_login')]
-    public function login(AuthenticationUtils $authenticationUtils): Response
+    public function login(AuthenticationUtils $authenticationUtils, TranslatorInterface $translator): Response
     {
         // get the login error if there is one
         $error = $authenticationUtils->getLastAuthenticationError();
@@ -22,7 +24,11 @@ final class LoginController extends AbstractController
         // last username entered by the user
         $lastUsername = $authenticationUtils->getLastUsername();
 
-        return $this->render('login/login.html.twig', [
+        if ($error instanceof AuthenticationException) {
+            $this->addFlash(FlashType::Danger, $translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
+        }
+
+        return $this->render('backoffice/login/login.html.twig', [
             'last_username' => $lastUsername,
             'error' => $error,
         ]);

src/Controller/PrepareEliminationController.php

@@ -4,8 +4,10 @@ declare(strict_types=1);
 
 namespace App\Controller;
 
+use App\Entity\Elimination;
 use App\Entity\Quiz;
 use App\Entity\Season;
+use App\Factory\EliminationFactory;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -13,12 +15,19 @@ use Symfony\Component\Routing\Attribute\Route;
 final class PrepareEliminationController extends AbstractController
 {
     #[Route('/backoffice/elimination/{seasonCode}/{quiz}/prepare', name: 'app_prepare_elimination')]
-    public function index(Season $season, Quiz $quiz): Response
+    public function index(Season $season, Quiz $quiz, EliminationFactory $eliminationFactory): Response
     {
-        return $this->render('prepare_elimination/index.html.twig', [
+        $elimination = $eliminationFactory->createEliminationFromQuiz($quiz);
+
+        return $this->redirectToRoute('app_prepare_elimination_view', ['elimination' => $elimination->getId()]);
+    }
+
+    #[Route('/backoffice/elimination/{elimination}', name: 'app_prepare_elimination_view')]
+    public function viewElimination(Elimination $elimination): Response
+    {
+        return $this->render('backoffice/prepare_elimination/index.html.twig', [
             'controller_name' => 'PrepareEliminationController',
-            'season' => $season,
-            'quiz' => $quiz,
+            'elimination' => $elimination,
         ]);
     }
 }

src/Controller/RegistrationController.php

@@ -48,7 +48,7 @@ final class RegistrationController extends AbstractController
                 (new TemplatedEmail())
                     ->to((string) $user->getEmail())
                     ->subject($this->translator->trans('Please Confirm your Email'))
-                    ->htmlTemplate('registration/confirmation_email.html.twig')
+                    ->htmlTemplate('backoffice/registration/confirmation_email.html.twig')
             );
 
             $response = $security->login($user, 'form_login', 'main');
@@ -57,7 +57,7 @@ final class RegistrationController extends AbstractController
             return $response;
         }
 
-        return $this->render('registration/register.html.twig', [
+        return $this->render('backoffice/registration/register.html.twig', [
             'registrationForm' => $form,
         ]);
     }