From 1fcaf603a321df50a04d8701f854f4a3e188cb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Thu, 18 Apr 2024 13:57:37 +0200
Subject: [PATCH] fix: ignore status when fetching pending feedbacks

---
 src/Repository/DispositionRepository.php | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Repository/DispositionRepository.php b/src/Repository/DispositionRepository.php
index 67f2c58..8cdc7d2 100644
--- a/src/Repository/DispositionRepository.php
+++ b/src/Repository/DispositionRepository.php
@@ -177,10 +177,16 @@ class DispositionRepository extends ServiceEntityRepository
             ->innerJoin('assignment.destination', 'destination')
             ->leftJoin('disposition.feedback', 'feedback')
             ->where($qb->expr()->andX(
-                $qb->expr()->eq('disposition.status', ':status'),
+                $qb->expr()->orX(
+                    $qb->expr()->andX(
+                        $qb->expr()->isNotNull('assignment.dateTo'),
+                        $qb->expr()->lte('assignment.dateTo', ':dateTo')
+                    ),
+                    $qb->expr()->lte('destination.dateTo', ':dateTo')
+                ),
                 $qb->expr()->isNull('feedback')
             ))
-            ->setParameter('status', Disposition::STATUS_COMPLETED)
+            ->setParameter('dateTo', new \DateTimeImmutable())
         ;
 
         if (null !== $hotelBusProIds) {
@@ -219,20 +225,14 @@ class DispositionRepository extends ServiceEntityRepository
         return $qb
             ->innerJoin('disposition.assignment', 'assignment')
             ->innerJoin('assignment.destination', 'destination')
-            ->where($qb->expr()->andX(
-                $qb->expr()->neq('disposition.status', ':status'),
-                $qb->expr()->orX(
-                    $qb->expr()->andX(
-                        $qb->expr()->isNotNull('assignment.dateTo'),
-                        $qb->expr()->lte('assignment.dateTo', ':dateTo')
-                    ),
-                    $qb->expr()->lte('destination.dateTo', ':dateTo')
-                )
+            ->where($qb->expr()->orX(
+                $qb->expr()->andX(
+                    $qb->expr()->isNotNull('assignment.dateTo'),
+                    $qb->expr()->lte('assignment.dateTo', ':dateTo')
+                ),
+                $qb->expr()->lte('destination.dateTo', ':dateTo')
             ))
-            ->setParameters([
-                'status' => Disposition::STATUS_COMPLETED,
-                'dateTo' => new \DateTimeImmutable(),
-            ])
+            ->setParameter('dateTo', new \DateTimeImmutable())
             ->getQuery()
             ->getResult()
         ;