Refactor AccompanyingPeriod::getNextCalendarForPerson to enhance performance

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -869,19 +869,24 @@ class AccompanyingPeriod implements
     public function getNextCalendarsForPerson(Person $person, $limit = 5): ReadableCollection
     {
         $today = new \DateTimeImmutable('today');
-        $criteria = Criteria::create()
-            ->where(Criteria::expr()->gte('startDate', $today))
-            // ->andWhere(Criteria::expr()->memberOf('persons', $person))
-            ->orderBy(['startDate' => 'DESC'])
-            ->setMaxResults($limit * 2);
 
-        return $this->calendars->matching($criteria)
-            ->matching(
-                // due to a bug, filter two times
-                Criteria::create()
-                    ->where(Criteria::expr()->memberOf('persons', $person))
-                    ->setMaxResults($limit)
-            );
+        $criteria = Criteria::create();
+        $expr = Criteria::expr();
+
+        $criteria
+            ->where(
+                $expr->gte('startDate', $today),
+            )
+            ->orderBy(['startDate' => 'ASC']);
+
+        $criteriaByPerson = Criteria::create();
+        $criteriaByPerson
+            ->where(
+                $expr->memberOf('persons', $person)
+            )
+            ->setMaxResults($limit);
+
+        return $this->calendars->matching($criteria)->matching($criteriaByPerson);
     }
 
     /**