fix(ZMS-3080): catching null waiting times when queue is empty (#600)

* fix(ZMS-3080): catching null waiting times when queue is empty * fix(ZMS-3080): rename waitingTimeOptim to waitingTimeOptimistic
it-at-m · Oct 8, 2024 · 9cff0bd · 9cff0bd
1 parent 8e6d86d
commit 9cff0bd
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/zmscalldisplay/src/Zmscalldisplay/Info.php b/zmscalldisplay/src/Zmscalldisplay/Info.php
@@ -14,7 +14,6 @@
 
 class Info extends BaseController
 {
-
     /**
      * @SuppressWarnings(UnusedFormalParameter)
      * @return ResponseInterface
@@ -28,32 +27,23 @@ public function readResponse(
             ->readPostResult('/calldisplay/queue/', $calldisplay->getEntity(false))
             ->getCollection();
 
-        $waitingClientsBefore = $queueListFull
-            ->withoutStatus(Collection::STATUS_FAKE)
-            ->getCountWithWaitingTime()
-            ->count();
-
-        $waitingTimeFull = $queueListFull
+        $filteredQueue = $queueListFull
             ->withoutStatus(Collection::STATUS_FAKE)
-            ->getCountWithWaitingTime()
-            ->getLast()
-            ->waitingTimeEstimate;
+            ->getCountWithWaitingTime();
 
-        $waitingTimeOptim = $queueListFull
-            ->withoutStatus(Collection::STATUS_FAKE)
-            ->getCountWithWaitingTime()
-            ->getLast()
-            ->waitingTimeOptimistic;
+        $lastClient = $filteredQueue->getLast();
+        $waitingTimeFull = $lastClient ? $lastClient->waitingTimeEstimate : 0;
+        $waitingTimeOptimistic = $lastClient ? $lastClient->waitingTimeOptimistic : 0;
 
         return Render::withHtml(
             $response,
             'element/tempWaitingValues.twig',
             array(
                 'calldisplay' => $calldisplay,
-                'waitingClients' => $waitingClientsBefore,
+                'waitingClients' => $filteredQueue->count(),
                 'waitingTime' => $waitingTimeFull,
-                'waitingTimeOptimistic' => $waitingTimeOptim,
+                'waitingTimeOptimistic' => $waitingTimeOptimistic
             )
         );
     }
-}
+}