enh(resources): fetch ack / dt in detail only if needed (#11888)

* enh(resources): fetch ack / dt in detail only if needed * Update src/Core/Application/RealTime/UseCase/FindMetaService/FindMetaService.php Co-authored-by: TamazC <103252125+TamazC@users.noreply.github.com>
centreon · Oct 12, 2022 · baf2d11 · baf2d11
1 parent 5a2395a
commit baf2d11
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 11 deletions.
diff --git a/src/Core/Application/RealTime/UseCase/FindHost/FindHost.php b/src/Core/Application/RealTime/UseCase/FindHost/FindHost.php
@@ -102,6 +102,14 @@ public function __invoke(int $hostId, FindHostPresenterInterface $presenter): vo
             $host->addHostgroup($hostgroup);
         }
 
+        $acknowledgement = $host->isAcknowledged() === true
+            ? $this->acknowledgementRepository->findOnGoingAcknowledgementByHostId($hostId)
+            : null;
+
+        $downtimes = $host->isInDowntime() === true
+            ? $this->downtimeRepository->findOnGoingDowntimesByHostId($hostId)
+            : [];
+
         /**
          * Obfuscate the passwords in Host commandLine
          * @todo Re-write this code when monitoring repository will be migrated to new architecture
@@ -111,8 +119,8 @@ public function __invoke(int $hostId, FindHostPresenterInterface $presenter): vo
         $presenter->present(
             $this->createResponse(
                 $host,
-                $this->downtimeRepository->findOnGoingDowntimesByHostId($hostId),
-                $this->acknowledgementRepository->findOnGoingAcknowledgementByHostId($hostId)
+                $downtimes,
+                $acknowledgement
             )
         );
     }

diff --git a/src/Core/Application/RealTime/UseCase/FindMetaService/FindMetaService.php b/src/Core/Application/RealTime/UseCase/FindMetaService/FindMetaService.php
@@ -120,12 +120,20 @@ public function __invoke(
         $hostId = $metaService->getHostId();
         $serviceId = $metaService->getServiceId();
 
+        $acknowledgement = $metaService->isAcknowledged() === true
+            ? $this->acknowledgementRepository->findOnGoingAcknowledgementByHostIdAndServiceId($hostId, $serviceId)
+            : null;
+
+        $downtimes = $metaService->isInDowntime() === true
+            ? $this->downtimeRepository->findOnGoingDowntimesByHostIdAndServiceId($hostId, $serviceId)
+            : [];
+
         $presenter->present(
             $this->createResponse(
                 $metaService,
                 $metaServiceConfiguration,
-                $this->downtimeRepository->findOnGoingDowntimesByHostIdAndServiceId($hostId, $serviceId),
-                $this->acknowledgementRepository->findOnGoingAcknowledgementByHostIdAndServiceId($hostId, $serviceId)
+                $downtimes,
+                $acknowledgement
             )
         );
     }

diff --git a/src/Core/Application/RealTime/UseCase/FindService/FindService.php b/src/Core/Application/RealTime/UseCase/FindService/FindService.php
@@ -141,11 +141,20 @@ public function __invoke(
          */
         $service->setCommandLine($this->obfuscatePasswordInServiceCommandLine($service));
 
+
+        $acknowledgement = $service->isAcknowledged() === true
+            ? $this->acknowledgementRepository->findOnGoingAcknowledgementByHostIdAndServiceId($hostId, $serviceId)
+            : null;
+
+        $downtimes = $service->isInDowntime() === true
+            ? $this->downtimeRepository->findOnGoingDowntimesByHostIdAndServiceId($hostId, $serviceId)
+            : [];
+
         $presenter->present(
             $this->createResponse(
                 $service,
-                $this->downtimeRepository->findOnGoingDowntimesByHostIdAndServiceId($hostId, $serviceId),
-                $this->acknowledgementRepository->findOnGoingAcknowledgementByHostIdAndServiceId($hostId, $serviceId),
+                $downtimes,
+                $acknowledgement,
                 $host
             )
         );

diff --git a/tests/php/Core/Application/RealTime/UseCase/FindHost/FindHostTest.php b/tests/php/Core/Application/RealTime/UseCase/FindHost/FindHostTest.php
@@ -201,7 +201,9 @@ public function testFindHostAsAdmin(): void
         /**
          * @var Host
          */
-        $host = HostTest::createHostModel();
+        $host = (HostTest::createHostModel())
+            ->setIsAcknowledged(true)
+            ->setIsInDowntime(true);
 
         $this->repository
             ->expects($this->once())
@@ -308,7 +310,9 @@ public function testFindHostAsNonAdmin(): void
         /**
          * @var Host
          */
-        $host = HostTest::createHostModel();
+        $host = (HostTest::createHostModel())
+            ->setIsAcknowledged(true)
+            ->setIsInDowntime(true);
 
         $this->repository
             ->expects($this->once())

diff --git a/tests/php/Core/Application/RealTime/UseCase/FindMetaService/FindMetaServiceTest.php b/tests/php/Core/Application/RealTime/UseCase/FindMetaService/FindMetaServiceTest.php
@@ -257,7 +257,9 @@ public function testMetaServiceFound(): void
             ->setAdmin(false);
 
         $metaServiceConfiguration = MetaServiceConfigurationTest::createMetaServiceModel();
-        $metaService = MetaServiceTest::createMetaServiceModel();
+        $metaService = (MetaServiceTest::createMetaServiceModel())
+            ->setIsAcknowledged(true)
+            ->setIsInDowntime(true);
 
         $downtimes[] = (new Downtime(1, 1, 10))
             ->setCancelled(false);

diff --git a/tests/php/Core/Application/RealTime/UseCase/FindService/FindServiceTest.php b/tests/php/Core/Application/RealTime/UseCase/FindService/FindServiceTest.php
@@ -301,7 +301,10 @@ public function testFindServiceAsAdmin(): void
         /**
          * @var Service
          */
-        $service = ServiceTest::createServiceModel();
+        $service = (ServiceTest::createServiceModel())
+            ->setIsAcknowledged(true)
+            ->setIsInDowntime(true);
+
         $servicegroup = new Servicegroup(1, 'ALL');
 
         $this->hostRepository
@@ -420,7 +423,10 @@ public function testFindServiceAsNonAdmin(): void
         );
 
         $host = HostTest::createHostModel();
-        $service = ServiceTest::createServiceModel();
+        $service = (ServiceTest::createServiceModel())
+            ->setIsAcknowledged(true)
+            ->setIsInDowntime(true);
+
         $servicegroup = new Servicegroup(1, 'ALL');
 
         $this->hostRepository