Make getCurrentByPerson use performance dates.

nb #386, fixes #384
camdram · Sep 17, 2018 · f62809e · f62809e
1 parent 6963637
commit f62809e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Acts/CamdramBundle/Entity/ShowRepository.php b/src/Acts/CamdramBundle/Entity/ShowRepository.php
@@ -132,12 +132,14 @@ public function getUpcomingByPerson(\DateTime $now, Person $person)
     public function getCurrentByPerson(\DateTime $now, Person $person)
     {
         $query = $this->createQueryBuilder('s')
-            ->where('s.end_at >= :now')
-            ->andWhere('s.start_at < :now')
-            ->andWhere('s.authorised_by is not null')
             ->join('s.roles', 'r')
+            ->leftJoin('s.performances', 'p')
+            ->where('s.authorised_by is not null')
             ->andWhere('r.person = :person')
-            ->orderBy('s.start_at', 'ASC')
+            ->orderBy('p.start_date', 'ASC')
+            ->groupBy('s.id')
+            ->having('MIN(p.start_date) < :now')
+            ->andHaving('MAX(p.end_date) >= :now')
             ->setParameter('person', $person)
             ->setParameter('now', $now)
             ->getQuery();