Corrections Reminder

Controller/Reminder/ReminderAdminController.php

@@ -2,12 +2,9 @@
 
 namespace Lc\CaracoleBundle\Controller\Reminder;
 
-use App\Entity\Reminder\Reminder;
 use Lc\CaracoleBundle\Controller\AdminControllerTrait;
-use Lc\CaracoleBundle\Factory\Reminder\ReminderFactory;
 use Lc\CaracoleBundle\Resolver\MerchantResolver;
 use Lc\CaracoleBundle\Resolver\SectionResolver;
-use Lc\SovBundle\Container\Reminder\ReminderContainer;
 use Lc\SovBundle\Controller\Reminder\ReminderAdminController as SovReminderAdminController;
 
 class ReminderAdminController extends SovReminderAdminController
@@ -16,7 +13,7 @@ class ReminderAdminController extends SovReminderAdminController
 
     public function createEntity(string $crudAction = null, string $crudControllerFqcn = null, int $entityId = null)
     {
-        return $this->get(ReminderContainer::class)
+        return $this->getReminderContainer()
                 ->getFactory()
                 ->setMerchant($this->get(MerchantResolver::class)->getCurrent())
                 ->setSection($this->get(SectionResolver::class)->getCurrent())

Repository/Reminder/ReminderStore.php

@@ -16,13 +16,8 @@ class ReminderStore extends SovReminderStore
 
     public function filtersDefault(RepositoryQueryInterface $query): RepositoryQueryInterface
     {
-        if ($this->merchant) {
-            $query->filterByMerchant($this->merchant);
-        }
-
-        if ($this->section) {
-            $query->filterBySection($this->section);
-        }
+        $this->addFilterByMerchantOptionnal($query);
+        $this->addFilterBySectionOptionnal($query);
 
         return parent::filtersDefault($query);
     }