feat: adds step to define filter in getting started process

src/Base/Framework/Controller/AlertController.php

@@ -2,7 +2,7 @@
 
 namespace App\Base\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;

src/Base/Service/Broadcaster.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\Base\Service;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;

src/Download/Framework/Controller/ApiController.php

@@ -2,9 +2,8 @@
 
 namespace App\Download\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
-use App\Download\Action\Handler\DownloadSeasonHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
@@ -13,8 +12,6 @@ use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\User\Dto\UserPreferencesFactory;
-use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;

src/Monitor/Framework/Controller/ApiController.php

@@ -2,7 +2,7 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;

src/Torrentio/Framework/Controller/WebController.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;

src/Torrentio/Result/ResultFactory.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Result;
 
-use App\Base\Util\CountryLanguages;
+use App\User\Database\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory

src/Twig/Components/Filter.php

@@ -3,7 +3,7 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
-use App\Base\Util\QualityList;
+use App\User\Database\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;

src/User/Database/CountryCodes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class CountryCodes
 {

src/User/Database/CountryLanguages.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class CountryLanguages
 {
@@ -137,4 +137,13 @@ class CountryLanguages
 
         return $countryLanguages[$countryName] ?? null;
     }
+
+    public static function asSelectOptions(): array
+    {
+        $result = [];
+        foreach (static::$languages as $language) {
+            $result[$language] = $language;
+        }
+        return $result;
+    }
 }

src/User/Database/ProviderList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class ProviderList
 {
@@ -23,4 +23,13 @@ class ProviderList
     {
         return self::$providers;
     }
+
+    public static function asSelectOptions(): array
+    {
+        $result = [];
+        foreach (static::$providers as $provider) {
+            $result[$provider] = $provider;
+        }
+        return $result;
+    }
 }

src/User/Database/QualityList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class QualityList
 {
@@ -100,6 +100,15 @@ class QualityList
         return array_search($key, self::$qualities) ?? null;
     }
 
+    public static function asSelectOptions(): array
+    {
+        $result = [];
+        foreach (array_keys(static::$qualities) as $quality) {
+            $result[$quality] = $quality;
+        }
+        return $result;
+    }
+
     public static function getAsReverseMap(): array
     {
         $results = [];

src/User/Framework/Controller/Web/PreferencesController.php

@@ -4,14 +4,16 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
-use App\Base\Util\Broadcaster;
-use App\Base\Util\CountryLanguages;
-use App\Base\Util\ProviderList;
-use App\Base\Util\QualityList;
+use App\Base\Service\Broadcaster;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
+use App\User\Database\CountryLanguages;
+use App\User\Database\ProviderList;
+use App\User\Database\QualityList;
+use App\User\Dto\UserPreferencesFactory;
+use App\User\Framework\Form\GettingStartedFilterForm;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -41,6 +43,7 @@ class PreferencesController extends AbstractController
                 'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
+                'filterForm' => $this->createForm(GettingStartedFilterForm::class, (array) UserPreferencesFactory::createFromUser($this->getUser())),
             ]
         );
     }
@@ -72,6 +75,7 @@ class PreferencesController extends AbstractController
                 'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
+                'filterForm' => $this->createForm(GettingStartedFilterForm::class ?? null),
             ]
         );
     }

src/User/Framework/Controller/Web/RegistrationController.php

@@ -5,30 +5,22 @@ namespace App\User\Framework\Controller\Web;
 use App\User\Action\Command\RegisterUserCommand;
 use App\User\Action\Handler\RegisterUserHandler;
 use App\User\Framework\Entity\User;
+use App\User\Framework\Form\GettingStartedFilterForm;
 use App\User\Framework\Form\RegistrationFormType;
-use App\User\Framework\Pipeline\GettingStarted\AddPreferencesToDatabase;
-use App\User\Framework\Pipeline\GettingStarted\GettingStartedInput;
-use App\User\Framework\Pipeline\GettingStarted\MigrateDatabase;
-use App\User\Framework\Repository\PreferencesRepository;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
-use League\Pipeline\Pipeline;
-use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
 class RegistrationController extends AbstractController
 {
     public function __construct(private readonly RegisterUserHandler $registerUserHandler,
-        private readonly RequestStack $requestStack
-    )
-    {
-    }
+        private readonly RequestStack $requestStack,
+    ) {}
 
     #[Route('/register', name: 'app_register')]
     public function register(
@@ -57,7 +49,7 @@ class RegistrationController extends AbstractController
     }
 
     #[Route(path: '/getting-started', name: 'app_getting_started')]
-    public function gettingStarted(Request $request, Security $security, UserRepository $userRepository, PreferencesRepository $preferencesRepository, KernelInterface $kernel, LoggerInterface $logger): Response
+    public function gettingStarted(Request $request, Security $security, UserRepository $userRepository): Response
     {
         if ((new ArrayCollection($userRepository->findAll()))->count() !== 0) {
             return $this->redirectToRoute('app_index');
@@ -73,14 +65,42 @@ class RegistrationController extends AbstractController
                 password: $form->get('plainPassword')->getData(),
             ));
 
-            $security->login($user->user);
+            $security->login($user->user, 'form_login');
             $this->requestStack->getCurrentRequest()->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
 
-            return $this->redirectToRoute('app_index');
+            return $this->redirectToRoute('app_getting_started_filter');
         }
 
