From 9cff0bdf2dc081508d4e9710bd980408dcafb042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Wei=C3=9F?=
 <98973281+Fabinatix97@users.noreply.github.com>
Date: Tue, 8 Oct 2024 14:07:42 +0200
Subject: [PATCH] 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
---
 zmscalldisplay/src/Zmscalldisplay/Info.php | 26 +++++++---------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/zmscalldisplay/src/Zmscalldisplay/Info.php b/zmscalldisplay/src/Zmscalldisplay/Info.php
index c60790253..804174dbc 100644
--- 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
             )
         );
     }
-}
+}
\ No newline at end of file