fix(repository) Update filter usage in repository

meeio-app · Nov 22, 2024 · 6e8a123 · 6e8a123
1 parent 720db66
commit 6e8a123
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 39 deletions.
diff --git a/src/Controller/Flashcard/FlashcardBehaviorController.php b/src/Controller/Flashcard/FlashcardBehaviorController.php
@@ -4,7 +4,6 @@
 
 namespace App\Controller\Flashcard;
 
-use App\Attribute\Body;
 use App\Attribute\RelativeToEntity;
 use App\Attribute\Resource;
 use App\Controller\AbstractRestController;
@@ -17,7 +16,6 @@
 use App\Modifier\Modifier;
 use App\Modifier\Transformer\EntityByIdTransformer;
 use App\Modifier\Transformer\EnumTransformer;
-use App\OptionsResolver\SpacedRepetitionOptionsResolver;
 use App\Repository\FlashcardRepository;
 use App\Repository\ReviewRepository;
 use App\SpacedRepetition\Fsrs4_5Algorithm;
@@ -39,10 +37,8 @@ class FlashcardBehaviorController extends AbstractRestController
     #[Route('/flashcards/{id}/review', name: 'review_flashcard', methods: ['POST'], requirements: ['id' => Regex::INTEGER])]
     public function reviewFlashcard(
         EntityManagerInterface $em,
-        SpacedRepetitionOptionsResolver $spacedRepetitionOptionsResolver,
         SpacedRepetitionScheduler $spacedRepetitionScheduler,
         #[Resource(FlashcardVoter::OWNER)] Flashcard $flashcard,
-        #[Body] mixed $body,
     ): JsonResponse {
         if ($flashcard->getNextReview() > (new \DateTimeImmutable())) {
             throw new BadRequestHttpException(\sprintf('You can not review the flashcard with id %d yet. The next review is scheduled for %s', $flashcard->getId(), $flashcard->getNextReview()->format('jS \\of F Y')));

diff --git a/src/Controller/Security/PasswordForgottenController.php b/src/Controller/Security/PasswordForgottenController.php
@@ -10,7 +10,6 @@
 use App\Entity\PasswordReset;
 use App\Exception\MaxTriesReachedException;
 use App\Message\SendTextEmailMessage;
-use App\OptionsResolver\UserOptionsResolver;
 use App\Repository\PasswordResetRepository;
 use App\Repository\UserRepository;
 use App\UniqueGenerator\UniqueTokenGenerator;
@@ -31,7 +30,6 @@ class PasswordForgottenController extends AbstractRestController
     #[Route('/reset-password/request', name: 'password_reset_request', methods: ['POST'])]
     public function requestPasswordReset(
         EntityManagerInterface $em,
-        UserOptionsResolver $userOptionsResolver,
         UserRepository $userRepository,
         PasswordResetRepository $passwordResetRepository,
         UniqueTokenGenerator $uniqueTokenGenerator,

diff --git a/src/Repository/FlashcardRepository.php b/src/Repository/FlashcardRepository.php
@@ -60,15 +60,15 @@ public function paginateAndFilterAll(Page $page, ?Filter $filter, ?User $user =
                 ->setParameter('user', $user);
         }
 
-        if ($filter->isFullyConfigured()) {
+        if ($filter !== null) {
             $query
                 ->andWhere("f.{$filter->filter} {$filter->operator->getDoctrineNotation()} :query")
                 ->setParameter('query', $filter->getDoctrineParameter());
         }
 
         $query
             ->addOrderBy("CASE WHEN f.{$page->sort} IS NULL THEN 1 ELSE 0 END", 'ASC') // To put null values last
-            ->addOrderBy("f.{$page->sort}", $page->order);
+            ->addOrderBy("f.{$page->sort}", $page->order->value);
 
         return new Paginator($query, $page);
     }
@@ -82,14 +82,14 @@ public function paginateAndFilterByUnit(Page $page, ?Filter $filter, Unit $unit)
             ->where('f.unit = :unit')
             ->setParameter('unit', $unit);
 
-        if ($filter->isFullyConfigured()) {
+        if ($filter !== null) {
             $query
                 ->andWhere("f.{$filter->filter} {$filter->operator->getDoctrineNotation()} :query")
                 ->setParameter('query', $filter->getDoctrineParameter());
         }
 
         $query->addOrderBy("CASE WHEN f.{$page->sort} IS NULL THEN 1 ELSE 0 END", 'ASC')
-            ->addOrderBy("f.{$page->sort}", $page->order);
+            ->addOrderBy("f.{$page->sort}", $page->order->value);
 
         return new Paginator($query, $page);
     }

diff --git a/src/Repository/SessionRepository.php b/src/Repository/SessionRepository.php
@@ -35,15 +35,15 @@ public function paginateAndFilterAll(Page $page, ?Filter $filter, ?User $user =
                 ->setParameter('user', $user);
         }
 
-        if ($filter->isFullyConfigured()) {
+        if ($filter !== null) {
             $query
                 ->andWhere("s.{$filter->filter} {$filter->operator->getDoctrineNotation()} :query")
                 ->setParameter('query', $filter->getDoctrineParameter());
         }
 
         $query
             ->addOrderBy("CASE WHEN s.{$page->sort} IS NULL THEN 1 ELSE 0 END", 'ASC') // To put null values last
-            ->addOrderBy("s.{$page->sort}", $page->order);
+            ->addOrderBy("s.{$page->sort}", $page->order->value);
 
         return new Paginator($query, $page, VirtualHydrator::class);
     }

diff --git a/src/Repository/SettingRepository.php b/src/Repository/SettingRepository.php
@@ -17,29 +17,4 @@ public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Setting::class);
     }
-
-    //    /**
-    //     * @return Setting[] Returns an array of Setting objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('s')
-    //            ->andWhere('s.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('s.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?Setting
-    //    {
-    //        return $this->createQueryBuilder('s')
-    //            ->andWhere('s.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
 }
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
@@ -62,14 +62,14 @@ public function paginateAndFilterAll(Page $page, ?Filter $filter): Paginator
     {
         $query = $this->createQueryBuilder('u');
 
-        if ($filter->isFullyConfigured()) {
+        if ($filter !== null) {
             $query
                 ->andWhere("u.{$filter->filter} {$filter->operator->getDoctrineNotation()} :query")
                 ->setParameter('query', $filter->getDoctrineParameter());
         }
 
         $query->addOrderBy("CASE WHEN u.{$page->sort} IS NULL THEN 1 ELSE 0 END", 'ASC')
-            ->addOrderBy("u.{$page->sort}", $page->order);
+            ->addOrderBy("u.{$page->sort}", $page->order->value);
 
         return new Paginator($query, $page);
     }