From 348152921a430bad324fdf2ea364128607029401 Mon Sep 17 00:00:00 2001
From: csavelief <csavelief@mncc.fr>
Date: Tue, 10 Sep 2024 17:33:49 +0200
Subject: [PATCH] Code refactoring

---
 .../AdversaryMeter/Listeners/EndVulnsScanListener.php    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Modules/AdversaryMeter/Listeners/EndVulnsScanListener.php b/app/Modules/AdversaryMeter/Listeners/EndVulnsScanListener.php
index fe8fee2..0c64103 100644
--- a/app/Modules/AdversaryMeter/Listeners/EndVulnsScanListener.php
+++ b/app/Modules/AdversaryMeter/Listeners/EndVulnsScanListener.php
@@ -6,7 +6,6 @@
 use App\Modules\AdversaryMeter\Events\EndVulnsScan;
 use App\Modules\AdversaryMeter\Helpers\ApiUtilsFacade as ApiUtils;
 use App\Modules\AdversaryMeter\Models\Alert;
-use App\Modules\AdversaryMeter\Models\Asset;
 use App\Modules\AdversaryMeter\Models\Port;
 use App\Modules\AdversaryMeter\Models\Scan;
 use App\Modules\AdversaryMeter\Models\Screenshot;
@@ -67,7 +66,7 @@ protected function handle2($event)
                     $port->closed = 1;
                     $port->save();
 
-                    $this->markAssetScanAsCompleted($scan);
+                    $this->markScanAsCompleted($scan);
                 }
                 return;
             }
@@ -91,7 +90,7 @@ protected function handle2($event)
         $this->setAlertsV1($port, $task);
         $this->setAlertsV2($port, $task);
         $this->setScreenshot($port, $task);
-        $this->markAssetScanAsCompleted($scan);
+        $this->markScanAsCompleted($scan);
     }
 
     private function setAlertsV1(Port $port, array $task): void
@@ -187,7 +186,7 @@ private function setScreenshot(Port $port, array $task)
             });
     }
 
-    private function markAssetScanAsCompleted(Scan $scan): void
+    private function markScanAsCompleted(Scan $scan): void
     {
         DB::transaction(function () use ($scan) {
 
@@ -201,7 +200,7 @@ private function markAssetScanAsCompleted(Scan $scan): void
 
             if ($remaining === 0) {
 
-                $asset = Asset::where('id', $scan->asset_id)->first();
+                $asset = $scan->asset()->first();
 
                 if ($asset) {
                     if ($asset->cur_scan_id === $scan->ports_scan_id) {