-        return $this->render('user/getting-started.html.twig', [
+        return $this->render('user/getting_started/register-user.html.twig', [
             'registrationForm' => $form,
         ]);
     }
+
+    #[Route(path: '/getting-started/filter', name: 'app_getting_started_filter')]
+    public function gettingStartedPreferences(Request $request, UserRepository $userRepository): Response
+    {
+        if ((new ArrayCollection($userRepository->findAll()))->count() !== 0) {
+            return $this->redirectToRoute('app_index');
+        }
+
+        $form = $this->createForm(GettingStartedFilterForm::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            foreach ($form->getData() as $preference => $value) {
+                if (null !== $value) {
+                    $this->getUser()->updateUserPreference($preference, $value);
+                }
+            }
+            $userRepository->getEntityManager()->flush();
+            return $this->redirectToRoute('app_index');
+        }
+
+        return $this->render(
+            'user/getting_started/filter.html.twig',
+            [
+                'form' => $form,
+            ]
+        );
+    }
 }

src/User/Framework/EventListener/LoginSuccessListener.php

@@ -3,7 +3,7 @@
 namespace App\User\Framework\EventListener;
 
 use App\Base\ConfigResolver;
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;

src/User/Framework/Form/GettingStartedFilterForm.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\User\Framework\Form;
+
+use Aimeos\Map;
+use App\User\Database\CountryLanguages;
+use App\User\Database\ProviderList;
+use App\User\Database\QualityList;
+use App\User\Framework\Repository\PreferenceOptionRepository;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class GettingStartedFilterForm extends AbstractType
+{
+    public function __construct(
+        private readonly PreferenceOptionRepository $preferenceOptionRepository,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $this->addChoiceField($builder, 'language', CountryLanguages::asSelectOptions());
+        $this->addChoiceField($builder, 'quality', QualityList::asSelectOptions());
+        $this->addChoiceField($builder, 'provider', ProviderList::asSelectOptions());
+        $this->addChoiceField($builder, 'resolution', $this->getPreferenceChoices('resolution'));
+        $this->addChoiceField($builder, 'codec', $this->getPreferenceChoices('codec'));
+    }
+
+    private function addChoiceField(FormBuilderInterface $builder, string $fieldName, array $choices): void
+    {
+        $question = [
+            'attr' => ['class' => 'w-full text-input mb-4'],
+            'label_attr' => ['class' => 'w-full block font-semibold'],
+            'choices' => $this->addDefaultChoice($choices),
+        ];
+        $builder->add($fieldName, ChoiceType::class, $question);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([]);
+    }
+
+    private function getPreferenceChoices(string $preference): array
+    {
+        $options = $this->preferenceOptionRepository->findBy(['preference' => $preference]);
+        $result = [];
+        foreach ($options as $item) {
+            $result[$item->getName()] = $item->getId();
+        }
+        return $result;
+    }
+
+    private function addDefaultChoice(array $choices): iterable
+    {
+        return ['n/a' => null] + $choices;
+    }
+}

src/User/Framework/Form/RegistrationFormType.php

@@ -27,7 +27,7 @@ class RegistrationFormType extends AbstractType
                         'message' => 'Please enter a password',
                     ]),
                     new Length([
-                        'min' => 6,
+                        'min' => 8,
                         'minMessage' => 'Your password should be at least {{ limit }} characters',
                         // max length allowed by Symfony for security reasons
                         'max' => 4096,

templates/user/getting_started/filter.html.twig

@@ -0,0 +1,20 @@
+{% extends 'bare.html.twig' %}
+
+{% block title %}Getting Started — Torsearch{% endblock %}
+
+{% block body %}
+    <div class="flex flex-col bg-orange-500/50 p-4 rounded-lg gap-4 w-full md:w-[420px] border-orange-500 border-2 text-gray-50 animate-fade">
+        <h2 class="text-2xl text-bold text-center text-gray-50">Getting Started</h2>
+        <p class="mb-1">Now let's create your first Filter.</p>
+{#        <p class="mb-2 text-sm">Your filter will be pre-applied to your results, so you're only shown what you want to see. Don't worry, though, you can toggle each filter option afterwards, so you can see the rest of the results.</p>#}
+
+        {{ form_start(form) }}
+        {{ form_row(form.language) }}
+        {{ form_row(form.quality) }}
+        {{ form_row(form.provider) }}
+        {{ form_row(form.resolution) }}
+        {{ form_row(form.codec) }}
+        <button class="submit-button">Save</button>
+        {{ form_end(form) }}
+    </div>
+{% endblock %}

templates/user/getting_started/register-user.html.twig

@@ -3,7 +3,7 @@
 {% block title %}Getting Started — Torsearch{% endblock %}
 
 {% block body %}
-    <div class="flex flex-col bg-orange-500/50 p-4 rounded-lg gap-4 w-full md:w-[420px] border-orange-500 border-2 text-gray-50">
+    <div class="flex flex-col bg-orange-500/50 p-4 rounded-lg gap-4 w-full md:w-[420px] border-orange-500 border-2 text-gray-50 animate-fade">
         <h2 class="text-2xl text-bold text-center text-gray-50">Getting Started</h2>
         <p class="mb-2">Let's get started by creating your first User.</p>
 

templates/user/login.html.twig

@@ -3,7 +3,7 @@
 {% block title %}Log in — Torsearch{% endblock %}
 
 {% block body %}
-    <div class="flex flex-col bg-orange-500/50 p-4 rounded-lg gap-4 w-full md:w-[420px] border-orange-500 border-2 text-gray-50">
+    <div class="flex flex-col bg-orange-500/50 p-4 rounded-lg gap-4 w-full md:w-[420px] border-orange-500 border-2 text-gray-50 animate-fade">
         <h2 class="text-xl font-bold">Login</h2>
         <form method="post" class="flex flex-col gap-2">
             {% if error %}