Bläddra i källkod

post mr fixes

Olivier Massot 2 år sedan
förälder
incheckning
4f117e1bcd

+ 2 - 4
src/Repository/Access/AccessRepository.php

@@ -117,9 +117,7 @@ class AccessRepository extends ServiceEntityRepository implements UserLoaderInte
      */
     public function hasGotFunctionAtThisDate(Access $access, FunctionEnum $function, \DateTime $date): bool
     {
-        /** @var DatetimeFilter $filter */
-        $filter = $this->_em->getFilters()->getFilter('date_time_filter');
-        $filter->setDisabled(true);
+        $this->filtersConfigurationService->suspendTimeConstraintFilters();
 
         $qb = $this->createQueryBuilder('access');
         $qb
@@ -134,7 +132,7 @@ class AccessRepository extends ServiceEntityRepository implements UserLoaderInte
 
         $result = count($qb->getQuery()->getResult()) > 0;
 
-        $filter->setDisabled(false);
+        $this->filtersConfigurationService->restoreTimeConstraintFilters();
 
         return $result;
     }

+ 7 - 5
src/Repository/Booking/CourseRepository.php

@@ -6,13 +6,17 @@ namespace App\Repository\Booking;
 use App\Entity\Booking\Course;
 use App\Entity\Organization\Organization;
 use App\Filter\Doctrine\TimeConstraint\AbstractTimeFilter;
+use App\Service\Doctrine\FiltersConfigurationService;
 use DateTimeInterface;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 class CourseRepository extends ServiceEntityRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    public function __construct(
+        ManagerRegistry $registry,
+        private FiltersConfigurationService $filtersConfigurationService
+    )
     {
         parent::__construct($registry, Course::class);
     }
@@ -26,9 +30,7 @@ class CourseRepository extends ServiceEntityRepository
      */
     public function getCoursesToFrom(Organization $organization, DateTimeInterface $start, DateTimeInterface $end): array
     {
-        /** @var AbstractTimeFilter $filter */
-        $filter = $this->_em->getFilters()->getFilter('activity_year_filter');
-        $filter->setDisabled(true);
+        $this->filtersConfigurationService->suspendTimeConstraintFilters();
 
         $queryBuilder = $this->createQueryBuilder('course');
 
@@ -44,7 +46,7 @@ class CourseRepository extends ServiceEntityRepository
 
         $results = $queryBuilder->getQuery()->getResult();
 
-        $filter->setDisabled(false);
+        $this->filtersConfigurationService->restoreTimeConstraintFilters();
 
         return $results;
     }

+ 8 - 6
src/Repository/Education/EducationNotationRepository.php

@@ -6,12 +6,16 @@ namespace App\Repository\Education;
 use App\Entity\Education\EducationNotation;
 use App\Entity\Organization\Organization;
 use App\Filter\Doctrine\TimeConstraint\ActivityYearFilter;
+use App\Service\Doctrine\FiltersConfigurationService;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 class EducationNotationRepository extends ServiceEntityRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    public function __construct(
+        ManagerRegistry $registry,
+        private FiltersConfigurationService $filtersConfigurationService
+    )
     {
         parent::__construct($registry, EducationNotation::class);
     }
@@ -22,9 +26,7 @@ class EducationNotationRepository extends ServiceEntityRepository
      * @return array|int|mixed|string
      */
     public function findAllEducationNotation(Organization $organization){
-        /** @var ActivityYearFilter $filter */
-        $filter = $this->_em->getFilters()->getFilter('activity_year_filter');
-        $filter->setDisabled(true);
+        $this->filtersConfigurationService->suspendTimeConstraintFilters();
 
         $queryBuilder = $this->createQueryBuilder('education_notation');
         $queryBuilder
@@ -39,8 +41,8 @@ class EducationNotationRepository extends ServiceEntityRepository
         $query = $queryBuilder->getQuery();
         $results = $query->getResult();
 
-        $filter->setDisabled(false);
+        $this->filtersConfigurationService->restoreTimeConstraintFilters();
 
         return $results;
     }
-}
+}