refacto

src/Service/Doctrine/FiltersConfigurationService.php

@@ -74,8 +74,8 @@ class FiltersConfigurationService
             return;
         }
 
-        $this->suspendDateTimeConstraintFilters();
-        $this->suspendActivityYearConstraintFilters();
+        $this->disabledFilters('date_time_filter');
+        $this->disabledFilters('activity_year_filter');
 
         $this->previousTimeConstraintState = false;
     }
@@ -86,31 +86,19 @@ class FiltersConfigurationService
      */
     private function timeFiltersAllReadyDisabled(): bool
     {
-        $filters = $this->entityManager->getFilters();
+        $filters = $this->getFilters();
         return !$filters->isEnabled('date_time_filter') && !$filters->isEnabled('activity_year_filter');
     }
 
     /**
-     * Suspend le filtre date_time_filter
+     * Suspend le filtre
      * @return void
      */
-    private function suspendDateTimeConstraintFilters(): void
+    private function disabledFilters(string $name): void
     {
-        $filters = $this->entityManager->getFilters();
+        $filters = $this->getFilters();
         /** @var AbstractTimeFilter $filter */
-        $dateTimeFilter = $filters->getFilter('date_time_filter');
-        $dateTimeFilter->setDisabled(true);
-    }
-
-    /**
-     * Suspend le filtre activity_year_filter
-     * @return void
-     */
-    private function suspendActivityYearConstraintFilters(): void
-    {
-        $filters = $this->entityManager->getFilters();
-        /** @var AbstractTimeFilter $filter */
-        $dateTimeFilter = $filters->getFilter('activity_year_filter');
+        $dateTimeFilter = $filters->getFilter($name);
         $dateTimeFilter->setDisabled(true);
     }
 
@@ -126,36 +114,22 @@ class FiltersConfigurationService
             throw new \RuntimeException('time constraint has not been suspended, can not be restored');
         }
 
-        $this->restoreDateTimeFilter();
-        $this->restoreActivityYearFilter();
+        $this->enabledFilter('date_time_filter');
+        $this->enabledFilter('activity_year_filter');
 
         $this->previousTimeConstraintState = null;
     }
 
     /**
-     * Restaure le filtre date_time_filter
-     * @return void
-     */
-    private function restoreDateTimeFilter(){
-        $filters = $this->entityManager->getFilters();
-
-        if ($filters->isEnabled('date_time_filter')) {
-            /** @var AbstractTimeFilter $filter */
-            $filter = $filters->getFilter('date_time_filter');
-            $filter->setDisabled($this->previousTimeConstraintState);
-        }
-    }
-
-    /**
-     * Restaure le filtre activity_year_filter
+     * Restaure le filtre
      * @return void
      */
-    private function restoreActivityYearFilter(){
-        $filters = $this->entityManager->getFilters();
+    private function enabledFilter(string $name){
+        $filters = $this->getFilters();
 
-        if ($filters->isEnabled('activity_year_filter')) {
+        if ($filters->isEnabled($name)) {
             /** @var AbstractTimeFilter $filter */
-            $filter = $filters->getFilter('activity_year_filter');
+            $filter = $filters->getFilter($name);
             $filter->setDisabled($this->previousTimeConstraintState);
         }
     }